diff --git a/recipe/bld.bat b/recipe/bld.bat index 6dc4487..7834b89 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -19,7 +19,7 @@ cmake -G Ninja ^ -D ZLIB=ON ^ -D READLINE=OFF ^ -D EXPRINT=cppad ^ - -D SYM=bliss ^ + -D SYM=snauty ^ %CMAKE_ARGS% if %ERRORLEVEL% neq 0 exit 1 diff --git a/recipe/build.sh b/recipe/build.sh index fbb9dae..522b35c 100755 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -24,7 +24,7 @@ cmake -B scipoptsuite-build -S "${SRC_DIR}/scipoptsuite" \ -D IPOPT_DIR="${PREFIX}" \ -D ZLIB=ON \ -D READLINE=OFF \ - -D SYM=bliss \ + -D SYM=snauty \ -D EXPRINT=cppad \ -D CLIQUER=ON \ ${CMAKE_ARGS} diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 3d02daf..0af5119 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,9 +1,9 @@ # TODO check these versions have not changed -{% set scip_version = "9.0.1" %} -{% set papilo_version = "2.2.1" %} -{% set soplex_version = "7.0.1" %} -{% set gcg_version = "3.6.1" %} -{% set zimpl_version = "3.6.0" %} +{% set scip_version = "9.1.0" %} +{% set papilo_version = "2.3.0" %} +{% set soplex_version = "7.1.0" %} +{% set gcg_version = "3.6.2" %} +{% set zimpl_version = "3.6.1" %} # For dispatching between Unix and Windows {% set install_prefix = "." %} # [unix] {% set install_prefix = "Library" %} # [win] @@ -15,13 +15,13 @@ package: source: - url: https://scipopt.org/download/release/scipoptsuite-{{ scip_version }}.tgz - sha256: 1efd3063bb8abe80bb1baab9b94156e85029e9792738f3a0a4be97936f095473 + sha256: 770fc138fc40c016414b8a1e55461e920f5e2f5f4ae1a773a3ed6c81cd1fe93f folder: scipoptsuite patches: - 0002-Require-PCRE-on-WIN32.patch build: - number: 1 + number: 0 requirements: build: diff --git a/recipe/run_scip_test.sh b/recipe/run_scip_test.sh index 09f7d93..68a92ba 100644 --- a/recipe/run_scip_test.sh +++ b/recipe/run_scip_test.sh @@ -14,5 +14,5 @@ scip --version scip --version | grep -iE 'CppAD\s+[0-9]+' scip --version | grep -iE 'ZLIB\s+[0-9]+\.[0-9]+\.[0-9]+' scip --version | grep -iE 'GMP\s+[0-9]+\.[0-9]+\.[0-9]+' -scip --version | grep -iE 'bliss\s+[0-9]+\.[0-9]+' +scip --version | grep -iE 'nauty\s+[0-9]+\.[0-9]+\.[0-9]+' scip --version | grep -iE 'Ipopt\s+[0-9]+\.[0-9]+\.[0-9]+'