From d5c0e6842071a30a644a4f2bd956ae65c99fb484 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Tue, 22 Feb 2022 16:10:16 +0100 Subject: [PATCH 1/8] udpate lapack stuff --- ports/lapack-reference/portfile.cmake | 8 ++++---- ports/lapack-reference/vcpkg.json | 10 +++++++--- ports/lapack/vcpkg.json | 8 ++++---- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/ports/lapack-reference/portfile.cmake b/ports/lapack-reference/portfile.cmake index 4fb353fdd5343e..f25509ea2e558c 100644 --- a/ports/lapack-reference/portfile.cmake +++ b/ports/lapack-reference/portfile.cmake @@ -11,13 +11,13 @@ endif() include(vcpkg_find_fortran) SET(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) -set(lapack_ver 3.8.0) +set(lapack_ver 3.10.0) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO "Reference-LAPACK/lapack" REF "v${lapack_ver}" - SHA512 17786cb7306fccdc9b4a242de7f64fc261ebe6a10b6ec55f519deb4cb673cb137e8742aa5698fd2dc52f1cd56d3bd116af3f593a01dcf6770c4dcc86c50b2a7f + SHA512 56055000c241bab8f318ebd79249ea012c33be0c4c3eca6a78e247f35ad9e8088f46605a0ba52fd5ad3e7898be3b7bc6c50ceb3af327c4986a266b06fe768cbf HEAD_REF master ) @@ -61,7 +61,7 @@ else() set(USE_OPTIMIZED_BLAS ON) endif() -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS @@ -70,7 +70,7 @@ vcpkg_configure_cmake( ${FORTRAN_CMAKE} ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_cmake_config_fixup(PACKAGE_NAME lapack-${lapack_ver} CONFIG_PATH lib/cmake/lapack-${lapack_ver}) #Should the target path be lapack and not lapack-reference? diff --git a/ports/lapack-reference/vcpkg.json b/ports/lapack-reference/vcpkg.json index c3f20e0323cf89..e52b1ef84d7d33 100644 --- a/ports/lapack-reference/vcpkg.json +++ b/ports/lapack-reference/vcpkg.json @@ -1,10 +1,14 @@ { "name": "lapack-reference", - "version-semver": "3.8.0", - "port-version": 6, - "description": "LAPACK — Linear Algebra PACKage", + "version": "3.10.0", + "description": "LAPACK - Linear Algebra PACKage", "homepage": "http://www.netlib.org/lapack/", + "license": "BSD-3-Clause-Open-MPI", "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, { "name": "vcpkg-cmake-config", "host": true diff --git a/ports/lapack/vcpkg.json b/ports/lapack/vcpkg.json index 49dbcfc2236863..9dcaa03cec6a2d 100644 --- a/ports/lapack/vcpkg.json +++ b/ports/lapack/vcpkg.json @@ -1,16 +1,16 @@ { "name": "lapack", - "version-string": "3", - "port-version": 2, + "version-date": "2022-02-22", "description": "Metapackage for packages which provide LAPACK", + "license": null, "dependencies": [ { "name": "clapack", - "platform": "arm & windows" + "platform": "(arm & windows) | uwp" }, { "name": "lapack-reference", - "platform": "!arm | !windows" + "platform": "!arm | !windows | !uwp" } ] } From a884e6a2314fe086ecaa90df536e5faaff36013a Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Tue, 22 Feb 2022 16:10:41 +0100 Subject: [PATCH 2/8] version stuff --- versions/baseline.json | 8 ++++---- versions/l-/lapack-reference.json | 5 +++++ versions/l-/lapack.json | 5 +++++ 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/versions/baseline.json b/versions/baseline.json index 6b3147e52ca18c..9a90146d212a92 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3261,12 +3261,12 @@ "port-version": 1 }, "lapack": { - "baseline": "3", - "port-version": 2 + "baseline": "2022-02-22", + "port-version": 0 }, "lapack-reference": { - "baseline": "3.8.0", - "port-version": 6 + "baseline": "3.10.0", + "port-version": 0 }, "lastools": { "baseline": "2020-05-09", diff --git a/versions/l-/lapack-reference.json b/versions/l-/lapack-reference.json index 99d6f8a7cf3d92..19a808dabcf146 100644 --- a/versions/l-/lapack-reference.json +++ b/versions/l-/lapack-reference.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f489f0994951d505cfb3ce14d69b2a9ba2e7d04d", + "version": "3.10.0", + "port-version": 0 + }, { "git-tree": "10799c7ec42f8369179ba7a8e927235596cb8bb7", "version-semver": "3.8.0", diff --git a/versions/l-/lapack.json b/versions/l-/lapack.json index a4c33261715d60..e68c23c8584aae 100644 --- a/versions/l-/lapack.json +++ b/versions/l-/lapack.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0b53fdf9a0ba451ef71897dabac2c4b29e6ab447", + "version-date": "2022-02-22", + "port-version": 0 + }, { "git-tree": "e52f9dc39357e3e7224273a21c0efaf275f15ae6", "version-string": "3", From 7ee8929a9184339cfc8300a5761a216925abee5a Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Tue, 22 Feb 2022 16:31:36 +0100 Subject: [PATCH 3/8] update baseline --- scripts/ci.baseline.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 8db3976efcf114..4ca8882b17dfd3 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -449,6 +449,7 @@ kinectsdk2:arm64-windows=fail kinectsdk2:arm-uwp=fail kinectsdk2:x64-linux=fail kinectsdk2:x64-osx=fail +lapack-reference:x64-uwp=fail lastools:arm-uwp=fail lastools:x64-uwp=fail laszip:arm-uwp=fail From 7a61dce71a8f105f0504a7de16e6a53df37057f1 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Tue, 22 Feb 2022 21:34:57 +0100 Subject: [PATCH 4/8] fix logic. --- ports/lapack/vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/lapack/vcpkg.json b/ports/lapack/vcpkg.json index 9dcaa03cec6a2d..70a2aabec304fe 100644 --- a/ports/lapack/vcpkg.json +++ b/ports/lapack/vcpkg.json @@ -10,7 +10,7 @@ }, { "name": "lapack-reference", - "platform": "!arm | !windows | !uwp" + "platform": "!((arm & windows) | uwp)" } ] } From 7e7a2aef89ec1245cdb2e3c0ae1cd6766fa596f5 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Tue, 22 Feb 2022 21:35:25 +0100 Subject: [PATCH 5/8] version stuff --- versions/l-/lapack.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/l-/lapack.json b/versions/l-/lapack.json index e68c23c8584aae..5803b592258a71 100644 --- a/versions/l-/lapack.json +++ b/versions/l-/lapack.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "0b53fdf9a0ba451ef71897dabac2c4b29e6ab447", + "git-tree": "3a9c5b51e3480db058719db223df981e0e679819", "version-date": "2022-02-22", "port-version": 0 }, From 69bacf03fe8ab933c6a357b4c0767d07d4ad09d9 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Wed, 23 Feb 2022 09:34:34 +0100 Subject: [PATCH 6/8] Update ports/lapack-reference/portfile.cmake Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> --- ports/lapack-reference/portfile.cmake | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ports/lapack-reference/portfile.cmake b/ports/lapack-reference/portfile.cmake index f25509ea2e558c..8e7490c8f47b31 100644 --- a/ports/lapack-reference/portfile.cmake +++ b/ports/lapack-reference/portfile.cmake @@ -62,8 +62,7 @@ else() endif() vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA + SOURCE_PATH "${SOURCE_PATH}" OPTIONS "-DUSE_OPTIMIZED_BLAS=${USE_OPTIMIZED_BLAS}" "-DCBLAS=${CBLAS}" From eefd15079e67dbc78dfe61da8baa6ab364d3bd77 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Wed, 23 Feb 2022 09:35:35 +0100 Subject: [PATCH 7/8] version update --- versions/l-/lapack-reference.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/l-/lapack-reference.json b/versions/l-/lapack-reference.json index 19a808dabcf146..999e4f135ff049 100644 --- a/versions/l-/lapack-reference.json +++ b/versions/l-/lapack-reference.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "f489f0994951d505cfb3ce14d69b2a9ba2e7d04d", + "git-tree": "14b5e3ab7315ce36951f759c6254712ed41cc0af", "version": "3.10.0", "port-version": 0 }, From 3cde45d98f76f6a79bbba9b888dd9c9db90774a5 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Wed, 23 Feb 2022 09:51:17 +0100 Subject: [PATCH 8/8] move entries in ci baseline around --- scripts/ci.baseline.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 4ca8882b17dfd3..9f2c4c0d289cde 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -449,7 +449,6 @@ kinectsdk2:arm64-windows=fail kinectsdk2:arm-uwp=fail kinectsdk2:x64-linux=fail kinectsdk2:x64-osx=fail -lapack-reference:x64-uwp=fail lastools:arm-uwp=fail lastools:x64-uwp=fail laszip:arm-uwp=fail @@ -1395,9 +1394,9 @@ clapack:x64-windows-static=skip clapack:x64-windows-static-md=skip clapack:x64-windows=skip clapack:x86-windows=skip -clapack:x64-uwp=skip lapack-reference:arm64-windows=skip lapack-reference:arm-uwp=skip +lapack-reference:x64-uwp=skip # failures for x64-windows-static-md ace:x64-windows-static-md=fail