From 6fffbf6ecfb650d418641d7af9e48cb04499fea4 Mon Sep 17 00:00:00 2001 From: Laurent Perron Date: Fri, 3 Jan 2025 08:14:14 +0100 Subject: [PATCH] minor sync --- ortools/graph/BUILD.bazel | 4 ++-- ortools/gscip/BUILD.bazel | 11 ----------- ortools/sat/CMakeLists.txt | 2 +- ortools/sat/docs/scheduling.md | 2 +- .../samples/cumulative_variable_profile_sample_sat.py | 2 +- .../sat/samples/sequences_in_no_overlap_sample_sat.py | 1 - 6 files changed, 5 insertions(+), 17 deletions(-) diff --git a/ortools/graph/BUILD.bazel b/ortools/graph/BUILD.bazel index ee0f445798..a07e0d354d 100644 --- a/ortools/graph/BUILD.bazel +++ b/ortools/graph/BUILD.bazel @@ -510,11 +510,11 @@ cc_test( ":generic_max_flow", ":graph", ":graphs", - "@com_google_absl//absl/random:bit_gen_ref", "//ortools/base", "//ortools/base:gmock_main", "//ortools/linear_solver", "@com_google_absl//absl/random", + "@com_google_absl//absl/random:bit_gen_ref", "@com_google_absl//absl/strings:str_format", "@com_google_absl//absl/types:span", "@com_google_benchmark//:benchmark", @@ -616,7 +616,7 @@ cc_test( "//ortools/base:gmock_main", "@com_google_absl//absl/log:check", "@com_google_absl//absl/random:distributions", - "@com_google_benchmark//:benchmark", + "@com_google_benchmark//:benchmark", ], ) diff --git a/ortools/gscip/BUILD.bazel b/ortools/gscip/BUILD.bazel index 2417ef2bb8..641aad83b3 100644 --- a/ortools/gscip/BUILD.bazel +++ b/ortools/gscip/BUILD.bazel @@ -49,17 +49,6 @@ cc_library( ], ) -#cc_test( -# name = "gscip_parameters_test", -# srcs = ["gscip_parameters_test.cc"], -# deps = [ -# ":gscip_cc_proto", -# ":gscip_parameters", -# "@com_google_absl//absl/time", -# "@com_google_googletest//:gtest_main", -# ], -#) - cc_library( name = "legacy_scip_params", srcs = ["legacy_scip_params.cc"], diff --git a/ortools/sat/CMakeLists.txt b/ortools/sat/CMakeLists.txt index 385f5177d1..807cda3088 100644 --- a/ortools/sat/CMakeLists.txt +++ b/ortools/sat/CMakeLists.txt @@ -11,7 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -file(GLOB _SRCS "*.h" "*.cc" "python/linear_expr.h" "python/linear_expr.cc") +file(GLOB _SRCS "*.h" "*.cc" "python/linear_expr.*") list(FILTER _SRCS EXCLUDE REGEX ".*/.*_test.cc") list(FILTER _SRCS EXCLUDE REGEX ".*/.*_fuzz.cc") list(REMOVE_ITEM _SRCS diff --git a/ortools/sat/docs/scheduling.md b/ortools/sat/docs/scheduling.md index a720d763d9..29f27adfcd 100644 --- a/ortools/sat/docs/scheduling.md +++ b/ortools/sat/docs/scheduling.md @@ -1163,7 +1163,7 @@ def main(_) -> None: # Create the solver and solve the model. solver = cp_model.CpSolver() - solver.parameters.log_search_progress = True + # solver.parameters.log_search_progress = True # Uncomment to see the logs. solver.parameters.num_workers = 16 solver.parameters.max_time_in_seconds = 30.0 status = solver.solve(model) diff --git a/ortools/sat/samples/cumulative_variable_profile_sample_sat.py b/ortools/sat/samples/cumulative_variable_profile_sample_sat.py index cedeb9f346..92f3134eb8 100644 --- a/ortools/sat/samples/cumulative_variable_profile_sample_sat.py +++ b/ortools/sat/samples/cumulative_variable_profile_sample_sat.py @@ -246,7 +246,7 @@ def main(_) -> None: # Create the solver and solve the model. solver = cp_model.CpSolver() - solver.parameters.log_search_progress = True + # solver.parameters.log_search_progress = True # Uncomment to see the logs. solver.parameters.num_workers = 16 solver.parameters.max_time_in_seconds = 30.0 status = solver.solve(model) diff --git a/ortools/sat/samples/sequences_in_no_overlap_sample_sat.py b/ortools/sat/samples/sequences_in_no_overlap_sample_sat.py index d51a3c8e4a..3a184613ef 100644 --- a/ortools/sat/samples/sequences_in_no_overlap_sample_sat.py +++ b/ortools/sat/samples/sequences_in_no_overlap_sample_sat.py @@ -238,7 +238,6 @@ def sequences_in_no_overlap_sample_sat(): # Solves the model model. solver = cp_model.CpSolver() - solver.parameters.log_search_progress = True status = solver.solve(model) if status == cp_model.OPTIMAL or status == cp_model.FEASIBLE: