fixes for soplex 7

aibasel · Jul 23, 2024 · 7874d42 · 7874d42
1 parent 856443f
commit 7874d42
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/.github/workflows/style.yml b/.github/workflows/style.yml
@@ -25,6 +25,13 @@ jobs:
           pip3 install tox
           sudo apt-get -y install clang-tidy-15
 
+      # TODO: Remove once issue with Ubuntu 24.04 and clang++-15 is resolved.
+      - name: Work around https://github.com/actions/runner-images/issues/8659
+        run: |
+          sudo rm -f /etc/apt/sources.list.d/ubuntu-toolchain-r-ubuntu-test-noble.list
+          sudo apt-get update
+          sudo apt-get install -y --allow-downgrades libc6=2.35-* libc6-dev=2.35-* libstdc++6=12.3.0-* libgcc-s1=12.3.0-*
+
       - name: Install uncrustify
         run: |
           # Set up uncrustify.

diff --git a/src/search/CMakeLists.txt b/src/search/CMakeLists.txt
@@ -561,8 +561,7 @@ if(USE_LP)
         target_sources(lp_solver INTERFACE lp/cplex_solver_interface.h lp/cplex_solver_interface.cc)
     endif()
 
-    # TODO: we actually require a version greater than 6.0.3 but it is not released yet.
-    find_package(soplex 6.0.3 QUIET)
+    find_package(soplex 7.1.0 QUIET)
     if (SOPLEX_FOUND)
         message(STATUS "Found SoPlex: ${SOPLEX_INCLUDE_DIRS}")
         target_link_libraries(lp_solver INTERFACE libsoplex)

diff --git a/src/search/lp/soplex_solver_interface.cc b/src/search/lp/soplex_solver_interface.cc
@@ -143,8 +143,10 @@ void SoPlexSolverInterface::print_failure_analysis() const {
     case SPxSolverBase<double>::Status::NOT_INIT:
         cout << "Not initialized" << endl;
         break;
+#if SOPLEX_VERSION < 700
     case SPxSolverBase<double>::Status::ABORT_EXDECOMP:
     case SPxSolverBase<double>::Status::ABORT_DECOMP:
+#endif
     case SPxSolverBase<double>::Status::ABORT_CYCLING:
     case SPxSolverBase<double>::Status::ABORT_TIME:
     case SPxSolverBase<double>::Status::ABORT_ITER: