Skip to content

Commit 86e8cbb

Browse files
committed
more pybind11 wrappers for routing
1 parent 61adf12 commit 86e8cbb

File tree

9 files changed

+2546
-530
lines changed

9 files changed

+2546
-530
lines changed

cmake/README.md

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -77,23 +77,23 @@ CMake as a standalone project or incorporate it into an existing CMake project.
7777
## Requirement
7878
You'll need:
7979

80-
* `CMake >= 3.24`.
81-
* A C++20 compiler (GCC 10 or above)
80+
* `CMake >= 3.24`.
81+
* A C++20 compiler (GCC 10 or later, MSVC 2022 or later).
8282

83-
## Solvers supported
83+
## Supported solvers
8484

8585
Here the list of supported solvers:
8686

87-
* CBC
88-
* CLP
89-
* CP-SAT
90-
* CPLEX\*
91-
* GLOP
92-
* GLPK\*
93-
* HiGHS\*
94-
* PDLP
95-
* SCIP
96-
* XPRESS
87+
* CBC
88+
* CLP
89+
* CP-SAT
90+
* CPLEX\*
91+
* GLOP
92+
* GLPK\*
93+
* HiGHS\*
94+
* PDLP
95+
* SCIP
96+
* XPRESS
9797

9898
\*: these solvers are disabled by default.
9999

cmake/python.cmake

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -312,6 +312,7 @@ file(GENERATE
312312
OUTPUT ${PYTHON_PROJECT_DIR}/__init__.py
313313
INPUT ${PROJECT_BINARY_DIR}/python/__init__.py.in)
314314

315+
file(GENERATE OUTPUT ${PYTHON_PROJECT_DIR}/../pybind11_abseil/__init__.py CONTENT "")
315316
file(GENERATE OUTPUT ${PYTHON_PROJECT_DIR}/algorithms/__init__.py CONTENT "")
316317
file(GENERATE OUTPUT ${PYTHON_PROJECT_DIR}/algorithms/python/__init__.py CONTENT "")
317318
file(GENERATE OUTPUT ${PYTHON_PROJECT_DIR}/bop/__init__.py CONTENT "")
@@ -325,7 +326,6 @@ file(GENERATE OUTPUT ${PYTHON_PROJECT_DIR}/init/python/__init__.py CONTENT "")
325326
file(GENERATE OUTPUT ${PYTHON_PROJECT_DIR}/linear_solver/__init__.py CONTENT "")
326327
file(GENERATE OUTPUT ${PYTHON_PROJECT_DIR}/linear_solver/python/__init__.py CONTENT "")
327328
if(BUILD_MATH_OPT)
328-
file(GENERATE OUTPUT ${PYTHON_PROJECT_DIR}/../pybind11_abseil/__init__.py CONTENT "")
329329
file(GENERATE OUTPUT ${PYTHON_PROJECT_DIR}/math_opt/__init__.py CONTENT "")
330330
file(GENERATE OUTPUT ${PYTHON_PROJECT_DIR}/math_opt/core/__init__.py CONTENT "")
331331
file(GENERATE OUTPUT ${PYTHON_PROJECT_DIR}/math_opt/core/python/__init__.py CONTENT "")
@@ -777,6 +777,7 @@ add_custom_command(
777777
COMMAND ${stubgen_EXECUTABLE} -p ortools.linear_solver.pywraplp --output .
778778
COMMAND ${stubgen_EXECUTABLE} -p ortools.linear_solver.python.model_builder_helper --output .
779779
COMMAND ${stubgen_EXECUTABLE} -p pybind11_abseil.status --output .
780+
COMMAND ${stubgen_EXECUTABLE} -p pybind11_abseil.absl_casters --output .
780781
COMMAND ${stubgen_EXECUTABLE} -p ortools.math_opt.core.python.solver --output .
781782
COMMAND ${stubgen_EXECUTABLE} -p ortools.pdlp.python.pdlp --output .
782783
COMMAND ${stubgen_EXECUTABLE} -p ortools.routing.pywraprouting --output .

ortools/routing/python/BUILD.bazel

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,3 +61,37 @@ py_test(
6161
"//ortools/routing:parameters_py_pb2",
6262
],
6363
)
64+
65+
py_test(
66+
name = "dimension_test",
67+
size = "small",
68+
srcs = ["dimension_test.py"],
69+
deps = [
70+
":routing",
71+
requirement("absl-py"),
72+
"//ortools/routing:enums_py_pb2",
73+
],
74+
)
75+
76+
py_test(
77+
name = "index_manager_test",
78+
size = "small",
79+
srcs = ["index_manager_test.py"],
80+
deps = [
81+
":routing",
82+
requirement("absl-py"),
83+
],
84+
)
85+
86+
py_test(
87+
name = "sat_test",
88+
size = "small",
89+
srcs = ["sat_test.py"],
90+
deps = [
91+
":routing",
92+
requirement("absl-py"),
93+
"//ortools/routing:enums_py_pb2",
94+
"//ortools/util:optional_boolean_py_pb2",
95+
"//ortools/util/python:sorted_interval_list",
96+
],
97+
)

0 commit comments

Comments
 (0)