math_opt: few fix

* Enable and fix most python tests
* export from google3
* export python/testing/

Author: Mizux

cmake/python.cmake

@@ -311,6 +311,7 @@ if(BUILD_MATH_OPT)
   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 "")
   file(GENERATE OUTPUT ${PYTHON_PROJECT_DIR}/math_opt/python/__init__.py CONTENT "")
+  file(GENERATE OUTPUT ${PYTHON_PROJECT_DIR}/math_opt/python/testing/__init__.py CONTENT "")
   file(GENERATE OUTPUT ${PYTHON_PROJECT_DIR}/math_opt/solvers/__init__.py CONTENT "")
 endif()
 file(GENERATE OUTPUT ${PYTHON_PROJECT_DIR}/packing/__init__.py CONTENT "")
@@ -352,6 +353,10 @@ if(BUILD_MATH_OPT)
     ortools/math_opt/python/sparse_containers.py
     ortools/math_opt/python/statistics.py
     DESTINATION ${PYTHON_PROJECT_DIR}/math_opt/python)
+  file(COPY
+    ortools/math_opt/python/testing/compare_proto.py
+    ortools/math_opt/python/testing/proto_matcher.py
+    DESTINATION ${PYTHON_PROJECT_DIR}/math_opt/python/testing)
 endif()
 file(COPY
   ortools/sat/python/cp_model.py

ortools/math_opt/model_parameters.proto

@@ -146,4 +146,17 @@ message ModelSolveParametersProto {
   // Requirements:
   //  * Map keys must also be map keys of ModelProto.auxiliary_objectives.
   map<int64, ObjectiveParametersProto> auxiliary_objective_parameters = 8;
+
+  // Optional lazy constraint annotations. Included linear constraints will be
+  // marked as "lazy" with supporting solvers, meaning that they will only be
+  // added to the working model as-needed as the solver runs.
+  //
+  // Note that this an algorithmic hint that does not affect the model's
+  // feasible region; solvers not supporting these annotations will simply
+  // ignore it.
+  //
+  // Requirements:
+  //  * Each entry must be an element of VariablesProto.ids.
+  //  * Entries must be in strictly increasing order (i.e., sorted, no repeats).
+  repeated int64 lazy_linear_constraint_ids = 9;
 }

ortools/math_opt/python/CMakeLists.txt

@@ -13,7 +13,12 @@
 
 if(BUILD_TESTING)
   file(GLOB PYTHON_SRCS "*_test.py")
+  list(FILTER PYTHON_SRCS EXCLUDE REGEX ".*/solve_gurobi_test.py") # need gurobi
+  list(FILTER PYTHON_SRCS EXCLUDE REGEX ".*/solve_test.py") # need OSQP
+  list(FILTER PYTHON_SRCS EXCLUDE REGEX ".*/normalize_test.py") # need google3 stuff
+  list(FILTER PYTHON_SRCS EXCLUDE REGEX ".*/callback_test") # segfault
+  list(FILTER PYTHON_SRCS EXCLUDE REGEX ".*/mathopt_test") # import test fail
   foreach(FILE_NAME IN LISTS PYTHON_SRCS)
-    #add_python_test(FILE_NAME ${FILE_NAME})
+    add_python_test(FILE_NAME ${FILE_NAME})
   endforeach()
 endif()

ortools/math_opt/python/callback_test.py

@@ -15,7 +15,7 @@
 import datetime
 import math
 
-import unittest
+from absl.testing import absltest
 from ortools.math_opt import callback_pb2
 from ortools.math_opt import sparse_containers_pb2
 from ortools.math_opt.python import callback
@@ -24,7 +24,7 @@
 from ortools.math_opt.python.testing import compare_proto
 
 
-class CallbackDataTest(compare_proto.MathOptProtoAssertions, unittest.TestCase):
+class CallbackDataTest(compare_proto.MathOptProtoAssertions, absltest.TestCase):
     def test_parse_callback_data_no_solution(self) -> None:
         mod = model.Model(name="test_model")
         cb_data_proto = callback_pb2.CallbackDataProto(
@@ -85,7 +85,7 @@ def test_parse_callback_data_with_solution(self) -> None:
         )
 
 
-class CallbackRegistrationTest(compare_proto.MathOptProtoAssertions, unittest.TestCase):
+class CallbackRegistrationTest(compare_proto.MathOptProtoAssertions, absltest.TestCase):
     def testToProto(self) -> None:
         mod = model.Model(name="test_model")
         x = mod.add_binary_variable(name="x")
@@ -121,7 +121,7 @@ def testToProto(self) -> None:
 
 
 class GeneratedLinearConstraintTest(
-    compare_proto.MathOptProtoAssertions, unittest.TestCase
+    compare_proto.MathOptProtoAssertions, absltest.TestCase
 ):
     def testToProto(self) -> None:
         mod = model.Model(name="test_model")
@@ -147,7 +147,7 @@ def testToProto(self) -> None:
         )
 
 
