Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions ports/lapack-reference/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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
)

Expand Down Expand Up @@ -61,16 +61,15 @@ else()
set(USE_OPTIMIZED_BLAS ON)
endif()

vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
"-DUSE_OPTIMIZED_BLAS=${USE_OPTIMIZED_BLAS}"
"-DCBLAS=${CBLAS}"
${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?

Expand Down
10 changes: 7 additions & 3 deletions ports/lapack-reference/vcpkg.json
Original file line number Diff line number Diff line change
@@ -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
Expand Down
8 changes: 4 additions & 4 deletions ports/lapack/vcpkg.json
Original file line number Diff line number Diff line change
@@ -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"
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

uwp needs to use clapack since fortran runtime is not build against WindowsApp.lib

},
{
"name": "lapack-reference",
"platform": "!arm | !windows"
"platform": "!((arm & windows) | uwp)"
}
]
}
2 changes: 1 addition & 1 deletion scripts/ci.baseline.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1394,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
Expand Down
8 changes: 4 additions & 4 deletions versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
5 changes: 5 additions & 0 deletions versions/l-/lapack-reference.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "14b5e3ab7315ce36951f759c6254712ed41cc0af",
"version": "3.10.0",
"port-version": 0
},
{
"git-tree": "10799c7ec42f8369179ba7a8e927235596cb8bb7",
"version-semver": "3.8.0",
Expand Down
5 changes: 5 additions & 0 deletions versions/l-/lapack.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "3a9c5b51e3480db058719db223df981e0e679819",
"version-date": "2022-02-22",
"port-version": 0
},
{
"git-tree": "e52f9dc39357e3e7224273a21c0efaf275f15ae6",
"version-string": "3",
Expand Down