Skip to content

Commit

Permalink
[issue1095] Remove COIN/OSI/Gurobi references.
Browse files Browse the repository at this point in the history
We remove some additional references to COIN/OSI/Gurobi. Our Windows tests forced static linking because of OSI, we no longer do this.
  • Loading branch information
remochristen authored Jul 25, 2023
1 parent 37b89a6 commit 8bd99b4
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 12 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ This version of Fast Downward has been tested with the following software versio
| macOS 11 | 3.8 | AppleClang 13 | 3.24 |
| Windows 10 | 3.8 | Visual Studio Enterprise 2019 (MSVC 19.29) and 2022 (MSVC 19.31) | 3.22 |

We test LP support with CPLEX 12.9, SoPlex 3.1.1 and Osi 0.107.9.
On Ubuntu, we test both CPLEX and SoPlex. On Windows, we currently
only test CPLEX, and on macOS, we do not test LP solvers (yet).
We test LP support with CPLEX 22.1.1 and SoPlex 6.0.3+. On Ubuntu, we
test both CPLEX and SoPlex. On Windows, we currently only test CPLEX,
and on macOS, we do not test LP solvers (yet).


## Contributors
Expand Down
2 changes: 0 additions & 2 deletions misc/tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,7 @@ commands =
[testenv:build]
changedir = {toxinidir}/../
passenv =
DOWNWARD_COIN_ROOT
DOWNWARD_CPLEX_ROOT
DOWNWARD_GUROBI_ROOT
DOWNWARD_SOPLEX_ROOT
commands =
./build.py
Expand Down
7 changes: 0 additions & 7 deletions src/cmake_modules/FastDownwardMacros.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,6 @@ macro(fast_downward_set_compiler_flags)
set(CMAKE_CXX_FLAGS_PROFILE "-O3 -pg")
elseif(MSVC)
check_and_set_compiler_flag( "/std:c++20" )
# We force linking to be static on Windows because this makes compiling OSI simpler
# (dynamic linking would require DLLs for OSI). On Windows this is a compiler
# setting, not a linker setting.
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MT")
string(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}")
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MTd")
string(REPLACE "/MDd" "/MTd" CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}")

# Enable exceptions.
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHsc")
Expand Down

0 comments on commit 8bd99b4

Please sign in to comment.