From 7874d42ded07eaa850a549f2fd0173980db45335 Mon Sep 17 00:00:00 2001 From: Florian Pommerening Date: Fri, 5 Jul 2024 23:55:40 +0200 Subject: [PATCH] fixes for soplex 7 --- .github/workflows/style.yml | 7 +++++++ src/search/CMakeLists.txt | 3 +-- src/search/lp/soplex_solver_interface.cc | 2 ++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.github/workflows/style.yml b/.github/workflows/style.yml index 0f2736a2c5..57eeff0db5 100644 --- 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 index 393c2b2ed9..2ed853265b 100644 --- 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 index 02c7cdb228..e0331c6388 100644 --- 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::Status::NOT_INIT: cout << "Not initialized" << endl; break; +#if SOPLEX_VERSION < 700 case SPxSolverBase::Status::ABORT_EXDECOMP: case SPxSolverBase::Status::ABORT_DECOMP: +#endif case SPxSolverBase::Status::ABORT_CYCLING: case SPxSolverBase::Status::ABORT_TIME: case SPxSolverBase::Status::ABORT_ITER: