From bdead1b51273d7c8b5eca6467475ad2cb6f5f48a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20Omn=C3=A8s?= <26088210+flomnes@users.noreply.github.com> Date: Tue, 16 Jan 2024 13:08:15 +0100 Subject: [PATCH] Bump OR-Tools (fix crash with XPRESS) (#1873) Since OR-Tools 9.5-rte3.0 does not support `SetStartingLpBasis` (it supports `SetStartingLpBasisInt`), we must use 9.8-rte1.0-beta2 instead. Using XPRESS with Antares Simulator 8.8.0 (OR-Tools 9.5-rte3.0) causes a crash with the following error message ``` W0111 15:00:55.315875 169991 environment.cc:282] Optimizer version: 39.01.01 (OR-Tools was compiled with version 41). [2024-01-11 15:00:55][solver][infos] Solver OR-Tools MPS File: `problem-1-1--optim-nb-2.mps' F0111 15:00:55.821070 169991 linear_solver.h:1766] Not supported by this solver. *** Check failure stack trace: *** Abandon (core dumped) ``` Also, don't convert CMAKE_BUILD_TYPE to lower-case. It causes issues with SCIP and antares-deps. --- docs/build/3-Build.md | 2 +- ortools_tag | 2 +- src/CMakeLists.txt | 2 -- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/docs/build/3-Build.md b/docs/build/3-Build.md index 1cc36392b7..4bb18ce1b9 100644 --- a/docs/build/3-Build.md +++ b/docs/build/3-Build.md @@ -34,7 +34,7 @@ Here is a list of available CMake configure option : |Option | Description | |:-------|-------| -|`CMAKE_BUILD_TYPE` | Define build type. Available values are `release` and `debug` (case insensitive) | +|`CMAKE_BUILD_TYPE` | Define build type. Available values are `Release` and `Debug` | |`BUILD_UI`|Enable or disable Antares Simulator UI compilation (default `ON`)| |`BUILD_ALL`|Enable build of ALL external libraries (default `OFF`)| |`DEPS_INSTALL_DIR`|Define dependencies libraries install directory| diff --git a/ortools_tag b/ortools_tag index a75a3d2f6d..fdaa0174f8 100644 --- a/ortools_tag +++ b/ortools_tag @@ -1 +1 @@ -v9.5-rte3.0 \ No newline at end of file +v9.8-rte1.0 \ No newline at end of file diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index f790c854b7..92e1cedaa8 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -66,8 +66,6 @@ execute_process(COMMAND OUTPUT_VARIABLE GIT_SHA1_SHORT ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE) -string(TOLOWER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE) - # Build Configuration set(ANTARES_TARGET "${CMAKE_BUILD_TYPE}")