Use openblas/clapack on windows static (#46904)

2026-01-18 01:11:23 +01:00 · 2025-09-03 22:13:29 +02:00
parent b1b19307e2
commit d23688e78a
8 changed files with 31 additions and 30 deletions
--- a/ports/blas/portfile.cmake
+++ b/ports/blas/portfile.cmake
@@ -47,16 +47,9 @@ if(VCPKG_TARGET_IS_OSX OR VCPKG_TARGET_IS_IOS)
    set(requires "")
    set(libs "-framework Accelerate")
    set(cflags "-framework Accelerate")
-elseif(VCPKG_TARGET_IS_UWP
-        OR (VCPKG_TARGET_IS_WINDOWS AND VCPKG_TARGET_ARCHITECTURE MATCHES "arm")
-        OR VCPKG_TARGET_IS_MINGW
-        OR NOT VCPKG_TARGET_IS_WINDOWS
-        OR NOT (VCPKG_LIBRARY_LINKAGE STREQUAL "static"))
+else()
    set(BLA_VENDOR OpenBLAS)
    set(requires openblas)
-else()
-    set(BLA_VENDOR Generic)
-    set(requires "blas-reference")
 endif()

 configure_file("${CMAKE_CURRENT_LIST_DIR}/blas.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/blas.pc" @ONLY)
--- a/ports/blas/vcpkg.json
+++ b/ports/blas/vcpkg.json
@@ -2,20 +2,13 @@
  "$comment": "Keep the platform expressions in sync with the wrappers installed by the portfiles!",
  "name": "blas",
  "version-date": "2023-04-14",
-  "port-version": 3,
+  "port-version": 4,
  "description": "Metapackage for packages which provide BLAS",
  "license": null,
  "dependencies": [
-    {
-      "name": "lapack-reference",
-      "features": [
-        "cblas"
-      ],
-      "platform": "!osx & !ios & !uwp & !(windows & arm) & windows & static & !mingw"
-    },
    {
      "name": "openblas",
-      "platform": "!osx & !ios & (uwp | (windows & arm) | !windows | !static | mingw)"
+      "platform": "!osx & !ios"
    },
    {
      "name": "vcpkg-cmake",
--- a/ports/lapack/portfile.cmake
+++ b/ports/lapack/portfile.cmake
@@ -22,13 +22,14 @@ if(VCPKG_TARGET_IS_OSX OR VCPKG_TARGET_IS_IOS)
        configure_file("${CMAKE_CURRENT_LIST_DIR}/lapack.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/lapack.pc" @ONLY)
    endif()
    unset(installed_module)
-elseif(VCPKG_TARGET_IS_UWP OR (VCPKG_TARGET_IS_WINDOWS AND VCPKG_TARGET_ARCHITECTURE MATCHES "arm"))
+elseif(VCPKG_TARGET_IS_UWP
+        OR (VCPKG_TARGET_IS_WINDOWS AND VCPKG_TARGET_ARCHITECTURE MATCHES "arm")
+        OR (VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "static" AND NOT VCPKG_TARGET_IS_MINGW))
    configure_file("${CURRENT_INSTALLED_DIR}/share/clapack/wrapper/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/lapack/vcpkg-cmake-wrapper.cmake" COPYONLY)
    configure_file("${CURRENT_INSTALLED_DIR}/share/clapack/FindLAPACK.cmake" "${CURRENT_PACKAGES_DIR}/share/lapack/FindLAPACK.cmake" COPYONLY)
    set(libs "-llapack -llibf2c")
    configure_file("${CMAKE_CURRENT_LIST_DIR}/lapack.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/lapack.pc" @ONLY)
    if(NOT VCPKG_BUILD_TYPE)
-        set(libs "-llapack -llibf2c")
        configure_file("${CMAKE_CURRENT_LIST_DIR}/lapack.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/lapack.pc" @ONLY)
    endif()
 else()
--- a/ports/lapack/vcpkg.json
+++ b/ports/lapack/vcpkg.json
@@ -2,18 +2,18 @@
  "$comment": "Keep the platform expressions in sync with the wrappers installed by the portfiles!",
  "name": "lapack",
  "version-date": "2023-06-10",
-  "port-version": 2,
+  "port-version": 3,
  "description": "Metapackage for packages which provide LAPACK",
  "license": null,
  "supports": "!android",
  "dependencies": [
    {
      "name": "clapack",
-      "platform": "uwp | (arm & windows)"
+      "platform": "!osx & !ios & (uwp | (arm & windows) | (static & windows & !mingw))"
    },
    {
      "name": "lapack-reference",
-      "platform": "!osx & !ios & !uwp & !(arm & windows)"
+      "platform": "!osx & !ios & (!uwp & !(arm & windows) & !(static & windows & !mingw))"
    },
    {
      "name": "vcpkg-cmake",
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -48,6 +48,8 @@ apr:arm64-android=fail
 apr:x64-android=fail
 apsi:arm-neon-android=fail
 apsi:x64-android=fail
+arpack-ng:x64-windows-static-md=fail
+arpack-ng:x64-windows-static=fail
 # Broken with CUDA 12; needs update to 3.8.3 and https://github.com/arrayfire/arrayfire/issues/3349 fixed
 arrayfire:x64-linux=fail
 avro-c:arm-neon-android=fail
@@ -97,8 +99,8 @@ vcpkg-ci-blas:x64-linux=pass # openblas
 vcpkg-ci-blas:x64-osx=pass # accelerate framework
 vcpkg-ci-blas:x64-uwp=pass # openblas
 vcpkg-ci-blas:x64-windows-release=pass # openblas
-vcpkg-ci-blas:x64-windows-static-md=pass # lapack-reference[blas]
-vcpkg-ci-blas:x64-windows-static=pass # lapack-reference[blas]
+vcpkg-ci-blas:x64-windows-static-md=pass # openblas
+vcpkg-ci-blas:x64-windows-static=pass # openblas
 vcpkg-ci-blas:x64-windows=pass # openblas
 vcpkg-ci-blas:x86-windows=pass # openblas

@@ -109,8 +111,8 @@ clapack:x64-android=fail
 clapack:x64-linux=skip
 clapack:x64-osx=skip
 clapack:x64-windows-release=skip
-clapack:x64-windows-static-md=skip
-clapack:x64-windows-static=skip
+clapack:x64-windows-static-md=pass
+clapack:x64-windows-static=pass
 clapack:x64-windows=skip
 clapack:x86-windows=skip
 cpprestsdk:arm-neon-android=fail # std::string issue, https://github.com/microsoft/vcpkg/pull/41293#issuecomment-2942853561
@@ -127,8 +129,8 @@ lapack-reference:x64-osx=skip
 lapack-reference:x64-uwp=skip
 #openblas:arm64-osx=skip
 #openblas:x64-osx=skip
-#openblas:x64-windows-static-md=skip
-#openblas:x64-windows-static=skip
+openblas:x64-windows-static-md=pass
+openblas:x64-windows-static=pass
 # </BLAS+LAPACK>
 ################################################################
 blitz:x64-android=fail
@@ -215,6 +217,8 @@ clockutils:arm64-android=fail
 clockutils:x64-android=fail
 clrng:arm-neon-android=fail
 coin-or-ipopt:x64-linux=fail
+coin-or-ipopt:x64-windows-static-md=fail
+coin-or-ipopt:x64-windows-static=fail
 coroutine:arm-neon-android=fail
 coroutine:arm64-android=fail
 coroutine:arm64-osx=fail
--- a/versions/b-/blas.json
+++ b/versions/b-/blas.json
@@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "d47ddd31b0da28c8da1ec016005b3381c69996da",
+      "version-date": "2023-04-14",
+      "port-version": 4
+    },
    {
      "git-tree": "6155e3a08c8a572e1e8ab225b6f0fdb56e84eca1",
      "version-date": "2023-04-14",
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -734,7 +734,7 @@
    },
    "blas": {
      "baseline": "2023-04-14",
-      "port-version": 3
+      "port-version": 4
    },
    "blaze": {
      "baseline": "3.8.2",
@@ -4410,7 +4410,7 @@
    },
    "lapack": {
      "baseline": "2023-06-10",
-      "port-version": 2
+      "port-version": 3
    },
    "lapack-reference": {
      "baseline": "3.12.1",
--- a/versions/l-/lapack.json
+++ b/versions/l-/lapack.json
@@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "12ac83a3627b42dd68a96751ec39051b89761656",
+      "version-date": "2023-06-10",
+      "port-version": 3
+    },
    {
      "git-tree": "629522c4a52d924f0eeda0974bcf74c7d8f024fb",
      "version-date": "2023-06-10",