cmake: integrate pybind11_abseil module in ortools module

needed for math_opt
google · Jan 15, 2024 · baad73a · baad73a
1 parent 58fd3cd
commit baad73a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/cmake/python.cmake b/cmake/python.cmake
@@ -305,6 +305,7 @@ file(GENERATE OUTPUT ${PYTHON_PROJECT_DIR}/init/python/__init__.py CONTENT "")
 file(GENERATE OUTPUT ${PYTHON_PROJECT_DIR}/linear_solver/__init__.py CONTENT "")
 file(GENERATE OUTPUT ${PYTHON_PROJECT_DIR}/linear_solver/python/__init__.py CONTENT "")
 if(BUILD_MATH_OPT)
+  file(GENERATE OUTPUT ${PYTHON_PROJECT_DIR}/../pybind11_abseil/__init__.py CONTENT "")
   file(GENERATE OUTPUT ${PYTHON_PROJECT_DIR}/math_opt/__init__.py CONTENT "")
   file(GENERATE OUTPUT ${PYTHON_PROJECT_DIR}/math_opt/core/__init__.py CONTENT "")
   file(GENERATE OUTPUT ${PYTHON_PROJECT_DIR}/math_opt/core/python/__init__.py CONTENT "")
@@ -430,6 +431,8 @@ add_custom_command(
    $<TARGET_FILE:model_builder_helper_pybind11> ${PYTHON_PROJECT}/linear_solver/python
   COMMAND ${CMAKE_COMMAND} -E copy
    $<TARGET_FILE:math_opt_pybind11> ${PYTHON_PROJECT}/math_opt/core/python
+  COMMAND ${CMAKE_COMMAND} -E copy
+   $<TARGET_FILE:status_py_extension_stub> ${PYTHON_PROJECT}/../pybind11_abseil
   COMMAND ${CMAKE_COMMAND} -E copy
    $<TARGET_FILE:pdlp_pybind11> ${PYTHON_PROJECT}/pdlp/python
   COMMAND ${CMAKE_COMMAND} -E copy

diff --git a/ortools/math_opt/core/python/solver_test.py b/ortools/math_opt/core/python/solver_test.py
@@ -16,7 +16,7 @@
 from typing import Callable, Optional, Sequence
 import unittest
 from google3.testing.pybase import parameterized
-from google3.third_party.pybind11_abseil.status import StatusNotOk
+from pybind11_abseil.status import StatusNotOk
 from ortools.math_opt import callback_pb2
 from ortools.math_opt import model_parameters_pb2
 from ortools.math_opt import model_pb2

diff --git a/ortools/python/setup.py.in b/ortools/python/setup.py.in
@@ -80,6 +80,7 @@ setup(
             '*.pyi',
             'py.typed'
         ],
+        'pybind11_abseil':['$<TARGET_FILE_NAME:status_py_extension_stub>'],
         '@PYTHON_PROJECT@.math_opt':['*.pyi'],
         '@PYTHON_PROJECT@.math_opt.core.python':[
             '$<TARGET_FILE_NAME:math_opt_pybind11>',