[highs] upgrade to version 1.10.0 (#44534)

This commit is contained in:
Luke Marshall 2025-03-26 01:56:38 -07:00 committed by GitHub
parent b1fc7e0a1f
commit 6eb418b0bd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
8 changed files with 63 additions and 30 deletions

View File

@ -1,21 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d27135425..43c9293ae 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,6 +7,7 @@
cmake_minimum_required(VERSION 3.15...3.27)
# set preference for clang compiler and intel compiler over gcc and other compilers
+if(0)
include(Platform/${CMAKE_SYSTEM_NAME}-Determine-C OPTIONAL)
include(Platform/${CMAKE_SYSTEM_NAME}-C OPTIONAL)
set(CMAKE_C_COMPILER_NAMES clang gcc icx cc ${CMAKE_C_COMPILER_NAMES})
@@ -14,7 +15,7 @@ set(CMAKE_C_COMPILER_NAMES clang gcc icx cc ${CMAKE_C_COMPILER_NAMES})
include(Platform/${CMAKE_SYSTEM_NAME}-Determine-CXX OPTIONAL)
include(Platform/${CMAKE_SYSTEM_NAME}-CXX OPTIONAL)
set(CMAKE_CXX_COMPILER_NAMES clang++ g++ icpx c++ ${CMAKE_CXX_COMPILER_NAMES})
-
+endif()
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
include(set-version)

View File

@ -0,0 +1,14 @@
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e390ac4b3..7117609d2 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -154,7 +154,9 @@ else()
# $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/highs>
)
+ if (CUPDLP_GPU)
target_include_directories(highs PUBLIC "${CMAKE_CUDA_PATH}/include")
+ endif()
# target_include_directories(highs PRIVATE
# $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/interfaces>

View File

@ -1,17 +1,17 @@
diff --git a/src/HConfig.h.in b/src/HConfig.h.in
index 198e07b0d..0d9eba53f 100644
index 13470d465..734dcf382 100644
--- a/src/HConfig.h.in
+++ b/src/HConfig.h.in
@@ -5,7 +5,7 @@
#cmakedefine ZLIB_FOUND
#cmakedefine CUPDLP_CPU
@@ -7,7 +7,7 @@
#cmakedefine CUPDLP_GPU
#cmakedefine CUPDLP_FORCE_NATIVE
#cmakedefine CMAKE_BUILD_TYPE "@CMAKE_BUILD_TYPE@"
-#cmakedefine CMAKE_INSTALL_PREFIX "@CMAKE_INSTALL_PREFIX@"
+#cmakedefine CMAKE_INSTALL_PREFIX ""
#cmakedefine HIGHSINT64
#cmakedefine HIGHS_NO_DEFAULT_THREADS
#cmakedefine HIGHS_HAVE_MM_PAUSE
@@ -16,6 +16,6 @@
@@ -18,6 +18,6 @@
#define HIGHS_VERSION_MAJOR @HIGHS_VERSION_MAJOR@
#define HIGHS_VERSION_MINOR @HIGHS_VERSION_MINOR@
#define HIGHS_VERSION_PATCH @HIGHS_VERSION_PATCH@

33
ports/highs/fix-uwp.patch Normal file
View File

@ -0,0 +1,33 @@
diff --git a/app/CLI11.hpp b/app/CLI11.hpp
index 3268232dc..2ed2fd7c8 100644
--- a/app/CLI11.hpp
+++ b/app/CLI11.hpp
@@ -434,6 +434,19 @@ CLI11_INLINE std::vector<std::string> compute_win32_argv();
namespace detail {
#ifdef _WIN32
+ #ifdef WINAPI_FAMILY
+ #if WINAPI_FAMILY == WINAPI_FAMILY_APP // window store app
+CLI11_INLINE std::vector<std::string> compute_win32_argv() {
+ std::vector<std::string> result;
+
+ result.reserve(static_cast<size_t>(__argc));
+ for(size_t i = 0; i < static_cast<size_t>(__argc); ++i) {
+ result.push_back(std::string(__argv[i]));
+ }
+
+ return result;
+}
+ #else
CLI11_INLINE std::vector<std::string> compute_win32_argv() {
std::vector<std::string> result;
int argc = 0;
@@ -454,6 +467,8 @@ CLI11_INLINE std::vector<std::string> compute_win32_argv() {
return result;
}
+ #endif
+ #endif
#endif
} // namespace detail

View File

@ -2,11 +2,12 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO ERGO-Code/HiGHS
REF "v${VERSION}"
SHA512 c5759440cdcb4be02a464ba8f43bc63fd7edc3837bcd71392719a81ea60a564e164b0ecce5784eac03fda97f26ce0495c108f3c77299a1ea039b26d060fd1689
SHA512 b6155859fda446725406fb062c7e89ea90b254767c680f31e1581eca6cdb3e68f6cf74abefac9c095a54a6dde6d6b14bec5e2429c79506acff9d5b0586e53a57
HEAD_REF master
PATCHES
fix-hconfig-path.patch
fix-compiler.patch
fix-uwp.patch
fix-cuda.patch
)
vcpkg_cmake_configure(
@ -21,6 +22,7 @@ vcpkg_cmake_configure(
vcpkg_cmake_install()
vcpkg_fixup_pkgconfig()
vcpkg_copy_tools(TOOL_NAMES highs AUTO_CLEAN)
vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/highs")
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt")

View File

@ -1,6 +1,6 @@
{
"name": "highs",
"version": "1.9.0",
"version": "1.10.0",
"description": "High performance library to solve linear, mixed-integer, and convex quadratic optimization problems.",
"homepage": "https://highs.dev",
"license": "MIT",

View File

@ -3597,7 +3597,7 @@
"port-version": 1
},
"highs": {
"baseline": "1.9.0",
"baseline": "1.10.0",
"port-version": 0
},
"highway": {

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "5b22266f9a4cff07b45b07828c852f01b0b50dde",
"version": "1.10.0",
"port-version": 0
},
{
"git-tree": "d7f60dddda53642bb9bdb7bd4b5b55ee0ca5547f",
"version": "1.9.0",