From 161515483cac93763e1e2fe7a357e2db175511ad Mon Sep 17 00:00:00 2001 From: Amin Yahyaabadi Date: Tue, 29 Oct 2024 01:28:31 -0700 Subject: [PATCH] [lapack-reference] support the lapacke feature of lapack-reference --- ports/lapack-reference/portfile.cmake | 8 ++++++-- ports/lapack-reference/vcpkg.json | 5 ++++- versions/baseline.json | 2 +- versions/l-/lapack-reference.json | 5 +++++ 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/ports/lapack-reference/portfile.cmake b/ports/lapack-reference/portfile.cmake index 093f7f8c21be63..8ff5c5d4bbd0df 100644 --- a/ports/lapack-reference/portfile.cmake +++ b/ports/lapack-reference/portfile.cmake @@ -1,8 +1,6 @@ #TODO: Features to add: # USE_XBLAS??? extended precision blas. needs xblas -# LAPACKE should be its own PORT # USE_OPTIMIZED_LAPACK (Probably not what we want. Does a find_package(LAPACK): probably for LAPACKE only builds _> own port?) -# LAPACKE Builds LAPACKE # LAPACKE_WITH_TMG Build LAPACKE with tmglib routines if(EXISTS "${CURRENT_INSTALLED_DIR}/share/clapack/copyright") message(FATAL_ERROR "Can't build ${PORT} if clapack is installed. Please remove clapack:${TARGET_TRIPLET}, and try to install ${PORT}:${TARGET_TRIPLET} again.") @@ -56,6 +54,11 @@ if(VCPKG_USE_INTERNAL_Fortran) endif() endif() +vcpkg_check_features(OUT_FEATURE_OPTIONS options + FEATURES + lapacke LAPACKE +) + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS @@ -63,6 +66,7 @@ vcpkg_cmake_configure( "-DCMAKE_REQUIRE_FIND_PACKAGE_BLAS=${USE_OPTIMIZED_BLAS}" "-DCBLAS=${CBLAS}" "-DTEST_FORTRAN_COMPILER=OFF" + ${options} ${FORTRAN_CMAKE} MAYBE_UNUSED_VARIABLES CMAKE_REQUIRE_FIND_PACKAGE_BLAS diff --git a/ports/lapack-reference/vcpkg.json b/ports/lapack-reference/vcpkg.json index 684be12305a098..a831afff439e30 100644 --- a/ports/lapack-reference/vcpkg.json +++ b/ports/lapack-reference/vcpkg.json @@ -1,7 +1,7 @@ { "name": "lapack-reference", "version": "3.11.0", - "port-version": 6, + "port-version": 7, "description": "LAPACK - Linear Algebra PACKage", "homepage": "https://netlib.org/lapack/", "license": "BSD-3-Clause-Open-MPI", @@ -39,6 +39,9 @@ "cblas": { "description": "Builds CBLAS" }, + "lapacke": { + "description": "Build the LAPACKE C Interface to LAPACK" + }, "noblas": { "description": "Use external optimized BLAS", "supports": "!windows | !static", diff --git a/versions/baseline.json b/versions/baseline.json index 5faac748c3e5f7..2e9866548496fc 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4178,7 +4178,7 @@ }, "lapack-reference": { "baseline": "3.11.0", - "port-version": 6 + "port-version": 7 }, "lastools": { "baseline": "2.0.3", diff --git a/versions/l-/lapack-reference.json b/versions/l-/lapack-reference.json index eb2ce010904cf8..38d2f01d5cdaf5 100644 --- a/versions/l-/lapack-reference.json +++ b/versions/l-/lapack-reference.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0e87cc54fe20ae5272c037df3387aa6b1fdcdedb", + "version": "3.11.0", + "port-version": 7 + }, { "git-tree": "c6447c2a6f70504bfbf20f2e649bcc17a6ce67de", "version": "3.11.0",