-class CallbackResultTest(compare_proto.MathOptProtoAssertions, unittest.TestCase):
+class CallbackResultTest(compare_proto.MathOptProtoAssertions, absltest.TestCase):
     def testToProto(self) -> None:
         mod = model.Model(name="test_model")
         x = mod.add_binary_variable(name="x")
@@ -250,4 +250,4 @@ def testToProtoEmpty(self) -> None:
 
 
 if __name__ == "__main__":
-    unittest.main()
+    absltest.main()

ortools/math_opt/python/compute_infeasible_subsystem_result_test.py

@@ -14,7 +14,7 @@
 
 """Tests for compute_infeasible_subsystem_result.py."""
 
-import unittest
+from absl.testing import absltest
 from ortools.math_opt import infeasible_subsystem_pb2
 from ortools.math_opt.python import compute_infeasible_subsystem_result
 from ortools.math_opt.python import model
@@ -28,7 +28,7 @@
 )
 
 
-class ModelSubsetBoundsTest(unittest.TestCase, compare_proto.MathOptProtoAssertions):
+class ModelSubsetBoundsTest(absltest.TestCase, compare_proto.MathOptProtoAssertions):
     def test_empty(self) -> None:
         self.assertTrue(_ModelSubsetBounds().empty())
         self.assertFalse(_ModelSubsetBounds(lower=True).empty())
@@ -60,7 +60,7 @@ def test_proto_round_trip_upper(self) -> None:
         )
 
 
-class ModelSubsetTest(unittest.TestCase, compare_proto.MathOptProtoAssertions):
+class ModelSubsetTest(absltest.TestCase, compare_proto.MathOptProtoAssertions):
     def test_empty(self) -> None:
         m = model.Model()
         x = m.add_binary_variable()
@@ -167,7 +167,7 @@ def test_parse_proto_indicator_unsupported(self) -> None:
             compute_infeasible_subsystem_result.parse_model_subset(model_subset, m)
 
 
-class ComputeInfeasibleSubsystemResultTest(unittest.TestCase):
+class ComputeInfeasibleSubsystemResultTest(absltest.TestCase):
     def test_to_proto_round_trip(self) -> None:
         m = model.Model()
         x = m.add_binary_variable()
@@ -197,4 +197,4 @@ def test_to_proto_round_trip_empty(self) -> None:
 
 
 if __name__ == "__main__":
-    unittest.main()
+    absltest.main()

ortools/math_opt/python/expressions_test.py

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import unittest
+from absl.testing import absltest
 from ortools.math_opt.python import expressions
 from ortools.math_opt.python import model
 
@@ -22,7 +22,7 @@ def _type_check_linear_sum(x: model.LinearSum) -> None:
     del x  # Unused.
 
 
-class FastSumTest(unittest.TestCase):
+class FastSumTest(absltest.TestCase):
     def test_variables(self) -> None:
         mod = model.Model()
         x = mod.add_binary_variable()
@@ -78,7 +78,7 @@ def test_all_quad(self) -> None:
         )
 
 
-class EvaluateExpressionTest(unittest.TestCase):
+class EvaluateExpressionTest(absltest.TestCase):
     def test_scalar_expression(self) -> None:
         mod = model.Model()
         x = mod.add_binary_variable()
@@ -108,4 +108,4 @@ def test_quadratic(self) -> None:
 
 
 if __name__ == "__main__":
-    unittest.main()
+    absltest.main()

ortools/math_opt/python/hash_model_storage_test.py

@@ -14,11 +14,11 @@
 
 """Tests for hash_model_storage that cannot be covered by model_storage_(update)_test."""
 
-import unittest
+from absl.testing import absltest
 from ortools.math_opt.python import hash_model_storage
 
 
-class HashModelStorageTest(unittest.TestCase):
+class HashModelStorageTest(absltest.TestCase):
     def test_quadratic_term_storage(self):
         storage = hash_model_storage._QuadraticTermStorage()
         storage.set_coefficient(0, 1, 1.0)
@@ -27,4 +27,4 @@ def test_quadratic_term_storage(self):
 
 
 if __name__ == "__main__":
-    unittest.main()
+    absltest.main()

ortools/math_opt/python/linear_expression_test.py

@@ -16,8 +16,8 @@
 from typing import Any, List, NamedTuple, Union
 from unittest import mock
 
-import unittest
-from google3.testing.pybase import parameterized
+from absl.testing import absltest
+from absl.testing import parameterized
 from ortools.math_opt.python import model
 
 _LINEAR_TYPES = (
@@ -36,7 +36,7 @@
 )
 
 
-class BoundedExprTest(unittest.TestCase):
+class BoundedExprTest(absltest.TestCase):
     def test_eq_float(self) -> None:
         mod = model.Model()
         x = mod.add_binary_variable(name="x")
@@ -333,7 +333,7 @@ def test_geq_expr(self) -> None:
         self.assertEqual(bounded_expr.upper_bound, math.inf)
 
 
-class BoundedExprErrorTest(unittest.TestCase):
+class BoundedExprErrorTest(absltest.TestCase):
     def test_ne(self) -> None:
         mod = model.Model()
         x = mod.add_binary_variable(name="x")
@@ -588,7 +588,7 @@ def test_bounded_expr_geq_float(self) -> None:
         # pylint: enable=pointless-statement
 
 
-class BoundedExprStrAndReprTest(unittest.TestCase):
+class BoundedExprStrAndReprTest(absltest.TestCase):
     def test_upper_bounded_expr(self) -> None:
         mod = model.Model()
         x = mod.add_binary_variable(name="x")
@@ -1086,7 +1086,7 @@ def test_sub(
             self.assertDictEqual(dict(e_inplace.terms), expected_terms)
 
 
-class QuadraticTermKey(unittest.TestCase):
+class QuadraticTermKey(absltest.TestCase):
     # Mock QuadraticTermKey.__hash__ to have a collision in the dictionary lookup
     # so that a correct behavior of term1 == term2 is needed to recover the
     # values. For instance, if QuadraticTermKey.__eq__ only compared equality of
@@ -2738,7 +2738,7 @@ def test_quadratic_sum_ast(self) -> None:
 
 # Test behavior of LinearExpression and as_flat_linear_expression that is
 # not covered by other tests.
-class LinearExpressionTest(unittest.TestCase):
+class LinearExpressionTest(absltest.TestCase):
     def test_init_to_zero(self) -> None:
         expression = model.LinearExpression()
         self.assertEqual(expression.offset, 0.0)
@@ -2774,7 +2774,7 @@ def test_evaluate(self) -> None:
 
 # Test behavior of QuadraticExpression and as_flat_quadratic_expression that is
 # not covered by other tests.
-class QuadraticExpressionTest(unittest.TestCase):
+class QuadraticExpressionTest(absltest.TestCase):
     def test_terms_read_only(self) -> None:
         mod = model.Model()
         x = mod.add_binary_variable(name="x")
@@ -2809,4 +2809,4 @@ def test_evaluate(self) -> None:
 
 
 if __name__ == "__main__":
-    unittest.main()
+    absltest.main()

ortools/math_opt/python/mathopt_test.py

@@ -18,7 +18,7 @@
 import typing
 from typing import Any, List, Set, Tuple
 
-import unittest
+from absl.testing import absltest
 from ortools.math_opt.python import callback
 from ortools.math_opt.python import expressions
 from ortools.math_opt.python import hash_model_storage
@@ -81,7 +81,7 @@ def _get_public_api(module: types.ModuleType) -> List[Tuple[str, Any]]:
     return [(name, obj) for name, obj in tuple_list if not name.startswith("_")]
 
 
-class MathoptTest(unittest.TestCase):
+class MathoptTest(absltest.TestCase):
     def test_imports(self) -> None:
         missing_imports: List[str] = []
         for module in _MODULES_TO_CHECK:
@@ -107,4 +107,4 @@ def test_imports(self) -> None:
 
 
 if __name__ == "__main__":
-    unittest.main()
+    absltest.main()

ortools/math_opt/python/message_callback_test.py

@@ -19,11 +19,11 @@
 
 from absl import logging
 
-import unittest
+from absl.testing import absltest
 from ortools.math_opt.python import message_callback
 
 
-class PrinterMessageCallbackTest(unittest.TestCase):
+class PrinterMessageCallbackTest(absltest.TestCase):
     def test_no_prefix(self):
         class FlushCountingStringIO(io.StringIO):
             def __init__(self):
@@ -53,7 +53,7 @@ def test_with_prefix(self):
         )
 
 
-class LogMessagesTest(unittest.TestCase):
+class LogMessagesTest(absltest.TestCase):
     def test_defaults(self):
         with self.assertLogs(logger="absl", level="INFO") as logs:
             message_callback.log_messages(["line 1", "line 2"])
@@ -82,7 +82,7 @@ def test_records_path(self):
         )
 
 
-class VLogMessagesTest(unittest.TestCase):
+class VLogMessagesTest(absltest.TestCase):
     """Tests of vlog_messages().
 
     In the tests we abuse the logging level 0 since there is not API in the
@@ -110,7 +110,7 @@ def test_records_path(self):
         )
 
 
-class ListMessageCallbackTest(unittest.TestCase):
+class ListMessageCallbackTest(absltest.TestCase):
     def test_empty(self):
         msgs = []
         cb = message_callback.list_message_callback(msgs)
@@ -131,4 +131,4 @@ def test_not_empty(self):
 
 
 if __name__ == "__main__":
-    unittest.main()
+    absltest.main()

ortools/math_opt/python/model_parameters_test.py

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import unittest
+from absl.testing import absltest
 from ortools.math_opt import model_parameters_pb2
 from ortools.math_opt import solution_pb2
 from ortools.math_opt import sparse_containers_pb2
@@ -23,7 +23,7 @@
 from ortools.math_opt.python.testing import compare_proto
 
 
-class ModelParametersTest(compare_proto.MathOptProtoAssertions, unittest.TestCase):
+class ModelParametersTest(compare_proto.MathOptProtoAssertions, absltest.TestCase):
     def test_solution_hint_round_trip(self) -> None:
         mod = model.Model(name="test_model")
         x = mod.add_binary_variable(name="x")
@@ -106,4 +106,4 @@ def test_model_parameters_to_proto_with_basis(self) -> None:
 
 
 if __name__ == "__main__":
-    unittest.main()
+    absltest.main()

ortools/math_opt/python/model_storage_test.py

@@ -15,8 +15,8 @@
 import math
 from typing import Any, Callable
 
-import unittest
-from google3.testing.pybase import parameterized
+from absl.testing import absltest
+from absl.testing import parameterized
 from ortools.math_opt import model_pb2
 from ortools.math_opt import sparse_containers_pb2
 from ortools.math_opt.python import hash_model_storage
@@ -925,4 +925,4 @@ def test_nans_pass_through(self, storage_class: _StorageClass) -> None:
 
 
 if __name__ == "__main__":
-    unittest.main()
+    absltest.main()

ortools/math_opt/python/model_storage_update_test.py

@@ -12,8 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import unittest
-from google3.testing.pybase import parameterized
+from absl.testing import absltest
+from absl.testing import parameterized
 from ortools.math_opt import model_pb2
 from ortools.math_opt import model_update_pb2
 from ortools.math_opt import sparse_containers_pb2
@@ -1171,4 +1171,4 @@ def test_multiple_update_tracker(self, storage_class: _StorageClass) -> None:
 
 
 if __name__ == "__main__":
-    unittest.main()
+    absltest.main()