Merge branch 'v99bugfix' of github.com:google/or-tools into v99bugfix

google · Jul 18, 2024 · 5b05c69 · 5b05c69
2 parents 8ad1700 + 25016e3
commit 5b05c69
Show file tree

Hide file tree

Showing 14 changed files with 27 additions and 10 deletions.
diff --git a/.github/workflows/amd64_linux_cmake_coinor_off.yml b/.github/workflows/amd64_linux_cmake_coinor_off.yml
@@ -26,7 +26,7 @@ jobs:
       run: swig -version
       # Install .NET SDKs
     - name: Setup .NET 6.0
-      uses: actions/setup-dotnet@v1
+      uses: actions/setup-dotnet@v4
       with:
         dotnet-version: 6.0.x
     - name: Check dotnet

diff --git a/.github/workflows/amd64_linux_cmake_dotnet.yml b/.github/workflows/amd64_linux_cmake_dotnet.yml
@@ -15,7 +15,7 @@ jobs:
           sudo apt install -y swig
           swig -version
       - name: Setup .NET 6.0
-        uses: actions/setup-dotnet@v1
+        uses: actions/setup-dotnet@v4
         with:
           dotnet-version: 6.0.x
       - name: Check dotnet

diff --git a/.github/workflows/amd64_linux_cmake_scip_off.yml b/.github/workflows/amd64_linux_cmake_scip_off.yml
@@ -26,7 +26,7 @@ jobs:
       run: swig -version
       # Install .NET SDKs
     - name: Setup .NET 6.0
-      uses: actions/setup-dotnet@v1
+      uses: actions/setup-dotnet@v4
       with:
         dotnet-version: 6.0.x
     - name: Check dotnet

diff --git a/.github/workflows/amd64_macos_cmake_dotnet.yml b/.github/workflows/amd64_macos_cmake_dotnet.yml
@@ -22,7 +22,7 @@ jobs:
           brew install swig
           swig -version
       - name: Setup .NET 6.0
-        uses: actions/setup-dotnet@v1
+        uses: actions/setup-dotnet@v4
         with:
           dotnet-version: 6.0.x
       - name: Check dotnet

diff --git a/bazel/docker/almalinux/Dockerfile b/bazel/docker/almalinux/Dockerfile
@@ -27,7 +27,7 @@ ENV JAVA_HOME=/usr/lib/jvm/java-openjdk
 
 # Install Python
 RUN dnf -y update \
-&& dnf -y install python3-devel python3-pip \
+&& dnf -y install python3-devel python3-pip python3-numpy \
 && dnf clean all \
 && rm -rf /var/cache/dnf
 

diff --git a/bazel/docker/archlinux/Dockerfile b/bazel/docker/archlinux/Dockerfile
@@ -7,7 +7,8 @@ ENV PATH=/usr/local/bin:$PATH
 RUN pacman -Syu --noconfirm git base-devel bazel
 
 # Install Python
-RUN pacman -Syu --noconfirm python python-pip python-setuptools
+RUN pacman -Syu --noconfirm python python-pip python-setuptools \
+ python-numpy python-pandas
 
 FROM env AS devel
 WORKDIR /home/project

diff --git a/bazel/docker/debian/Dockerfile b/bazel/docker/debian/Dockerfile
@@ -6,9 +6,11 @@ FROM debian:latest AS env
 RUN apt-get update -qq \
 && apt-get install -yq git wget curl libssl-dev build-essential \
 && apt-get install -yq python3-dev python3-pip python3-venv \
+ python3-numpy python3-pandas \
 && apt-get install -yq default-jdk \
 && apt-get clean \
 && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+
 # Install Bazel
 RUN curl https://bazel.build/bazel-release.pub.gpg | apt-key add -
 ARG TARGETARCH=amd64

diff --git a/bazel/docker/fedora/Dockerfile b/bazel/docker/fedora/Dockerfile
@@ -26,7 +26,7 @@ ENV JAVA_HOME=/usr/lib/jvm/java-openjdk
 
 # Install Python
 RUN dnf -y update \
-&& dnf -y install python3 python3-devel python3-pip \
+&& dnf -y install python3 python3-devel python3-pip python3-numpy \
 && dnf clean all
 
 FROM env AS devel

