From 6ebf8c123bc8077dc9216db6438eeabaa154c473 Mon Sep 17 00:00:00 2001 From: Jaap Aarts Date: Fri, 18 Oct 2024 07:23:47 +0200 Subject: [PATCH] [openblas] update openblas to 0.3.28 (#40911) Co-authored-by: NickelWenzel <55748692+NickelWenzel@users.noreply.github.com> Co-authored-by: WangWeiLin-MV <156736127+WangWeiLin-MV@users.noreply.github.com> --- ports/openblas/portfile.cmake | 16 +++++++++++++++- ports/openblas/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/o-/openblas.json | 5 +++++ 4 files changed, 23 insertions(+), 5 deletions(-) diff --git a/ports/openblas/portfile.cmake b/ports/openblas/portfile.cmake index bdb6ef1189..6fbb95be87 100644 --- a/ports/openblas/portfile.cmake +++ b/ports/openblas/portfile.cmake @@ -1,14 +1,21 @@ +vcpkg_download_distfile(ARM64_WINDOWS_UWP_PATCH + URLS "https://patch-diff.githubusercontent.com/raw/OpenMathLib/OpenBLAS/pull/4926.diff?full_index=1" + FILENAME "openblas-fix-arm64-windows-uwp.patch" + SHA512 808d375628499641f1134b4751c9861384b719dae14cf6bd4d9d4b09c9bfd9f8b13b2663e9fa9d09867b5b40817c26387ac659d2f6459d40a46455b2f540d018 +) + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO OpenMathLib/OpenBLAS REF "v${VERSION}" - SHA512 4accc5282244946157b7940211181e011940154ff47855702c68f57a0af2fa5a306f49e47b8c22c02eeff61760c6c220465f05a316a33ee3265bfce65ca4cb84 + SHA512 358301c8a60bedf920c07a110c772feb639e52412bd783789741fd2fd0686aac97e6b17ebcdf01ce48a2a15841058f82df0fee551af952f6e70b58140c055133 HEAD_REF develop PATCHES uwp.patch fix-redefinition-function.patch install-tools.patch gcc14.patch + ${ARM64_WINDOWS_UWP_PATCH} ) find_program(GIT NAMES git git.cmd) @@ -61,6 +68,13 @@ if (VCPKG_TARGET_IS_WINDOWS AND VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") list(APPEND OPENBLAS_EXTRA_OPTIONS -DCORE=GENERIC) endif() +# For emscripten only the riscv64 kernel with riscv64_generic target is supported +if(VCPKG_TARGET_IS_EMSCRIPTEN) + list(APPEND OPENBLAS_EXTRA_OPTIONS + -DEMSCRIPTEN_SYSTEM_PROCESSOR=riscv64 + -DTARGET=RISCV64_GENERIC) +endif() + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" ${conf_opts} diff --git a/ports/openblas/vcpkg.json b/ports/openblas/vcpkg.json index 09ea8bae95..98a777d1e6 100644 --- a/ports/openblas/vcpkg.json +++ b/ports/openblas/vcpkg.json @@ -1,7 +1,6 @@ { "name": "openblas", - "version": "0.3.27", - "port-version": 1, + "version": "0.3.28", "description": "OpenBLAS is an optimized BLAS library based on GotoBLAS2 1.13 BSD version.", "homepage": "https://github.com/OpenMathLib/OpenBLAS", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index 930b3b859a..cf51c57dba 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6569,8 +6569,8 @@ "port-version": 2 }, "openblas": { - "baseline": "0.3.27", - "port-version": 1 + "baseline": "0.3.28", + "port-version": 0 }, "opencascade": { "baseline": "7.8.1", diff --git a/versions/o-/openblas.json b/versions/o-/openblas.json index 7ec0d945d7..4baac01662 100644 --- a/versions/o-/openblas.json +++ b/versions/o-/openblas.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0ea117557042e4d6a0ee7659828c44938e322ee3", + "version": "0.3.28", + "port-version": 0 + }, { "git-tree": "a11cdf69c9d9071c73f8d88458aa8b09c597d695", "version": "0.3.27",