From a4d5554ce117f8180442151b8063e9b59c4e4c98 Mon Sep 17 00:00:00 2001 From: lovasoa Date: Mon, 1 Jan 2024 19:45:11 +0100 Subject: [PATCH] update highs to v1.6.0, remove now unnecessary dependency to openmp --- HiGHS | 2 +- build.rs | 6 ------ install-dependencies.sh | 7 +++---- 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/HiGHS b/HiGHS index 45a127b..21da9b9 160000 --- a/HiGHS +++ b/HiGHS @@ -1 +1 @@ -Subproject commit 45a127b78060942721f75f46a04b274c2bb963d8 +Subproject commit 21da9b90e0dceeb22ef9e35e5ff2c3ab17dc5232 diff --git a/build.rs b/build.rs index 3b34e82..6033732 100644 --- a/build.rs +++ b/build.rs @@ -73,12 +73,6 @@ fn build() -> bool { } else if linux { println!("cargo:rustc-link-lib=dylib=stdc++"); } - if apple { - println!("cargo:rustc-link-lib=dylib=omp"); - } else if !windows { - // No openmp 3 on windows - println!("cargo:rustc-link-lib=dylib=gomp"); - } println!("cargo:rerun-if-changed=HiGHS/src/interfaces/highs_c_api.h"); true diff --git a/install-dependencies.sh b/install-dependencies.sh index c403e1f..737c9af 100755 --- a/install-dependencies.sh +++ b/install-dependencies.sh @@ -1,11 +1,10 @@ set -x if test -x "$(which apt-get)"; then - sudo apt-get install libstdc++6 libgomp1 cmake + sudo apt-get install libstdc++6 cmake elif test -x "$(which dnf)"; then - sudo dnf install libstdc++ libgomp cmake + sudo dnf install libstdc++ cmake elif test -x "$(which brew)"; then - brew install libomp cmake - brew link --force libomp + brew install cmake else echo "system not supported" exit 1