diff --git a/bazel/docker/rockylinux/Dockerfile b/bazel/docker/rockylinux/Dockerfile
@@ -27,7 +27,7 @@ ENV JAVA_HOME=/usr/lib/jvm/java-openjdk
 
 # Install Python
 RUN dnf -y update \
-&& dnf -y install python3-devel python3-pip \
+&& dnf -y install python3-devel python3-pip python3-numpy \
 && dnf clean all \
 && rm -rf /var/cache/dnf
 

diff --git a/bazel/docker/ubuntu/Dockerfile b/bazel/docker/ubuntu/Dockerfile
@@ -10,6 +10,7 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 RUN apt-get update -qq \
 && apt-get install -yq git wget curl libssl-dev build-essential \
 && apt-get install -yq python3-dev python3-pip python3-venv \
+ python3-numpy python3-pandas \
 && apt-get install -yq default-jdk \
 && apt-get clean \
 && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*

diff --git a/ortools/math_opt/solver_tests/ip_parameter_tests.cc b/ortools/math_opt/solver_tests/ip_parameter_tests.cc
@@ -1099,6 +1099,9 @@ TEST_P(LargeInstanceIpParameterTest, IterationLimit) {
 }
 
 TEST_P(LargeInstanceIpParameterTest, NodeLimit) {
+  if (GetParam().solver_type == SolverType::kHighs) {
+    GTEST_SKIP() << "Ignoring this test as Highs 1.7+ returns unimplemented";
+  }
   ASSERT_OK_AND_ASSIGN(std::unique_ptr<Model> model, Load23588());
   SolveParameters params = GetParam().base_parameters;
   params.node_limit = 1;
@@ -1219,6 +1222,9 @@ TEST_P(LargeInstanceIpParameterTest, BestBoundLimit) {
 }
 
 TEST_P(LargeInstanceIpParameterTest, SolutionLimit) {
+  if (GetParam().solver_type == SolverType::kHighs) {
+    GTEST_SKIP() << "Ignoring this test as Highs 1.7+ returns unimplemented";
+  }
   ASSERT_OK_AND_ASSIGN(std::unique_ptr<Model> model, Load23588());
   SolveParameters params = GetParam().base_parameters;
   params.solution_limit = 1;

diff --git a/ortools/math_opt/solver_tests/status_tests.cc b/ortools/math_opt/solver_tests/status_tests.cc
@@ -99,6 +99,9 @@ TEST_P(StatusTest, PrimalAndDualInfeasible) {
         << "Ignoring this test as GLPK gets stuck in presolve for IP's "
            "with a primal-dual infeasible LP relaxation.";
   }
+  if (GetParam().solver_type == SolverType::kHighs) {
+    GTEST_SKIP() << "Ignoring this test as Highs 1.7+ returns error.";
+  }
 
   Model model;
   const Variable x1 =
@@ -373,6 +376,9 @@ TEST_P(StatusTest, IncompleteIpSolve) {
     GTEST_SKIP() << "Ignoring this test as it is an IP-only test and requires "
                     "support for node_limit.";
   }
+  if (GetParam().solver_type == SolverType::kHighs) {
+    GTEST_SKIP() << "Ignoring this test as Highs 1.7+ returns MODEL_INVALID";
+  }
   ASSERT_OK_AND_ASSIGN(const std::unique_ptr<const Model> model, Load23588());
   SolveArguments args = {
       .parameters = {.enable_output = true, .node_limit = 1}};

diff --git a/ortools/math_opt/solver_tests/testdata/BUILD.bazel b/ortools/math_opt/solver_tests/testdata/BUILD.bazel
@@ -12,6 +12,6 @@
 # limitations under the License.
 
 exports_files([
-  "23588.mps",
-  "beavma.mps",
+    "23588.mps",
+    "beavma.mps",
 ])
diff --git a/ortools/math_opt/solvers/BUILD.bazel b/ortools/math_opt/solvers/BUILD.bazel
@@ -313,6 +313,7 @@ cc_test(
     name = "cp_sat_solver_test",
     srcs = ["cp_sat_solver_test.cc"],
     shard_count = 10,
+    timeout = "eternal",
     deps = [
         ":cp_sat_solver",
         "//ortools/base:gmock_main",