big graph cleaning; rewrite CP-SAT python layer; rewrite model_builder python layer; reorganize CP-SAT scheduling and packing code
This commit is contained in:
@@ -387,7 +387,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
|
||||
@@ -637,7 +637,7 @@ add_custom_command(
|
||||
$<IF:$<TARGET_EXISTS:pdlp_pybind11>,copy,true>
|
||||
$<$<TARGET_EXISTS:pdlp_pybind11>:$<TARGET_FILE:pdlp_pybind11>> ${PYTHON_PROJECT}/pdlp/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
|
||||
@@ -657,7 +657,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
|
||||
@@ -694,7 +694,7 @@ add_custom_command(
|
||||
COMMAND ${stubgen_EXECUTABLE} -p pybind11_abseil.status --output .
|
||||
COMMAND ${stubgen_EXECUTABLE} -p ortools.math_opt.core.python.solver --output .
|
||||
COMMAND ${stubgen_EXECUTABLE} -p ortools.pdlp.python.pdlp --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
|
||||
|
||||
Reference in New Issue
Block a user