always-cautious/ortools-clone
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix cmake after CP-SAT python renaming

Browse Source
This commit is contained in:
Laurent Perron
2025-01-09 16:33:47 +01:00
parent 403e31ab65
commit bd2225832f
8 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cmake/python.cmake
View File

@@ -393,7 +393,7 @@ if(BUILD_MATH_OPT)
endif()
file(COPY
ortools/sat/python/cp_model.py
ortools/sat/python/cp_model_helper.py
ortools/sat/python/cp_model_numbers.py
DESTINATION ${PYTHON_PROJECT_DIR}/sat/python)
file(COPY
ortools/sat/colab/flags.py
@@ -649,7 +649,7 @@ add_custom_command(
COMMAND ${CMAKE_COMMAND} -E copy
$<TARGET_FILE:routing_pybind11> ${PYTHON_PROJECT}/routing/python
COMMAND ${CMAKE_COMMAND} -E copy
$<TARGET_FILE:swig_helper_pybind11> ${PYTHON_PROJECT}/sat/python
$<TARGET_FILE:cp_model_helper_pybind11> ${PYTHON_PROJECT}/sat/python
COMMAND ${CMAKE_COMMAND} -E copy
$<TARGET_FILE:rcpsp_pybind11> ${PYTHON_PROJECT}/scheduling/python
COMMAND ${CMAKE_COMMAND} -E copy
@@ -672,7 +672,7 @@ add_custom_command(
model_builder_helper_pybind11
math_opt_pybind11
$<TARGET_NAME_IF_EXISTS:pdlp_pybind11>
swig_helper_pybind11
cp_model_helper_pybind11
rcpsp_pybind11
sorted_interval_list_pybind11
WORKING_DIRECTORY python
@@ -712,7 +712,7 @@ add_custom_command(
COMMAND ${stubgen_EXECUTABLE} -p ortools.pdlp.python.pdlp --output .
COMMAND ${stubgen_EXECUTABLE} -p ortools.routing.pywraprouting --output .
COMMAND ${stubgen_EXECUTABLE} -p ortools.routing.python.model --output .
COMMAND ${stubgen_EXECUTABLE} -p ortools.sat.python.swig_helper --output .
COMMAND ${stubgen_EXECUTABLE} -p ortools.sat.python.cp_model_helper --output .
COMMAND ${stubgen_EXECUTABLE} -p ortools.scheduling.python.rcpsp --output .
COMMAND ${stubgen_EXECUTABLE} -p ortools.util.python.sorted_interval_list --output .
COMMAND ${CMAKE_COMMAND} -E touch ${PROJECT_BINARY_DIR}/python/stub_timestamp

2
cmake/samples/python/sample.py
View File

@@ -21,7 +21,7 @@ from ortools.constraint_solver import pywrapcp
# from ortools.graph.python import min_cost_flow
from ortools.linear_solver import pywraplp
# from ortools.linear_solver import linear_solver_pb2
# from ortools.sat.python import swig_helper
# from ortools.sat.python import cp_model_helper
# from ortools.sat.python import cp_model
# from ortools.scheduling import rcpsp
# from ortools.util.python import sorted_interval_list

4
ortools/python/BUILD.bazel
View File

@@ -23,7 +23,7 @@ py_binary(
"//ortools/graph/python:linear_sum_assignment.so",
"//ortools/graph/python:max_flow.so",
"//ortools/graph/python:min_cost_flow.so",
"//ortools/sat/python:swig_helper.so",
"//ortools/sat/python:cp_model_helper.so",
],
tags = ["manual"],
deps = [
@@ -32,7 +32,7 @@ py_binary(
"//ortools/sat/colab:flags",
"//ortools/sat/colab:visualization",
"//ortools/sat/python:cp_model",
"//ortools/sat/python:cp_model_helper",
"//ortools/sat/python:cp_model_numbers",
requirement("notebook"),
requirement("svgwrite"),
requirement("plotly"),

2
ortools/python/setup.py.in
View File

@@ -118,7 +118,7 @@ setup(
'@PYTHON_PROJECT@.sat':['*.pyi'],
'@PYTHON_PROJECT@.sat.colab':['*.pyi', 'py.typed'],
'@PYTHON_PROJECT@.sat.python':[
'$<TARGET_FILE_NAME:swig_helper_pybind11>',
'$<TARGET_FILE_NAME:cp_model_helper_pybind11>',
'*.pyi',
'py.typed'
],

16
ortools/sat/python/CMakeLists.txt
View File

@@ -11,26 +11,26 @@
# See the License for the specific language governing permissions and
# limitations under the License.
pybind11_add_module(swig_helper_pybind11 MODULE swig_helper.cc)
set_target_properties(swig_helper_pybind11 PROPERTIES
LIBRARY_OUTPUT_NAME "swig_helper")
pybind11_add_module(cp_model_helper_pybind11 MODULE cp_model_helper.cc)
set_target_properties(cp_model_helper_pybind11 PROPERTIES
LIBRARY_OUTPUT_NAME "cp_model_helper")
# note: macOS is APPLE and also UNIX !
if(APPLE)
set_target_properties(swig_helper_pybind11 PROPERTIES
set_target_properties(cp_model_helper_pybind11 PROPERTIES
SUFFIX ".so"
INSTALL_RPATH "@loader_path;@loader_path/../../../${PYTHON_PROJECT}/.libs")
elseif(UNIX)
set_target_properties(swig_helper_pybind11 PROPERTIES
set_target_properties(cp_model_helper_pybind11 PROPERTIES
INSTALL_RPATH "$ORIGIN:$ORIGIN/../../../${PYTHON_PROJECT}/.libs")
endif()
target_link_libraries(swig_helper_pybind11 PRIVATE
target_link_libraries(cp_model_helper_pybind11 PRIVATE
${PROJECT_NAMESPACE}::ortools
pybind11_native_proto_caster
protobuf::libprotobuf)
target_include_directories(swig_helper_pybind11 PRIVATE ${protobuf_SOURCE_DIR})
add_library(${PROJECT_NAMESPACE}::swig_helper_pybind11 ALIAS swig_helper_pybind11)
target_include_directories(cp_model_helper_pybind11 PRIVATE ${protobuf_SOURCE_DIR})
add_library(${PROJECT_NAMESPACE}::cp_model_helper_pybind11 ALIAS cp_model_helper_pybind11)
if(BUILD_TESTING)
file(GLOB PYTHON_SRCS "*_test.py")

2
tools/docker/python/build-manylinux.sh
View File

@@ -126,7 +126,7 @@ function check_wheel() {
"ortools/linear_solver/python/model_builder_helper.pyi"
"ortools/linear_solver/pywraplp.pyi"
"ortools/pdlp/python/pdlp.pyi"
"ortools/sat/python/swig_helper.pyi"
"ortools/sat/python/cp_model_helper.pyi"
"ortools/scheduling/python/rcpsp.pyi"
"ortools/util/python/sorted_interval_list.pyi"
)

2
tools/release/build_delivery_macos.sh
View File

@@ -252,7 +252,7 @@ function build_python() {
"ortools/linear_solver/python/model_builder_helper.pyi"
"ortools/linear_solver/pywraplp.pyi"
"ortools/pdlp/python/pdlp.pyi"
"ortools/sat/python/swig_helper.pyi"
"ortools/sat/python/cp_model_helper.pyi"
"ortools/scheduling/python/rcpsp.pyi"
"ortools/util/python/sorted_interval_list.pyi"
)

2
tools/release/build_delivery_win.cmd
View File

@@ -308,7 +308,7 @@ FOR %%v IN (8 9 10 11 12 13) DO (
ortools\linear_solver\python\model_builder_helper.pyi
ortools\linear_solver\pywraplp.pyi
ortools\pdlp\python\pdlp.pyi
ortools\sat\python\swig_helper.pyi
ortools\sat\python\cp_model_helper.pyi
ortools\scheduling\python\rcpsp.pyi
ortools\util\python\sorted_interval_list.pyi
) DO (