From 31494110d697be7a0d73021a82aba0b1ed6cde31 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Thu, 11 Dec 2025 23:59:14 +0100 Subject: [PATCH] [vcpkg-ci-cblas/lapack] Renamed from cblas/lapack-test (#48557) --- scripts/ci.baseline.txt | 63 +++++++++++-------- scripts/test_ports/cblas-test/portfile.cmake | 5 -- scripts/test_ports/cblas-test/vcpkg.json | 19 ------ scripts/test_ports/lapack-test/portfile.cmake | 5 -- scripts/test_ports/lapack-test/vcpkg.json | 19 ------ .../CMakeLists.txt | 1 + .../test_ports/vcpkg-ci-cblas/portfile.cmake | 10 +++ scripts/test_ports/vcpkg-ci-cblas/vcpkg.json | 18 ++++++ .../CMakeLists.txt | 2 + .../test_ports/vcpkg-ci-lapack/portfile.cmake | 10 +++ scripts/test_ports/vcpkg-ci-lapack/vcpkg.json | 13 ++++ 11 files changed, 90 insertions(+), 75 deletions(-) delete mode 100644 scripts/test_ports/cblas-test/portfile.cmake delete mode 100644 scripts/test_ports/cblas-test/vcpkg.json delete mode 100644 scripts/test_ports/lapack-test/portfile.cmake delete mode 100644 scripts/test_ports/lapack-test/vcpkg.json rename scripts/test_ports/{cblas-test => vcpkg-ci-cblas}/CMakeLists.txt (99%) create mode 100644 scripts/test_ports/vcpkg-ci-cblas/portfile.cmake create mode 100644 scripts/test_ports/vcpkg-ci-cblas/vcpkg.json rename scripts/test_ports/{lapack-test => vcpkg-ci-lapack}/CMakeLists.txt (98%) create mode 100644 scripts/test_ports/vcpkg-ci-lapack/portfile.cmake create mode 100644 scripts/test_ports/vcpkg-ci-lapack/vcpkg.json diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 136fc7582c..3abf883326 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -69,33 +69,7 @@ berkeleydb:arm-neon-android=fail berkeleydb:arm64-android=fail berkeleydb:x64-android=fail binlog:arm-neon-android=fail -################################################################ -# -# These skips need to match the decision tree for which backends we use; see ports/blas/portfile.cmake -lapack-test:arm64-osx=pass # accelerate framework -lapack-test:arm64-uwp=pass # clapack -lapack-test:arm64-windows-static-md=pass # clapack -lapack-test:arm64-windows=pass # clapack -lapack-test:x64-linux=pass # lapack-reference[noblas] -lapack-test:x64-uwp=pass # clapack -lapack-test:x64-windows-release=pass # lapack-reference[noblas] -lapack-test:x64-windows-static-md=pass # clapack -lapack-test:x64-windows-static=pass # clapack -lapack-test:x64-windows=pass # lapack-reference[noblas] -lapack-test:x86-windows=pass # lapack-reference[noblas] -vcpkg-ci-blas:arm64-android=pass # openblas -vcpkg-ci-blas:arm64-osx=pass # accelerate framework -vcpkg-ci-blas:arm64-uwp=pass # openblas -vcpkg-ci-blas:arm64-windows-static-md=pass # openblas -vcpkg-ci-blas:arm64-windows=pass # openblas -vcpkg-ci-blas:x64-linux=pass # openblas -vcpkg-ci-blas:x64-uwp=pass # openblas -vcpkg-ci-blas:x64-windows-release=pass # openblas -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 - +# These skips/pass need to match the decision tree for which backends we use; see ports/blas/portfile.cmake clapack:arm-neon-android=skip clapack:arm64-android=skip clapack:arm64-osx=skip @@ -824,6 +798,18 @@ vcpkg-ci-arrow:x64-windows-static-md=pass vcpkg-ci-arrow:x64-windows-static=pass vcpkg-ci-arrow:x64-windows=pass vcpkg-ci-aurora-au:x64-linux=pass +vcpkg-ci-blas:arm64-android=pass # openblas +vcpkg-ci-blas:arm64-osx=pass # accelerate framework +vcpkg-ci-blas:arm64-uwp=pass # openblas +vcpkg-ci-blas:arm64-windows-static-md=pass # openblas +vcpkg-ci-blas:arm64-windows=pass # openblas +vcpkg-ci-blas:x64-linux=pass # openblas +vcpkg-ci-blas:x64-uwp=pass # openblas +vcpkg-ci-blas:x64-windows-release=pass # openblas +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 vcpkg-ci-boost:arm-neon-android=pass vcpkg-ci-boost:arm64-android=pass vcpkg-ci-boost:arm64-uwp=pass @@ -837,6 +823,18 @@ vcpkg-ci-boost:x64-windows-static-md=pass vcpkg-ci-boost:x64-windows-static=pass vcpkg-ci-boost:x64-windows=pass vcpkg-ci-boost:x86-windows=pass +vcpkg-ci-cblas:arm64-android=pass +vcpkg-ci-cblas:arm64-osx=pass +vcpkg-ci-cblas:arm64-uwp=pass +vcpkg-ci-cblas:arm64-windows-static-md=pass +vcpkg-ci-cblas:arm64-windows=pass +vcpkg-ci-cblas:x64-linux=pass +vcpkg-ci-cblas:x64-uwp=pass +vcpkg-ci-cblas:x64-windows-release=pass +vcpkg-ci-cblas:x64-windows-static-md=pass +vcpkg-ci-cblas:x64-windows-static=pass +vcpkg-ci-cblas:x64-windows=pass +vcpkg-ci-cblas:x86-windows=pass vcpkg-ci-curl:arm-neon-android=pass vcpkg-ci-curl:arm64-android=pass vcpkg-ci-curl:arm64-osx=pass @@ -909,6 +907,17 @@ vcpkg-ci-itk:x64-windows-static-md=pass vcpkg-ci-itk:x64-windows-static=pass vcpkg-ci-itk:x64-windows=pass vcpkg-ci-itk:x86-windows=pass +vcpkg-ci-lapack:arm64-osx=pass +vcpkg-ci-lapack:arm64-uwp=pass +vcpkg-ci-lapack:arm64-windows-static-md=pass +vcpkg-ci-lapack:arm64-windows=pass +vcpkg-ci-lapack:x64-linux=pass +vcpkg-ci-lapack:x64-uwp=pass +vcpkg-ci-lapack:x64-windows-release=pass +vcpkg-ci-lapack:x64-windows-static-md=pass +vcpkg-ci-lapack:x64-windows-static=pass +vcpkg-ci-lapack:x64-windows=pass +vcpkg-ci-lapack:x86-windows=pass # lapack-reference vcpkg-ci-libigl:arm-neon-android=pass vcpkg-ci-libigl:arm64-android=pass vcpkg-ci-libigl:arm64-osx=pass diff --git a/scripts/test_ports/cblas-test/portfile.cmake b/scripts/test_ports/cblas-test/portfile.cmake deleted file mode 100644 index b6904bf783..0000000000 --- a/scripts/test_ports/cblas-test/portfile.cmake +++ /dev/null @@ -1,5 +0,0 @@ -SET(VCPKG_POLICY_EMPTY_PACKAGE enabled) - -# Make sure BLAS can be found -vcpkg_cmake_configure(SOURCE_PATH "${CURRENT_PORT_DIR}" - OPTIONS -DVCPKG_HOST_TRIPLET=${HOST_TRIPLET}) diff --git a/scripts/test_ports/cblas-test/vcpkg.json b/scripts/test_ports/cblas-test/vcpkg.json deleted file mode 100644 index 6b1df977ba..0000000000 --- a/scripts/test_ports/cblas-test/vcpkg.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "$comment": "Keep the platform expressions in sync with the wrappers installed by the portfiles!", - "name": "cblas-test", - "version-date": "2022-04-22", - "description": "Metapackage for packages which provide BLAS", - "license": null, - "dependencies": [ - "cblas", - { - "name": "pkgconf", - "host": true, - "platform": "windows" - }, - { - "name": "vcpkg-cmake", - "host": true - } - ] -} diff --git a/scripts/test_ports/lapack-test/portfile.cmake b/scripts/test_ports/lapack-test/portfile.cmake deleted file mode 100644 index 28b2faa0c9..0000000000 --- a/scripts/test_ports/lapack-test/portfile.cmake +++ /dev/null @@ -1,5 +0,0 @@ -SET(VCPKG_POLICY_EMPTY_PACKAGE enabled) - -# Make sure LAPACK can be found -vcpkg_cmake_configure(SOURCE_PATH "${CURRENT_PORT_DIR}" - OPTIONS -DVCPKG_HOST_TRIPLET=${HOST_TRIPLET}) diff --git a/scripts/test_ports/lapack-test/vcpkg.json b/scripts/test_ports/lapack-test/vcpkg.json deleted file mode 100644 index 00c2832d32..0000000000 --- a/scripts/test_ports/lapack-test/vcpkg.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "$comment": "Keep the platform expressions in sync with the wrappers installed by the portfiles!", - "name": "lapack-test", - "version-date": "2022-02-22", - "description": "Metapackage for packages which provide LAPACK", - "license": null, - "dependencies": [ - "lapack", - { - "name": "pkgconf", - "host": true, - "platform": "windows" - }, - { - "name": "vcpkg-cmake", - "host": true - } - ] -} diff --git a/scripts/test_ports/cblas-test/CMakeLists.txt b/scripts/test_ports/vcpkg-ci-cblas/CMakeLists.txt similarity index 99% rename from scripts/test_ports/cblas-test/CMakeLists.txt rename to scripts/test_ports/vcpkg-ci-cblas/CMakeLists.txt index 743ddb643d..d2cab7f5d0 100644 --- a/scripts/test_ports/cblas-test/CMakeLists.txt +++ b/scripts/test_ports/vcpkg-ci-cblas/CMakeLists.txt @@ -1,5 +1,6 @@ cmake_minimum_required(VERSION 3.17) project(Find_CBLAS_external) + find_package(PkgConfig REQUIRED) pkg_check_modules(CBLAS_PC REQUIRED IMPORTED_TARGET cblas) diff --git a/scripts/test_ports/vcpkg-ci-cblas/portfile.cmake b/scripts/test_ports/vcpkg-ci-cblas/portfile.cmake new file mode 100644 index 0000000000..3e7bac9f2b --- /dev/null +++ b/scripts/test_ports/vcpkg-ci-cblas/portfile.cmake @@ -0,0 +1,10 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) + +vcpkg_find_acquire_program(PKGCONFIG) +set(ENV{PKG_CONFIG} "${PKGCONFIG}") + +vcpkg_cmake_configure( + SOURCE_PATH "${CURRENT_PORT_DIR}" + OPTIONS + -DVCPKG_HOST_TRIPLET=${HOST_TRIPLET} +) diff --git a/scripts/test_ports/vcpkg-ci-cblas/vcpkg.json b/scripts/test_ports/vcpkg-ci-cblas/vcpkg.json new file mode 100644 index 0000000000..19b46173ba --- /dev/null +++ b/scripts/test_ports/vcpkg-ci-cblas/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "vcpkg-ci-cblas", + "version-string": "ci", + "description": "Validate metapackage which provides CBLAS", + "license": null, + "dependencies": [ + "cblas", + { + "name": "pkgconf", + "host": true, + "platform": "windows" + }, + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/scripts/test_ports/lapack-test/CMakeLists.txt b/scripts/test_ports/vcpkg-ci-lapack/CMakeLists.txt similarity index 98% rename from scripts/test_ports/lapack-test/CMakeLists.txt rename to scripts/test_ports/vcpkg-ci-lapack/CMakeLists.txt index 1874911a97..51088e687d 100644 --- a/scripts/test_ports/lapack-test/CMakeLists.txt +++ b/scripts/test_ports/vcpkg-ci-lapack/CMakeLists.txt @@ -1,6 +1,8 @@ cmake_minimum_required(VERSION 3.17) project(Find_LAPACK_external) + find_package(LAPACK REQUIRED) + find_package(PkgConfig REQUIRED) pkg_check_modules(LAPACK_PC REQUIRED IMPORTED_TARGET lapack) diff --git a/scripts/test_ports/vcpkg-ci-lapack/portfile.cmake b/scripts/test_ports/vcpkg-ci-lapack/portfile.cmake new file mode 100644 index 0000000000..3e7bac9f2b --- /dev/null +++ b/scripts/test_ports/vcpkg-ci-lapack/portfile.cmake @@ -0,0 +1,10 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) + +vcpkg_find_acquire_program(PKGCONFIG) +set(ENV{PKG_CONFIG} "${PKGCONFIG}") + +vcpkg_cmake_configure( + SOURCE_PATH "${CURRENT_PORT_DIR}" + OPTIONS + -DVCPKG_HOST_TRIPLET=${HOST_TRIPLET} +) diff --git a/scripts/test_ports/vcpkg-ci-lapack/vcpkg.json b/scripts/test_ports/vcpkg-ci-lapack/vcpkg.json new file mode 100644 index 0000000000..4cef362a54 --- /dev/null +++ b/scripts/test_ports/vcpkg-ci-lapack/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "vcpkg-ci-lapack", + "version-string": "ci", + "description": "Validate metapackage which provides LAPACK", + "license": null, + "dependencies": [ + "lapack", + { + "name": "vcpkg-cmake", + "host": true + } + ] +}