dependency: Bump SCIP to v910

google · Aug 5, 2024 · f9e3d83 · f9e3d83
1 parent 9e151b4
commit f9e3d83
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 10 deletions.
diff --git a/Dependencies.txt b/Dependencies.txt
@@ -10,7 +10,7 @@ Cgl=0.60.5
 Cbc=2.10.7
 GLPK=5.0
 HiGHS=v1.7.2
-Scip=v900
+Scip=v910
 # Python
 pybind11=v2.12.0
 pybind11_abseil=52f2739

diff --git a/WORKSPACE b/WORKSPACE
@@ -130,9 +130,9 @@ http_archive(
 new_git_repository(
     name = "scip",
     build_file = "//bazel:scip.BUILD.bazel",
-    patches = ["//bazel:scip-v900.patch"],
+    patches = ["//bazel:scip-v910.patch"],
     patch_args = ["-p1"],
-    tag = "v900",
+    tag = "v910",
     remote = "https://github.com/scipopt/scip.git",
 )
 

diff --git a/bazel/BUILD.bazel b/bazel/BUILD.bazel
@@ -23,7 +23,7 @@ exports_files([
     "ortools_requirements.in",
     "ortools_requirements.txt",
     "pcre2.BUILD.bazel",
-    "scip-v900.patch",
+    "scip-v910.patch",
     "scip.BUILD.bazel",
     "swig.BUILD.bazel",
     "swig.patch",

diff --git a/bazel/scip-v900.patch → bazel/scip-v910.patch b/bazel/scip-v900.patch → bazel/scip-v910.patch
@@ -54,7 +54,7 @@ index 0000000000..871fde8e55
 +
 +#define CMAKE_BUILD_TYPE "Release"
 +#define SCIP_VERSION_MAJOR 9
-+#define SCIP_VERSION_MINOR 0
++#define SCIP_VERSION_MINOR 1
 +#define SCIP_VERSION_PATCH 0
 +#define SCIP_VERSION_SUB 0
 +#define SCIP_VERSION_API 114

diff --git a/cmake/dependencies/CMakeLists.txt b/cmake/dependencies/CMakeLists.txt
@@ -278,9 +278,9 @@ if(BUILD_SCIP)
   FetchContent_Declare(
     scip
     GIT_REPOSITORY "https://github.com/scipopt/scip.git"
-    GIT_TAG        "v900"
+    GIT_TAG        "v910"
     GIT_SHALLOW TRUE
-    PATCH_COMMAND git apply --ignore-whitespace "${CMAKE_CURRENT_LIST_DIR}/../../patches/scip-v900.patch"
+    PATCH_COMMAND git apply --ignore-whitespace "${CMAKE_CURRENT_LIST_DIR}/../../patches/scip-v910.patch"
   )
   FetchContent_MakeAvailable(scip)
   set(LPI_GLOP_SRC ${scip_SOURCE_DIR}/src/lpi/lpi_glop.cpp PARENT_SCOPE)

diff --git a/ortools/math_opt/solver_tests/callback_tests.cc b/ortools/math_opt/solver_tests/callback_tests.cc
@@ -737,7 +737,7 @@ TEST_P(CallbackTest, EventNodeCut) {
     }
     ASSERT_OK_AND_ASSIGN(const SolveResult result,
                          Solve(model, GetParam().solver_type, args));
-    // Even with use_cut: False, SCIP v900 return OPTIMAL
+    // Even with use_cut: False, SCIP v910 return OPTIMAL
     if (GetParam().solver_type == SolverType::kGscip) {
       EXPECT_THAT(result, IsOptimal(2.0));
     } else {

diff --git a/ortools/math_opt/solver_tests/ip_parameter_tests.cc b/ortools/math_opt/solver_tests/ip_parameter_tests.cc
@@ -622,7 +622,7 @@ TEST_P(IpParameterTest, NodeLimit) {
            "https://paste.googleplex.com/5694421105377280";
   }
   if (GetParam().solver_type == SolverType::kGscip) {
-    GTEST_SKIP() << "This test does not work with SCIP v900";
+    GTEST_SKIP() << "This test does not work with SCIP v910";
   }
   const std::unique_ptr<const Model> model = DenseIndependentSet(true);
   SolveParameters params = {.node_limit = 1};
@@ -1001,7 +1001,7 @@ TEST_P(IpParameterTest, SolutionLimitOneAndCutoff) {
 // Tests the interaction between cutoff and an additional limit.
 TEST_P(IpParameterTest, NoSolutionsBelowCutoffEarlyTermination) {
   if (GetParam().solver_type == SolverType::kGscip) {
-    GTEST_SKIP() << "This test does not work with SCIP v900";
+    GTEST_SKIP() << "This test does not work with SCIP v910";
   }
   if (!(GetParam().parameter_support.supports_cutoff)) {
     // We have already tested that the right error message is returned.

diff --git a/patches/scip-v900.patch → patches/scip-v910.patch b/patches/scip-v900.patch → patches/scip-v910.patch