From baad73ae20e41baa842e4d0eb87f2b57930e27c0 Mon Sep 17 00:00:00 2001 From: Corentin Le Molgat Date: Mon, 15 Jan 2024 17:54:52 +0100 Subject: [PATCH] cmake: integrate pybind11_abseil module in ortools module needed for math_opt --- cmake/python.cmake | 3 +++ ortools/math_opt/core/python/solver_test.py | 2 +- ortools/python/setup.py.in | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/cmake/python.cmake b/cmake/python.cmake index d6cf014c20..f26e0147f6 100644 --- 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( $ ${PYTHON_PROJECT}/linear_solver/python COMMAND ${CMAKE_COMMAND} -E copy $ ${PYTHON_PROJECT}/math_opt/core/python + COMMAND ${CMAKE_COMMAND} -E copy + $ ${PYTHON_PROJECT}/../pybind11_abseil COMMAND ${CMAKE_COMMAND} -E copy $ ${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 index b6103cfc21..5009bf1c11 100644 --- a/ortools/math_opt/core/python/solver_test.py +++ b/ortools/math_opt/core/python/solver_test.py @@ -16,7 +16,7 @@ import threading 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 index 997e1279a8..da354fcaf6 100644 --- a/ortools/python/setup.py.in +++ b/ortools/python/setup.py.in @@ -80,6 +80,7 @@ setup( '*.pyi', 'py.typed' ], + 'pybind11_abseil':['$'], '@PYTHON_PROJECT@.math_opt':['*.pyi'], '@PYTHON_PROJECT@.math_opt.core.python':[ '$',