From 24444642520c26a61c6397c7946f932495fcc693 Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Fri, 14 Jun 2024 11:35:12 +0300 Subject: [PATCH 01/95] [SuiteSparse] add suitesparse-config port --- ports/suitesparse-config/portfile.cmake | 41 +++++++++++++++++++++++++ ports/suitesparse-config/vcpkg.json | 27 ++++++++++++++++ 2 files changed, 68 insertions(+) create mode 100644 ports/suitesparse-config/portfile.cmake create mode 100644 ports/suitesparse-config/vcpkg.json diff --git a/ports/suitesparse-config/portfile.cmake b/ports/suitesparse-config/portfile.cmake new file mode 100644 index 00000000000000..da32fbaae9a026 --- /dev/null +++ b/ports/suitesparse-config/portfile.cmake @@ -0,0 +1,41 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO DrTimothyAldenDavis/SuiteSparse + REF v7.7.0 + SHA512 aa62dae81ae423ce7162ae83b46e5cf606d95482e6c6bb7ae6d61e15987761119d9418ef3a96648e6ba2327871a2847eef8ace197aa375279d71c80329d6f451 + HEAD_REF dev +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC_LIBS) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + openmp SUITESPARSE_USE_OPENMP +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/SuiteSparse_config" + OPTIONS + -DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS} + -DSUITESPARSE_USE_CUDA=OFF # not applicable here, skip check + -DSUITESPARSE_USE_STRICT=ON # don't allow implicit dependencies + -DSUITESPARSE_USE_FORTRAN=OFF # use Fortran sources translated to C instead + -DSUITESPARSE_DEMOS=OFF + ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install() + +# Move SuiteSparseBLAS.cmake, SuiteSparsePolicy.cmake etc files +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/cmake") +file(RENAME "${CURRENT_PACKAGES_DIR}/lib/cmake/SuiteSparse" "${CURRENT_PACKAGES_DIR}/share/SuiteSparse") + +vcpkg_cmake_config_fixup( + PACKAGE_NAME SuiteSparse_config + CONFIG_PATH lib/cmake/SuiteSparse_config +) +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt") diff --git a/ports/suitesparse-config/vcpkg.json b/ports/suitesparse-config/vcpkg.json new file mode 100644 index 00000000000000..118e5ee43e03f0 --- /dev/null +++ b/ports/suitesparse-config/vcpkg.json @@ -0,0 +1,27 @@ +{ + "name": "suitesparse-config", + "version-semver": "7.7.0", + "description": "Configuration for SuiteSparse libraries", + "homepage": "https://people.engr.tamu.edu/davis/suitesparse.html", + "license": "BSD-3-Clause", + "dependencies": [ + "blas", + "lapack", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "default-features": [ + "openmp" + ], + "features": { + "openmp": { + "description": "Enable OpenMP support for SuiteSparse libraries" + } + } +} From 92dc8cc273fd93f22c6bdff7bc14a4bb0609abe4 Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Fri, 14 Jun 2024 13:30:46 +0300 Subject: [PATCH 02/95] [SuiteSparse] add suitesparse-amd --- ports/suitesparse-amd/portfile.cmake | 32 +++++++++++++++++++++++++ ports/suitesparse-amd/vcpkg.json | 18 ++++++++++++++ ports/suitesparse-config/portfile.cmake | 12 ++++++---- 3 files changed, 57 insertions(+), 5 deletions(-) create mode 100644 ports/suitesparse-amd/portfile.cmake create mode 100644 ports/suitesparse-amd/vcpkg.json diff --git a/ports/suitesparse-amd/portfile.cmake b/ports/suitesparse-amd/portfile.cmake new file mode 100644 index 00000000000000..6cf5da8c8d9ebf --- /dev/null +++ b/ports/suitesparse-amd/portfile.cmake @@ -0,0 +1,32 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO DrTimothyAldenDavis/SuiteSparse + REF v7.7.0 + SHA512 aa62dae81ae423ce7162ae83b46e5cf606d95482e6c6bb7ae6d61e15987761119d9418ef3a96648e6ba2327871a2847eef8ace197aa375279d71c80329d6f451 + HEAD_REF dev +) + +set(PACKAGE_NAME AMD) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC_LIBS) +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/${PACKAGE_NAME}" + OPTIONS + -DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS} + -DSUITESPARSE_USE_CUDA=OFF + -DSUITESPARSE_USE_STRICT=ON + -DSUITESPARSE_USE_FORTRAN=OFF + -DSUITESPARSE_DEMOS=OFF +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup( + PACKAGE_NAME ${PACKAGE_NAME} + CONFIG_PATH lib/cmake/${PACKAGE_NAME} +) +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/${PACKAGE_NAME}/Doc/License.txt") diff --git a/ports/suitesparse-amd/vcpkg.json b/ports/suitesparse-amd/vcpkg.json new file mode 100644 index 00000000000000..05ce2c927cb8e4 --- /dev/null +++ b/ports/suitesparse-amd/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "suitesparse-amd", + "version-semver": "3.3.2", + "description": "AMD: Routines for permuting sparse matrices prior to factorization in SuiteSparse", + "homepage": "https://people.engr.tamu.edu/davis/suitesparse.html", + "license": "BSD-3-Clause", + "dependencies": [ + "suitesparse-config", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/ports/suitesparse-config/portfile.cmake b/ports/suitesparse-config/portfile.cmake index da32fbaae9a026..72d2ecf2d51926 100644 --- a/ports/suitesparse-config/portfile.cmake +++ b/ports/suitesparse-config/portfile.cmake @@ -6,15 +6,17 @@ vcpkg_from_github( HEAD_REF dev ) +set(PACKAGE_NAME SuiteSparse_config) + string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC_LIBS) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - FEATURES - openmp SUITESPARSE_USE_OPENMP + FEATURES + openmp SUITESPARSE_USE_OPENMP ) vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}/SuiteSparse_config" + SOURCE_PATH "${SOURCE_PATH}/${PACKAGE_NAME}" OPTIONS -DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS} -DSUITESPARSE_USE_CUDA=OFF # not applicable here, skip check @@ -31,8 +33,8 @@ file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/cmake") file(RENAME "${CURRENT_PACKAGES_DIR}/lib/cmake/SuiteSparse" "${CURRENT_PACKAGES_DIR}/share/SuiteSparse") vcpkg_cmake_config_fixup( - PACKAGE_NAME SuiteSparse_config - CONFIG_PATH lib/cmake/SuiteSparse_config + PACKAGE_NAME ${PACKAGE_NAME} + CONFIG_PATH lib/cmake/${PACKAGE_NAME} ) vcpkg_fixup_pkgconfig() From 649951ee511562518f7a62022c1b1889835fb5e4 Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Fri, 14 Jun 2024 13:38:43 +0300 Subject: [PATCH 03/95] [SuiteSparse] add suitesparse-btf --- ports/suitesparse-btf/portfile.cmake | 35 ++++++++++++++++++++++++++++ ports/suitesparse-btf/vcpkg.json | 18 ++++++++++++++ 2 files changed, 53 insertions(+) create mode 100644 ports/suitesparse-btf/portfile.cmake create mode 100644 ports/suitesparse-btf/vcpkg.json diff --git a/ports/suitesparse-btf/portfile.cmake b/ports/suitesparse-btf/portfile.cmake new file mode 100644 index 00000000000000..7412d231fe2a39 --- /dev/null +++ b/ports/suitesparse-btf/portfile.cmake @@ -0,0 +1,35 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO DrTimothyAldenDavis/SuiteSparse + REF v7.7.0 + SHA512 aa62dae81ae423ce7162ae83b46e5cf606d95482e6c6bb7ae6d61e15987761119d9418ef3a96648e6ba2327871a2847eef8ace197aa375279d71c80329d6f451 + HEAD_REF dev +) + +set(PACKAGE_NAME BTF) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC_LIBS) +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/${PACKAGE_NAME}" + OPTIONS + -DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS} + -DSUITESPARSE_USE_CUDA=OFF + -DSUITESPARSE_USE_STRICT=ON + -DSUITESPARSE_USE_FORTRAN=OFF + -DSUITESPARSE_DEMOS=OFF +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup( + PACKAGE_NAME ${PACKAGE_NAME} + CONFIG_PATH lib/cmake/${PACKAGE_NAME} +) +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +vcpkg_install_copyright(FILE_LIST + "${SOURCE_PATH}/${PACKAGE_NAME}/Doc/License.txt" + "${SOURCE_PATH}/${PACKAGE_NAME}/Doc/lesser.txt" +) diff --git a/ports/suitesparse-btf/vcpkg.json b/ports/suitesparse-btf/vcpkg.json new file mode 100644 index 00000000000000..cc44e1136ab107 --- /dev/null +++ b/ports/suitesparse-btf/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "suitesparse-btf", + "version-semver": "2.3.2", + "description": "BTF: Software package for permuting a matrix into block upper triangular form in SuiteSparse", + "homepage": "https://people.engr.tamu.edu/davis/suitesparse.html", + "license": "LGPL-2.1-or-later", + "dependencies": [ + "suitesparse-config", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} From b64133717afb1aaed2eaeff56565cb5925bd4fca Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Fri, 14 Jun 2024 13:46:54 +0300 Subject: [PATCH 04/95] [SuiteSparse] add suitesparse-camd --- ports/suitesparse-camd/portfile.cmake | 32 +++++++++++++++++++++++++++ ports/suitesparse-camd/vcpkg.json | 18 +++++++++++++++ 2 files changed, 50 insertions(+) create mode 100644 ports/suitesparse-camd/portfile.cmake create mode 100644 ports/suitesparse-camd/vcpkg.json diff --git a/ports/suitesparse-camd/portfile.cmake b/ports/suitesparse-camd/portfile.cmake new file mode 100644 index 00000000000000..a87ea87625ca91 --- /dev/null +++ b/ports/suitesparse-camd/portfile.cmake @@ -0,0 +1,32 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO DrTimothyAldenDavis/SuiteSparse + REF v7.7.0 + SHA512 aa62dae81ae423ce7162ae83b46e5cf606d95482e6c6bb7ae6d61e15987761119d9418ef3a96648e6ba2327871a2847eef8ace197aa375279d71c80329d6f451 + HEAD_REF dev +) + +set(PACKAGE_NAME CAMD) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC_LIBS) +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/${PACKAGE_NAME}" + OPTIONS + -DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS} + -DSUITESPARSE_USE_CUDA=OFF + -DSUITESPARSE_USE_STRICT=ON + -DSUITESPARSE_USE_FORTRAN=OFF + -DSUITESPARSE_DEMOS=OFF +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup( + PACKAGE_NAME ${PACKAGE_NAME} + CONFIG_PATH lib/cmake/${PACKAGE_NAME} +) +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/${PACKAGE_NAME}/Doc/License.txt") diff --git a/ports/suitesparse-camd/vcpkg.json b/ports/suitesparse-camd/vcpkg.json new file mode 100644 index 00000000000000..8c3bcb35a50a98 --- /dev/null +++ b/ports/suitesparse-camd/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "suitesparse-camd", + "version-semver": "3.3.2", + "description": "AMD: Routines for permuting sparse matrices prior to factorization in SuiteSparse", + "homepage": "https://people.engr.tamu.edu/davis/suitesparse.html", + "license": "BSD-3-Clause", + "dependencies": [ + "suitesparse-config", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} From a1e208dc4096fd58b8f9872628ece8911d9a02e1 Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Fri, 14 Jun 2024 13:48:15 +0300 Subject: [PATCH 05/95] [SuiteSparse] add suitesparse-ccolamd --- ports/suitesparse-ccolamd/portfile.cmake | 32 ++++++++++++++++++++++++ ports/suitesparse-ccolamd/vcpkg.json | 18 +++++++++++++ 2 files changed, 50 insertions(+) create mode 100644 ports/suitesparse-ccolamd/portfile.cmake create mode 100644 ports/suitesparse-ccolamd/vcpkg.json diff --git a/ports/suitesparse-ccolamd/portfile.cmake b/ports/suitesparse-ccolamd/portfile.cmake new file mode 100644 index 00000000000000..d0b9d97cb9a344 --- /dev/null +++ b/ports/suitesparse-ccolamd/portfile.cmake @@ -0,0 +1,32 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO DrTimothyAldenDavis/SuiteSparse + REF v7.7.0 + SHA512 aa62dae81ae423ce7162ae83b46e5cf606d95482e6c6bb7ae6d61e15987761119d9418ef3a96648e6ba2327871a2847eef8ace197aa375279d71c80329d6f451 + HEAD_REF dev +) + +set(PACKAGE_NAME CCOLAMD) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC_LIBS) +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/${PACKAGE_NAME}" + OPTIONS + -DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS} + -DSUITESPARSE_USE_CUDA=OFF + -DSUITESPARSE_USE_STRICT=ON + -DSUITESPARSE_USE_FORTRAN=OFF + -DSUITESPARSE_DEMOS=OFF +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup( + PACKAGE_NAME ${PACKAGE_NAME} + CONFIG_PATH lib/cmake/${PACKAGE_NAME} +) +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/${PACKAGE_NAME}/Doc/License.txt") diff --git a/ports/suitesparse-ccolamd/vcpkg.json b/ports/suitesparse-ccolamd/vcpkg.json new file mode 100644 index 00000000000000..8c906369834ce1 --- /dev/null +++ b/ports/suitesparse-ccolamd/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "suitesparse-ccolamd", + "version-semver": "3.3.3", + "description": "CCOLAMD: Routines for constrained column approximate minimum degree ordering algorithm in SuiteSparse", + "homepage": "https://people.engr.tamu.edu/davis/suitesparse.html", + "license": "BSD-3-Clause", + "dependencies": [ + "suitesparse-config", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} From 878a670787bb6dd00615ed386faa6e7abd110022 Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Fri, 14 Jun 2024 13:49:06 +0300 Subject: [PATCH 06/95] [SuiteSparse] add suitesparse-colamd --- ports/suitesparse-colamd/portfile.cmake | 32 +++++++++++++++++++++++++ ports/suitesparse-colamd/vcpkg.json | 18 ++++++++++++++ 2 files changed, 50 insertions(+) create mode 100644 ports/suitesparse-colamd/portfile.cmake create mode 100644 ports/suitesparse-colamd/vcpkg.json diff --git a/ports/suitesparse-colamd/portfile.cmake b/ports/suitesparse-colamd/portfile.cmake new file mode 100644 index 00000000000000..9053563fbc3232 --- /dev/null +++ b/ports/suitesparse-colamd/portfile.cmake @@ -0,0 +1,32 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO DrTimothyAldenDavis/SuiteSparse + REF v7.7.0 + SHA512 aa62dae81ae423ce7162ae83b46e5cf606d95482e6c6bb7ae6d61e15987761119d9418ef3a96648e6ba2327871a2847eef8ace197aa375279d71c80329d6f451 + HEAD_REF dev +) + +set(PACKAGE_NAME COLAMD) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC_LIBS) +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/${PACKAGE_NAME}" + OPTIONS + -DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS} + -DSUITESPARSE_USE_CUDA=OFF + -DSUITESPARSE_USE_STRICT=ON + -DSUITESPARSE_USE_FORTRAN=OFF + -DSUITESPARSE_DEMOS=OFF +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup( + PACKAGE_NAME ${PACKAGE_NAME} + CONFIG_PATH lib/cmake/${PACKAGE_NAME} +) +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/${PACKAGE_NAME}/Doc/License.txt") diff --git a/ports/suitesparse-colamd/vcpkg.json b/ports/suitesparse-colamd/vcpkg.json new file mode 100644 index 00000000000000..5c8b5c47257c5d --- /dev/null +++ b/ports/suitesparse-colamd/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "suitesparse-colamd", + "version-semver": "3.3.3", + "description": "COLAMD: Routines for column approximate minimum degree ordering algorithm in SuiteSparse", + "homepage": "https://people.engr.tamu.edu/davis/suitesparse.html", + "license": "BSD-3-Clause", + "dependencies": [ + "suitesparse-config", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} From d77155e2bb43111b9849552a35e57db4bc6bd8a2 Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Fri, 14 Jun 2024 13:51:43 +0300 Subject: [PATCH 07/95] [SuiteSparse] add suitesparse-ldl --- ports/suitesparse-ldl/portfile.cmake | 32 ++++++++++++++++++++++++++++ ports/suitesparse-ldl/vcpkg.json | 19 +++++++++++++++++ 2 files changed, 51 insertions(+) create mode 100644 ports/suitesparse-ldl/portfile.cmake create mode 100644 ports/suitesparse-ldl/vcpkg.json diff --git a/ports/suitesparse-ldl/portfile.cmake b/ports/suitesparse-ldl/portfile.cmake new file mode 100644 index 00000000000000..6baffc12657f2c --- /dev/null +++ b/ports/suitesparse-ldl/portfile.cmake @@ -0,0 +1,32 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO DrTimothyAldenDavis/SuiteSparse + REF v7.7.0 + SHA512 aa62dae81ae423ce7162ae83b46e5cf606d95482e6c6bb7ae6d61e15987761119d9418ef3a96648e6ba2327871a2847eef8ace197aa375279d71c80329d6f451 + HEAD_REF dev +) + +set(PACKAGE_NAME LDL) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC_LIBS) +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/${PACKAGE_NAME}" + OPTIONS + -DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS} + -DSUITESPARSE_USE_CUDA=OFF + -DSUITESPARSE_USE_STRICT=ON + -DSUITESPARSE_USE_FORTRAN=OFF + -DSUITESPARSE_DEMOS=OFF +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup( + PACKAGE_NAME ${PACKAGE_NAME} + CONFIG_PATH lib/cmake/${PACKAGE_NAME} +) +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/${PACKAGE_NAME}/Doc/License.txt") diff --git a/ports/suitesparse-ldl/vcpkg.json b/ports/suitesparse-ldl/vcpkg.json new file mode 100644 index 00000000000000..143d63dc88b0fb --- /dev/null +++ b/ports/suitesparse-ldl/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "suitesparse-ldl", + "version-semver": "3.3.2", + "description": "LDL: A sparse LDL' factorization and solve package in SuiteSparse", + "homepage": "https://people.engr.tamu.edu/davis/suitesparse.html", + "license": "LGPL-2.1-or-later", + "dependencies": [ + "suitesparse-amd", + "suitesparse-config", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} From efa21a112bc3fc3c92f1046a83dfcba2d3a97a6a Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Fri, 14 Jun 2024 13:57:27 +0300 Subject: [PATCH 08/95] [SuiteSparse] add suitesparse-mongoose --- ports/suitesparse-mongoose/portfile.cmake | 31 +++++++++++++++++++++++ ports/suitesparse-mongoose/vcpkg.json | 18 +++++++++++++ 2 files changed, 49 insertions(+) create mode 100644 ports/suitesparse-mongoose/portfile.cmake create mode 100644 ports/suitesparse-mongoose/vcpkg.json diff --git a/ports/suitesparse-mongoose/portfile.cmake b/ports/suitesparse-mongoose/portfile.cmake new file mode 100644 index 00000000000000..f2b0669f4c3907 --- /dev/null +++ b/ports/suitesparse-mongoose/portfile.cmake @@ -0,0 +1,31 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO DrTimothyAldenDavis/SuiteSparse + REF v7.7.0 + SHA512 aa62dae81ae423ce7162ae83b46e5cf606d95482e6c6bb7ae6d61e15987761119d9418ef3a96648e6ba2327871a2847eef8ace197aa375279d71c80329d6f451 + HEAD_REF dev +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC_LIBS) +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/Mongoose" + OPTIONS + -DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS} + -DSUITESPARSE_USE_CUDA=OFF + -DSUITESPARSE_USE_STRICT=ON + -DSUITESPARSE_USE_FORTRAN=OFF + -DSUITESPARSE_DEMOS=OFF + -DCMAKE_DISABLE_FIND_PACKAGE_Python=ON # Only used for tests +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup( + PACKAGE_NAME SuiteSparse_Mongoose + CONFIG_PATH lib/cmake/SuiteSparse_Mongoose +) +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/Mongoose/Doc/License.txt") diff --git a/ports/suitesparse-mongoose/vcpkg.json b/ports/suitesparse-mongoose/vcpkg.json new file mode 100644 index 00000000000000..7556e05428d270 --- /dev/null +++ b/ports/suitesparse-mongoose/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "suitesparse-mongoose", + "version-semver": "3.3.3", + "description": "Mongoose: Graph partitioning library in SuiteSparse", + "homepage": "https://people.engr.tamu.edu/davis/suitesparse.html", + "license": "GPL-3.0-only", + "dependencies": [ + "suitesparse-config", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} From 9722718b7e85f6b7d329a729fb65218a4317c17e Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Fri, 14 Jun 2024 14:00:15 +0300 Subject: [PATCH 09/95] [SuiteSparse] add suitesparse-rbio --- ports/suitesparse-rbio/portfile.cmake | 32 +++++++++++++++++++++++++++ ports/suitesparse-rbio/vcpkg.json | 18 +++++++++++++++ 2 files changed, 50 insertions(+) create mode 100644 ports/suitesparse-rbio/portfile.cmake create mode 100644 ports/suitesparse-rbio/vcpkg.json diff --git a/ports/suitesparse-rbio/portfile.cmake b/ports/suitesparse-rbio/portfile.cmake new file mode 100644 index 00000000000000..6df0a1f54c71f0 --- /dev/null +++ b/ports/suitesparse-rbio/portfile.cmake @@ -0,0 +1,32 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO DrTimothyAldenDavis/SuiteSparse + REF v7.7.0 + SHA512 aa62dae81ae423ce7162ae83b46e5cf606d95482e6c6bb7ae6d61e15987761119d9418ef3a96648e6ba2327871a2847eef8ace197aa375279d71c80329d6f451 + HEAD_REF dev +) + +set(PACKAGE_NAME RBio) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC_LIBS) +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/${PACKAGE_NAME}" + OPTIONS + -DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS} + -DSUITESPARSE_USE_CUDA=OFF + -DSUITESPARSE_USE_STRICT=ON + -DSUITESPARSE_USE_FORTRAN=OFF + -DSUITESPARSE_DEMOS=OFF +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup( + PACKAGE_NAME ${PACKAGE_NAME} + CONFIG_PATH lib/cmake/${PACKAGE_NAME} +) +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/${PACKAGE_NAME}/Doc/License.txt") diff --git a/ports/suitesparse-rbio/vcpkg.json b/ports/suitesparse-rbio/vcpkg.json new file mode 100644 index 00000000000000..700b9b239ae079 --- /dev/null +++ b/ports/suitesparse-rbio/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "suitesparse-rbio", + "version-semver": "4.3.2", + "description": "RBio: routines for reading/writing sparse matrices in Rutherford/Boeing format in SuiteSparse", + "homepage": "https://people.engr.tamu.edu/davis/suitesparse.html", + "license": "GPL-2.0-or-later", + "dependencies": [ + "suitesparse-config", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} From 1460d7bbab1a5010ca3bbb1e71e3d8e4f6655d5a Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Fri, 14 Jun 2024 14:08:57 +0300 Subject: [PATCH 10/95] [SuiteSparse] add suitesparse-spex --- ports/suitesparse-spex/portfile.cmake | 32 +++++++++++++++++++++++++++ ports/suitesparse-spex/vcpkg.json | 22 ++++++++++++++++++ 2 files changed, 54 insertions(+) create mode 100644 ports/suitesparse-spex/portfile.cmake create mode 100644 ports/suitesparse-spex/vcpkg.json diff --git a/ports/suitesparse-spex/portfile.cmake b/ports/suitesparse-spex/portfile.cmake new file mode 100644 index 00000000000000..edde91616cba49 --- /dev/null +++ b/ports/suitesparse-spex/portfile.cmake @@ -0,0 +1,32 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO DrTimothyAldenDavis/SuiteSparse + REF v7.7.0 + SHA512 aa62dae81ae423ce7162ae83b46e5cf606d95482e6c6bb7ae6d61e15987761119d9418ef3a96648e6ba2327871a2847eef8ace197aa375279d71c80329d6f451 + HEAD_REF dev +) + +set(PACKAGE_NAME SPEX) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC_LIBS) +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/${PACKAGE_NAME}" + OPTIONS + -DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS} + -DSUITESPARSE_USE_CUDA=OFF + -DSUITESPARSE_USE_STRICT=ON + -DSUITESPARSE_USE_FORTRAN=OFF + -DSUITESPARSE_DEMOS=OFF +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup( + PACKAGE_NAME ${PACKAGE_NAME} + CONFIG_PATH lib/cmake/${PACKAGE_NAME} +) +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/${PACKAGE_NAME}/LICENSE.txt") diff --git a/ports/suitesparse-spex/vcpkg.json b/ports/suitesparse-spex/vcpkg.json new file mode 100644 index 00000000000000..cfc153eec39ddd --- /dev/null +++ b/ports/suitesparse-spex/vcpkg.json @@ -0,0 +1,22 @@ +{ + "name": "suitesparse-spex", + "version-semver": "3.1.0", + "description": "SPEX: Software package for SParse EXact algebra in SuiteSparse", + "homepage": "https://people.engr.tamu.edu/davis/suitesparse.html", + "license": "GPL-2.0-or-later OR LGPL-3.0-or-later", + "dependencies": [ + "gmp", + "mpfr", + "suitesparse-amd", + "suitesparse-colamd", + "suitesparse-config", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} From 17bc7512881fcdbfa33b7d4a55b74b3a2a105e53 Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Fri, 14 Jun 2024 14:28:25 +0300 Subject: [PATCH 11/95] [SuiteSparse] add suitesparse-graphblas --- ports/suitesparse-graphblas/portfile.cmake | 38 ++++++++++++++++++++++ ports/suitesparse-graphblas/vcpkg.json | 29 +++++++++++++++++ 2 files changed, 67 insertions(+) create mode 100644 ports/suitesparse-graphblas/portfile.cmake create mode 100644 ports/suitesparse-graphblas/vcpkg.json diff --git a/ports/suitesparse-graphblas/portfile.cmake b/ports/suitesparse-graphblas/portfile.cmake new file mode 100644 index 00000000000000..3d0508b222652b --- /dev/null +++ b/ports/suitesparse-graphblas/portfile.cmake @@ -0,0 +1,38 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO DrTimothyAldenDavis/GraphBLAS + REF v${VERSION} + SHA512 70bbf2331cdc013ef18456712a823e2f95e8f1773933f94bc55e5b7e1bc8a225bf56b21d9b66caabaf98ee909975820b0d899101289642c6e50253892c5af48e + HEAD_REF stable +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC_LIBS) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + compact GRAPHBLAS_COMPACT + openmp GRAPHBLAS_USE_OPENMP +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS} + -DSUITESPARSE_USE_CUDA=OFF + -DSUITESPARSE_USE_STRICT=ON + -DSUITESPARSE_USE_FORTRAN=OFF + -DSUITESPARSE_DEMOS=OFF + ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup( + PACKAGE_NAME GraphBLAS + CONFIG_PATH lib/cmake/GraphBLAS +) +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/suitesparse-graphblas/vcpkg.json b/ports/suitesparse-graphblas/vcpkg.json new file mode 100644 index 00000000000000..08963f24633609 --- /dev/null +++ b/ports/suitesparse-graphblas/vcpkg.json @@ -0,0 +1,29 @@ +{ + "name": "suitesparse-graphblas", + "version-semver": "9.2.0", + "description": "SuiteSparse:GraphBLAS: graph algorithms in the language of linear algebra", + "homepage": "https://people.engr.tamu.edu/davis/GraphBLAS.html", + "license": "Apache-2.0", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "default-features": [ + "compact", + "openmp" + ], + "features": { + "compact": { + "description": "Compile kernels at run-time, via JIT, instead of pre-compiling. Reduces library size and compile time by about 15x." + }, + "openmp": { + "description": "Enable OpenMP support" + } + } +} From 589394ea7d4e09da25f31e957bb9ecefea80c9c2 Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Fri, 14 Jun 2024 14:38:54 +0300 Subject: [PATCH 12/95] [SuiteSparse] add suitesparse-lagraph --- ports/suitesparse-lagraph/portfile.cmake | 41 ++++++++++++++++++++++++ ports/suitesparse-lagraph/vcpkg.json | 26 +++++++++++++++ 2 files changed, 67 insertions(+) create mode 100644 ports/suitesparse-lagraph/portfile.cmake create mode 100644 ports/suitesparse-lagraph/vcpkg.json diff --git a/ports/suitesparse-lagraph/portfile.cmake b/ports/suitesparse-lagraph/portfile.cmake new file mode 100644 index 00000000000000..151d3227ea547d --- /dev/null +++ b/ports/suitesparse-lagraph/portfile.cmake @@ -0,0 +1,41 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO DrTimothyAldenDavis/SuiteSparse + REF v7.7.0 + SHA512 aa62dae81ae423ce7162ae83b46e5cf606d95482e6c6bb7ae6d61e15987761119d9418ef3a96648e6ba2327871a2847eef8ace197aa375279d71c80329d6f451 + HEAD_REF dev +) + +set(PACKAGE_NAME LAGraph) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC_LIBS) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + openmp SUITESPARSE_USE_OPENMP +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/${PACKAGE_NAME}" + OPTIONS + -DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS} + -DSUITESPARSE_USE_CUDA=OFF + -DSUITESPARSE_USE_STRICT=ON + -DSUITESPARSE_USE_FORTRAN=OFF + -DSUITESPARSE_DEMOS=OFF + ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup( + PACKAGE_NAME ${PACKAGE_NAME} + CONFIG_PATH lib/cmake/${PACKAGE_NAME} +) +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +# Remove FindGraphBLAS.cmake +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/${PACKAGE_NAME}/LICENSE") diff --git a/ports/suitesparse-lagraph/vcpkg.json b/ports/suitesparse-lagraph/vcpkg.json new file mode 100644 index 00000000000000..8a423500b5b8e1 --- /dev/null +++ b/ports/suitesparse-lagraph/vcpkg.json @@ -0,0 +1,26 @@ +{ + "name": "suitesparse-lagraph", + "version-semver": "1.1.3", + "description": "LAGraph: Library plus test harness for collecting algorithms that use GraphBLAS", + "homepage": "https://lagraph.readthedocs.io/en/latest/", + "license": "BSD-2-Clause", + "dependencies": [ + "suitesparse-graphblas", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "default-features": [ + "openmp" + ], + "features": { + "openmp": { + "description": "Enable OpenMP support for SuiteSparse libraries" + } + } +} From 6cc3b669cc06522d7bf17460c8c7db058ce8b44e Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Fri, 14 Jun 2024 15:24:49 +0300 Subject: [PATCH 13/95] [SuiteSparse] add suitesparse-cholmod --- ports/suitesparse-cholmod/portfile.cmake | 57 +++++++++++++++++++++++ ports/suitesparse-cholmod/vcpkg.json | 59 ++++++++++++++++++++++++ ports/suitesparse-config/vcpkg.json | 1 - 3 files changed, 116 insertions(+), 1 deletion(-) create mode 100644 ports/suitesparse-cholmod/portfile.cmake create mode 100644 ports/suitesparse-cholmod/vcpkg.json diff --git a/ports/suitesparse-cholmod/portfile.cmake b/ports/suitesparse-cholmod/portfile.cmake new file mode 100644 index 00000000000000..f07744c7b1320d --- /dev/null +++ b/ports/suitesparse-cholmod/portfile.cmake @@ -0,0 +1,57 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO DrTimothyAldenDavis/SuiteSparse + REF v7.7.0 + SHA512 aa62dae81ae423ce7162ae83b46e5cf606d95482e6c6bb7ae6d61e15987761119d9418ef3a96648e6ba2327871a2847eef8ace197aa375279d71c80329d6f451 + HEAD_REF dev +) + +set(PACKAGE_NAME CHOLMOD) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + matrixops CHOLMOD_MATRIXOPS + modify CHOLMOD_MODIFY + partition CHOLMOD_PARTITION + supernodal CHOLMOD_SUPERNODAL +) + +set(CUDA_ENABLED OFF) +if("cuda" IN_LIST FEATURES) + set(CUDA_ENABLED ON) + set(CUDA_ARCHITECTURES "native") +endif() +if("cuda-redist" IN_LIST FEATURES) + set(CUDA_ENABLED ON) + set(CUDA_ARCHITECTURES "all-major") +endif() + +set(GPL_ENABLED OFF) +if(CHOLMOD_MATRIXOPS OR CHOLMOD_MODIFY OR CHOLMOD_SUPERNODAL OR CUDA_ENABLED) + set(GPL_ENABLED ON) +endif() + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC_LIBS) +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/${PACKAGE_NAME}" + OPTIONS + -DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS} + -DCHOLMOD_GPL=${GPL_ENABLED} + -DSUITESPARSE_USE_CUDA=${CUDA_ENABLED} + -DSUITESPARSE_USE_STRICT=ON + -DSUITESPARSE_USE_FORTRAN=OFF + -DSUITESPARSE_DEMOS=OFF + ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup( + PACKAGE_NAME ${PACKAGE_NAME} + CONFIG_PATH lib/cmake/${PACKAGE_NAME} +) +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/${PACKAGE_NAME}/Doc/License.txt") diff --git a/ports/suitesparse-cholmod/vcpkg.json b/ports/suitesparse-cholmod/vcpkg.json new file mode 100644 index 00000000000000..7efda6bbd1c360 --- /dev/null +++ b/ports/suitesparse-cholmod/vcpkg.json @@ -0,0 +1,59 @@ +{ + "name": "suitesparse-cholmod", + "version-semver": "5.2.1", + "description": "CHOLMOD: Routines for factorizing sparse symmetric positive definite matrices in SuiteSparse", + "homepage": "https://people.engr.tamu.edu/davis/suitesparse.html", + "license": "LGPL-2.1-or-later AND Apache-2.0", + "dependencies": [ + "suitesparse-amd", + "suitesparse-camd", + "suitesparse-ccolamd", + "suitesparse-colamd", + "suitesparse-config", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "default-features": [ + "partition" + ], + "features": { + "matrixops": { + "description": "Build MatrixOps module", + "license": "GPL-2.0-or-later AND LGPL-2.1-or-later AND Apache-2.0" + }, + "modify": { + "description": "Build Modify module", + "license": "GPL-2.0-or-later AND LGPL-2.1-or-later AND Apache-2.0" + }, + "partition": { + "description": "Build Partition module" + }, + "supernodal": { + "description": "Build SuperNodal module", + "license": "GPL-2.0-or-later AND LGPL-2.1-or-later AND Apache-2.0", + "dependencies": [ + "lapack" + ] + }, + "cuda": { + "description": "Enable CUDA support for the current compute architecture of this machine", + "license": "GPL-2.0-or-later AND LGPL-2.1-or-later AND Apache-2.0", + "dependencies": [ + "cuda" + ] + }, + "cuda-redist": { + "description": "Enable CUDA support for all major compute architectures", + "license": "GPL-2.0-or-later AND LGPL-2.1-or-later AND Apache-2.0", + "dependencies": [ + "cuda" + ] + } + } +} diff --git a/ports/suitesparse-config/vcpkg.json b/ports/suitesparse-config/vcpkg.json index 118e5ee43e03f0..0f7e6c47947a46 100644 --- a/ports/suitesparse-config/vcpkg.json +++ b/ports/suitesparse-config/vcpkg.json @@ -6,7 +6,6 @@ "license": "BSD-3-Clause", "dependencies": [ "blas", - "lapack", { "name": "vcpkg-cmake", "host": true From 9d8012a526f6ba2a2f5298b18a76ed6958530fbc Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Fri, 14 Jun 2024 15:31:12 +0300 Subject: [PATCH 14/95] [SuiteSparse] add suitesparse-klu --- ports/suitesparse-klu/portfile.cmake | 41 ++++++++++++++++++++++++++++ ports/suitesparse-klu/vcpkg.json | 29 ++++++++++++++++++++ 2 files changed, 70 insertions(+) create mode 100644 ports/suitesparse-klu/portfile.cmake create mode 100644 ports/suitesparse-klu/vcpkg.json diff --git a/ports/suitesparse-klu/portfile.cmake b/ports/suitesparse-klu/portfile.cmake new file mode 100644 index 00000000000000..bcd52216d4a4a6 --- /dev/null +++ b/ports/suitesparse-klu/portfile.cmake @@ -0,0 +1,41 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO DrTimothyAldenDavis/SuiteSparse + REF v7.7.0 + SHA512 aa62dae81ae423ce7162ae83b46e5cf606d95482e6c6bb7ae6d61e15987761119d9418ef3a96648e6ba2327871a2847eef8ace197aa375279d71c80329d6f451 + HEAD_REF dev +) + +set(PACKAGE_NAME KLU) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + cholmod KLU_USE_CHOLMOD +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC_LIBS) +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/${PACKAGE_NAME}" + OPTIONS + -DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS} + -DSUITESPARSE_USE_CUDA=OFF + -DSUITESPARSE_USE_STRICT=ON + -DSUITESPARSE_USE_FORTRAN=OFF + -DSUITESPARSE_DEMOS=OFF + ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup( + PACKAGE_NAME ${PACKAGE_NAME} + CONFIG_PATH lib/cmake/${PACKAGE_NAME} +) +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +vcpkg_install_copyright(FILE_LIST + "${SOURCE_PATH}/${PACKAGE_NAME}/Doc/License.txt" + "${SOURCE_PATH}/${PACKAGE_NAME}/Doc/lesser.txt" +) diff --git a/ports/suitesparse-klu/vcpkg.json b/ports/suitesparse-klu/vcpkg.json new file mode 100644 index 00000000000000..0c7774844ec69d --- /dev/null +++ b/ports/suitesparse-klu/vcpkg.json @@ -0,0 +1,29 @@ +{ + "name": "suitesparse-klu", + "version-semver": "2.3.3", + "description": "KLU: Routines for solving sparse linear systems of equations in SuiteSparse", + "homepage": "https://people.engr.tamu.edu/davis/suitesparse.html", + "license": "LGPL-2.1-or-later", + "dependencies": [ + "suitesparse-amd", + "suitesparse-btf", + "suitesparse-colamd", + "suitesparse-config", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "cholmod": { + "description": "Build example user-ordering function using CHOLMOD", + "dependencies": [ + "suitesparse-cholmod" + ] + } + } +} From ac4405d8bbbc8d7b51c9b01b94e1a28f3c813e79 Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Fri, 14 Jun 2024 15:38:20 +0300 Subject: [PATCH 15/95] [SuiteSparse] add suitesparse-umfpack --- ports/suitesparse-umfpack/portfile.cmake | 38 ++++++++++++++++++++++++ ports/suitesparse-umfpack/vcpkg.json | 30 +++++++++++++++++++ 2 files changed, 68 insertions(+) create mode 100644 ports/suitesparse-umfpack/portfile.cmake create mode 100644 ports/suitesparse-umfpack/vcpkg.json diff --git a/ports/suitesparse-umfpack/portfile.cmake b/ports/suitesparse-umfpack/portfile.cmake new file mode 100644 index 00000000000000..3757a9ab427671 --- /dev/null +++ b/ports/suitesparse-umfpack/portfile.cmake @@ -0,0 +1,38 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO DrTimothyAldenDavis/SuiteSparse + REF v7.7.0 + SHA512 aa62dae81ae423ce7162ae83b46e5cf606d95482e6c6bb7ae6d61e15987761119d9418ef3a96648e6ba2327871a2847eef8ace197aa375279d71c80329d6f451 + HEAD_REF dev +) + +set(PACKAGE_NAME UMFPACK) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + cholmod UMFPACK_USE_CHOLMOD +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC_LIBS) +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/${PACKAGE_NAME}" + OPTIONS + -DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS} + -DSUITESPARSE_USE_CUDA=OFF + -DSUITESPARSE_USE_STRICT=ON + -DSUITESPARSE_USE_FORTRAN=OFF + -DSUITESPARSE_DEMOS=OFF + ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup( + PACKAGE_NAME ${PACKAGE_NAME} + CONFIG_PATH lib/cmake/${PACKAGE_NAME} +) +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/${PACKAGE_NAME}/Doc/License.txt") diff --git a/ports/suitesparse-umfpack/vcpkg.json b/ports/suitesparse-umfpack/vcpkg.json new file mode 100644 index 00000000000000..be548e12583250 --- /dev/null +++ b/ports/suitesparse-umfpack/vcpkg.json @@ -0,0 +1,30 @@ +{ + "name": "suitesparse-umfpack", + "version-semver": "6.3.3", + "description": "UMFPACK: Routines solving sparse linear systems via LU factorization in SuiteSparse", + "homepage": "https://people.engr.tamu.edu/davis/suitesparse.html", + "license": "GPL-2.0-or-later", + "dependencies": [ + "suitesparse-amd", + "suitesparse-config", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "default-features": [ + "cholmod" + ], + "features": { + "cholmod": { + "description": "Use CHOLMOD", + "dependencies": [ + "suitesparse-cholmod" + ] + } + } +} From 44b17c14b240cedaf77c01f608b51bd7ad2c4766 Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Fri, 14 Jun 2024 15:42:25 +0300 Subject: [PATCH 16/95] [SuiteSparse] add suitesparse-paru --- .../001-fix-cmake-umfpack.patch | 15 ++++++++ ports/suitesparse-paru/portfile.cmake | 34 +++++++++++++++++++ ports/suitesparse-paru/vcpkg.json | 20 +++++++++++ 3 files changed, 69 insertions(+) create mode 100644 ports/suitesparse-paru/001-fix-cmake-umfpack.patch create mode 100644 ports/suitesparse-paru/portfile.cmake create mode 100644 ports/suitesparse-paru/vcpkg.json diff --git a/ports/suitesparse-paru/001-fix-cmake-umfpack.patch b/ports/suitesparse-paru/001-fix-cmake-umfpack.patch new file mode 100644 index 00000000000000..079e2048d4e1d4 --- /dev/null +++ b/ports/suitesparse-paru/001-fix-cmake-umfpack.patch @@ -0,0 +1,15 @@ +https://github.com/DrTimothyAldenDavis/SuiteSparse/pull/793 + +diff --git a/ParU/CMakeLists.txt b/ParU/CMakeLists.txt +index 7055750b1..7881334ed 100644 +--- a/ParU/CMakeLists.txt ++++ b/ParU/CMakeLists.txt +@@ -111,7 +111,7 @@ if ( NOT SUITESPARSE_ROOT_CMAKELISTS ) + + find_package ( UMFPACK 6.3.3 + PATHS ${CMAKE_SOURCE_DIR}/../UMFPACK/build NO_DEFAULT_PATH ) +- if ( NOT CAMD_FOUND ) ++ if ( NOT UMFPACK_FOUND ) + find_package ( UMFPACK 6.3.3 REQUIRED ) + endif ( ) + endif ( ) diff --git a/ports/suitesparse-paru/portfile.cmake b/ports/suitesparse-paru/portfile.cmake new file mode 100644 index 00000000000000..9a0b7fb1d4ea1b --- /dev/null +++ b/ports/suitesparse-paru/portfile.cmake @@ -0,0 +1,34 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO DrTimothyAldenDavis/SuiteSparse + REF v7.7.0 + SHA512 aa62dae81ae423ce7162ae83b46e5cf606d95482e6c6bb7ae6d61e15987761119d9418ef3a96648e6ba2327871a2847eef8ace197aa375279d71c80329d6f451 + HEAD_REF dev + PATCHES + 001-fix-cmake-umfpack.patch +) + +set(PACKAGE_NAME ParU) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC_LIBS) +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/${PACKAGE_NAME}" + OPTIONS + -DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS} + -DSUITESPARSE_USE_CUDA=OFF + -DSUITESPARSE_USE_STRICT=ON + -DSUITESPARSE_USE_FORTRAN=OFF + -DSUITESPARSE_DEMOS=OFF +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup( + PACKAGE_NAME ${PACKAGE_NAME} + CONFIG_PATH lib/cmake/${PACKAGE_NAME} +) +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/${PACKAGE_NAME}/Doc/License.txt") diff --git a/ports/suitesparse-paru/vcpkg.json b/ports/suitesparse-paru/vcpkg.json new file mode 100644 index 00000000000000..4e4174abeb3380 --- /dev/null +++ b/ports/suitesparse-paru/vcpkg.json @@ -0,0 +1,20 @@ +{ + "name": "suitesparse-paru", + "version-semver": "0.1.3", + "description": "ParU: Routines for solving sparse linear system via parallel multifrontal LU factorization algorithms in SuiteSparse", + "homepage": "https://people.engr.tamu.edu/davis/suitesparse.html", + "license": "GPL-3.0-or-later", + "dependencies": [ + "suitesparse-cholmod", + "suitesparse-config", + "suitesparse-umfpack", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} From fc0bee45ff93bc281c4f0627fa63620eb73a4b83 Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Fri, 14 Jun 2024 15:48:06 +0300 Subject: [PATCH 17/95] [SuiteSparse] add suitesparse-spqr --- ports/suitesparse-cholmod/portfile.cmake | 1 + ports/suitesparse-spqr/portfile.cmake | 45 ++++++++++++++++++++++++ ports/suitesparse-spqr/vcpkg.json | 34 ++++++++++++++++++ 3 files changed, 80 insertions(+) create mode 100644 ports/suitesparse-spqr/portfile.cmake create mode 100644 ports/suitesparse-spqr/vcpkg.json diff --git a/ports/suitesparse-cholmod/portfile.cmake b/ports/suitesparse-cholmod/portfile.cmake index f07744c7b1320d..8bd51dd98a0529 100644 --- a/ports/suitesparse-cholmod/portfile.cmake +++ b/ports/suitesparse-cholmod/portfile.cmake @@ -38,6 +38,7 @@ vcpkg_cmake_configure( -DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS} -DCHOLMOD_GPL=${GPL_ENABLED} -DSUITESPARSE_USE_CUDA=${CUDA_ENABLED} + -DCMAKE_CUDA_ARCHITECTURES=${CUDA_ARCHITECTURES} -DSUITESPARSE_USE_STRICT=ON -DSUITESPARSE_USE_FORTRAN=OFF -DSUITESPARSE_DEMOS=OFF diff --git a/ports/suitesparse-spqr/portfile.cmake b/ports/suitesparse-spqr/portfile.cmake new file mode 100644 index 00000000000000..6ff3a263bcd0ab --- /dev/null +++ b/ports/suitesparse-spqr/portfile.cmake @@ -0,0 +1,45 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO DrTimothyAldenDavis/SuiteSparse + REF v7.7.0 + SHA512 aa62dae81ae423ce7162ae83b46e5cf606d95482e6c6bb7ae6d61e15987761119d9418ef3a96648e6ba2327871a2847eef8ace197aa375279d71c80329d6f451 + HEAD_REF dev +) + +set(PACKAGE_NAME SPQR) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC_LIBS) + +set(CUDA_ENABLED OFF) +if("cuda" IN_LIST FEATURES) + set(CUDA_ENABLED ON) + set(CUDA_ARCHITECTURES "native") +endif() +if("cuda-redist" IN_LIST FEATURES) + set(CUDA_ENABLED ON) + set(CUDA_ARCHITECTURES "all-major") +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/${PACKAGE_NAME}" + OPTIONS + -DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS} + -DSUITESPARSE_USE_CUDA=${CUDA_ENABLED} + -DSPQR_USE_CUDA=${CUDA_ENABLED} + -DCMAKE_CUDA_ARCHITECTURES=${CUDA_ARCHITECTURES} + -DSUITESPARSE_USE_STRICT=ON + -DSUITESPARSE_USE_FORTRAN=OFF + -DSUITESPARSE_DEMOS=OFF +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup( + PACKAGE_NAME ${PACKAGE_NAME} + CONFIG_PATH lib/cmake/${PACKAGE_NAME} +) +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/${PACKAGE_NAME}/Doc/License.txt") diff --git a/ports/suitesparse-spqr/vcpkg.json b/ports/suitesparse-spqr/vcpkg.json new file mode 100644 index 00000000000000..411af6c297e3d4 --- /dev/null +++ b/ports/suitesparse-spqr/vcpkg.json @@ -0,0 +1,34 @@ +{ + "name": "suitesparse-spqr", + "version-semver": "4.3.3", + "description": "SPQR: Multithreaded, multifrontal, rank-revealing sparse QR factorization method in SuiteSparse", + "homepage": "https://people.engr.tamu.edu/davis/suitesparse.html", + "license": "GPL-2.0-or-later", + "dependencies": [ + "lapack", + "suitesparse-cholmod", + "suitesparse-config", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "cuda": { + "description": "Enable CUDA support for the current compute architecture of this machine", + "dependencies": [ + "cuda" + ] + }, + "cuda-redist": { + "description": "Enable CUDA support for all major compute architectures", + "dependencies": [ + "cuda" + ] + } + } +} From 784ad55fd64b135f11178f8247a2262a36daa054 Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Fri, 14 Jun 2024 15:50:04 +0300 Subject: [PATCH 18/95] [SuiteSparse] add suitesparse-cxsparse --- ports/suitesparse-cxsparse/portfile.cmake | 35 +++++++++++++++++++++++ ports/suitesparse-cxsparse/vcpkg.json | 18 ++++++++++++ 2 files changed, 53 insertions(+) create mode 100644 ports/suitesparse-cxsparse/portfile.cmake create mode 100644 ports/suitesparse-cxsparse/vcpkg.json diff --git a/ports/suitesparse-cxsparse/portfile.cmake b/ports/suitesparse-cxsparse/portfile.cmake new file mode 100644 index 00000000000000..c64bca93e7c6d8 --- /dev/null +++ b/ports/suitesparse-cxsparse/portfile.cmake @@ -0,0 +1,35 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO DrTimothyAldenDavis/SuiteSparse + REF v7.7.0 + SHA512 aa62dae81ae423ce7162ae83b46e5cf606d95482e6c6bb7ae6d61e15987761119d9418ef3a96648e6ba2327871a2847eef8ace197aa375279d71c80329d6f451 + HEAD_REF dev +) + +set(PACKAGE_NAME CXSparse) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC_LIBS) +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/${PACKAGE_NAME}" + OPTIONS + -DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS} + -DSUITESPARSE_USE_CUDA=OFF + -DSUITESPARSE_USE_STRICT=ON + -DSUITESPARSE_USE_FORTRAN=OFF + -DSUITESPARSE_DEMOS=OFF +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup( + PACKAGE_NAME ${PACKAGE_NAME} + CONFIG_PATH lib/cmake/${PACKAGE_NAME} +) +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +vcpkg_install_copyright(FILE_LIST + "${SOURCE_PATH}/${PACKAGE_NAME}/Doc/License.txt" + "${SOURCE_PATH}/${PACKAGE_NAME}/Doc/lesser.txt" +) diff --git a/ports/suitesparse-cxsparse/vcpkg.json b/ports/suitesparse-cxsparse/vcpkg.json new file mode 100644 index 00000000000000..27d02a4b7b9ffd --- /dev/null +++ b/ports/suitesparse-cxsparse/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "suitesparse-cxsparse", + "version-semver": "4.4.0", + "description": "CXSparse: Software package for permuting a matrix into block upper triangular form in SuiteSparse", + "homepage": "https://people.engr.tamu.edu/davis/suitesparse.html", + "license": "LGPL-2.1-or-later", + "dependencies": [ + "suitesparse-config", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} From 1206dbce7ad89eceb7c8d48145f88c8770dfd167 Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Fri, 14 Jun 2024 15:57:00 +0300 Subject: [PATCH 19/95] [SuiteSparse] fix suitesparse-ldl license installation --- ports/suitesparse-ldl/portfile.cmake | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ports/suitesparse-ldl/portfile.cmake b/ports/suitesparse-ldl/portfile.cmake index 6baffc12657f2c..bc9087b735eb10 100644 --- a/ports/suitesparse-ldl/portfile.cmake +++ b/ports/suitesparse-ldl/portfile.cmake @@ -29,4 +29,7 @@ vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/${PACKAGE_NAME}/Doc/License.txt") +vcpkg_install_copyright(FILE_LIST + "${SOURCE_PATH}/${PACKAGE_NAME}/Doc/License.txt" + "${SOURCE_PATH}/${PACKAGE_NAME}/Doc/lesser.txt" +) From 2691f4a37dcba39d7d1c6ff1d9019ee813746bda Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Fri, 14 Jun 2024 16:19:54 +0300 Subject: [PATCH 20/95] [SuiteSparse] update suitesparse meta-package --- ports/suitesparse-lagraph/portfile.cmake | 2 +- ports/suitesparse-spex/portfile.cmake | 5 + ports/suitesparse/FindCXSparse.cmake | 73 ----- ports/suitesparse/build_fixes.patch | 281 ------------------ ports/suitesparse/portfile.cmake | 56 +--- .../vcpkg-cmake-wrapper_cxsparse.cmake | 10 - ports/suitesparse/vcpkg.json | 116 +++++++- 7 files changed, 112 insertions(+), 431 deletions(-) delete mode 100644 ports/suitesparse/FindCXSparse.cmake delete mode 100644 ports/suitesparse/build_fixes.patch delete mode 100644 ports/suitesparse/vcpkg-cmake-wrapper_cxsparse.cmake diff --git a/ports/suitesparse-lagraph/portfile.cmake b/ports/suitesparse-lagraph/portfile.cmake index 151d3227ea547d..da249844b16afe 100644 --- a/ports/suitesparse-lagraph/portfile.cmake +++ b/ports/suitesparse-lagraph/portfile.cmake @@ -35,7 +35,7 @@ vcpkg_cmake_config_fixup( vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -# Remove FindGraphBLAS.cmake file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE "${CURRENT_PACKAGES_DIR}/share/cmake/LAGraph/FindGraphBLAS.cmake") vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/${PACKAGE_NAME}/LICENSE") diff --git a/ports/suitesparse-spex/portfile.cmake b/ports/suitesparse-spex/portfile.cmake index edde91616cba49..8f309b8c009e87 100644 --- a/ports/suitesparse-spex/portfile.cmake +++ b/ports/suitesparse-spex/portfile.cmake @@ -28,5 +28,10 @@ vcpkg_cmake_config_fixup( vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE + "${CURRENT_PACKAGES_DIR}/share/cmake/SPEX/FindGMP.cmake" + "${CURRENT_PACKAGES_DIR}/share/cmake/SPEX/FindMPFR.cmake" +) vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/${PACKAGE_NAME}/LICENSE.txt") diff --git a/ports/suitesparse/FindCXSparse.cmake b/ports/suitesparse/FindCXSparse.cmake deleted file mode 100644 index 65d596acaea2c1..00000000000000 --- a/ports/suitesparse/FindCXSparse.cmake +++ /dev/null @@ -1,73 +0,0 @@ -# Distributed under the OSI-approved BSD 3-Clause License. -# -#.rst: -# FindCXSparse -# -------- -# -# Find the CXSparse library -# -# Result Variables -# ^^^^^^^^^^^^^^^^ -# -# The following variables will be defined: -# -# ``CXSparse_FOUND`` -# True if CXSparse found on the local system -# -# ``CXSPARSE_FOUND`` -# True if CXSparse found on the local system -# -# ``CXSparse_INCLUDE_DIRS`` -# Location of CXSparse header files -# -# ``CXSPARSE_INCLUDE_DIRS`` -# Location of CXSparse header files -# -# ``CXSparse_LIBRARIES`` -# List of the CXSparse libraries found -# -# ``CXSPARSE_LIBRARIES`` -# List of the CXSparse libraries found -# -# - -include(${CMAKE_ROOT}/Modules/FindPackageHandleStandardArgs.cmake) -include(${CMAKE_ROOT}/Modules/SelectLibraryConfigurations.cmake) - -find_path(CXSPARSE_INCLUDE_DIR NAMES cs.h PATH_SUFFIXES suitesparse) - -find_library(CXSPARSE_LIBRARY_RELEASE NAMES cxsparse libcxsparse) -find_library(CXSPARSE_LIBRARY_DEBUG NAMES cxsparsed libcxsparsed) -select_library_configurations(CXSPARSE) - -if(CXSPARSE_INCLUDE_DIR) - set(CXSPARSE_VERSION_FILE ${CXSPARSE_INCLUDE_DIR}/cs.h) - file(READ ${CXSPARSE_INCLUDE_DIR}/cs.h CXSPARSE_VERSION_FILE_CONTENTS) - - string(REGEX MATCH "#define CS_VER [0-9]+" - CXSPARSE_MAIN_VERSION "${CXSPARSE_VERSION_FILE_CONTENTS}") - string(REGEX REPLACE "#define CS_VER ([0-9]+)" "\\1" - CXSPARSE_MAIN_VERSION "${CXSPARSE_MAIN_VERSION}") - - string(REGEX MATCH "#define CS_SUBVER [0-9]+" - CXSPARSE_SUB_VERSION "${CXSPARSE_VERSION_FILE_CONTENTS}") - string(REGEX REPLACE "#define CS_SUBVER ([0-9]+)" "\\1" - CXSPARSE_SUB_VERSION "${CXSPARSE_SUB_VERSION}") - - string(REGEX MATCH "#define CS_SUBSUB [0-9]+" - CXSPARSE_SUBSUB_VERSION "${CXSPARSE_VERSION_FILE_CONTENTS}") - string(REGEX REPLACE "#define CS_SUBSUB ([0-9]+)" "\\1" - CXSPARSE_SUBSUB_VERSION "${CXSPARSE_SUBSUB_VERSION}") - - set(CXSPARSE_VERSION "${CXSPARSE_MAIN_VERSION}.${CXSPARSE_SUB_VERSION}.${CXSPARSE_SUBSUB_VERSION}") -endif() - -include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(CXSparse - REQUIRED_VARS CXSPARSE_INCLUDE_DIR CXSPARSE_LIBRARIES - VERSION_VAR CXSPARSE_VERSION) - -set(CXSPARSE_FOUND ${CXSparse_FOUND}) -set(CXSPARSE_INCLUDE_DIRS ${CXSPARSE_INCLUDE_DIR}) -set(CXSparse_INCLUDE_DIRS ${CXSPARSE_INCLUDE_DIR}) -set(CXSparse_LIBRARIES ${CXSPARSE_LIBRARIES}) diff --git a/ports/suitesparse/build_fixes.patch b/ports/suitesparse/build_fixes.patch deleted file mode 100644 index 2734bb02cef03f..00000000000000 --- a/ports/suitesparse/build_fixes.patch +++ /dev/null @@ -1,281 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9602cce..dafb434 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -5,14 +5,6 @@ - # Updated by jesnault (jerome.esnault@inria.fr) 2014-01-21 - # ----------------------------------------------------------------- - --option(HUNTER_ENABLED "Enable Hunter package manager support" OFF) --include(cmake/HunterGate.cmake) -- --HunterGate( -- URL "https://github.com/ruslo/hunter/archive/v0.23.214.tar.gz" -- SHA1 "e14bc153a7f16d6a5eeec845fb0283c8fad8c358" --) -- - PROJECT(SuiteSparseProject) - - cmake_minimum_required(VERSION 3.1) -@@ -47,29 +39,9 @@ else() - message(STATUS "Using user defined CMAKE_INSTALL_PREFIX: ${CMAKE_INSTALL_PREFIX}") - endif() - --# Fix GKlib path: --IF(NOT WIN32) -- SET(GKLIB_PATH "${${PROJECT_NAME}_SOURCE_DIR}/SuiteSparse/metis-5.1.0/GKlib" CACHE INTERNAL "Path to GKlib (for METIS)" FORCE) --ENDIF() -- --# allow creating DLLs in Windows without touching the source code: --IF(NOT ${CMAKE_VERSION} VERSION_LESS "3.4.0" AND WIN32) -- set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON) --ENDIF() -- - ## get CMAKE_INSTALL_BINDIR and CMAKE_INSTALL_LIBDIR - include(GNUInstallDirs) - --if(CMAKE_SIZEOF_VOID_P MATCHES "8") -- set(SUITESPARSE_LIB_POSTFIX "64") --else() -- set(SUITESPARSE_LIB_POSTFIX "") --endif() -- --## get POSTFIX for lib install dir --set(LIB_POSTFIX "${SUITESPARSE_LIB_POSTFIX}" CACHE STRING "suffix for 32/64 inst dir placement") --mark_as_advanced(LIB_POSTFIX) -- - # We want libraries to be named "libXXX" and "libXXXd" in all compilers: - # ------------------------------------------------------------------------ - set(CMAKE_DEBUG_POSTFIX "d") -@@ -77,59 +49,6 @@ IF(MSVC) - set(SP_LIB_PREFIX "lib") # Libs are: "libXXX" - ENDIF(MSVC) - --## check if we can build metis --SET(BUILD_METIS_DEFAULT ON) --if(NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/SuiteSparse/metis-5.1.0/CMakeLists.txt") -- SET(BUILD_METIS_DEFAULT OFF) --endif() -- --SET(WITH_CUDA OFF CACHE BOOL "Build with CUDA support") -- --SET(BUILD_METIS ${BUILD_METIS_DEFAULT} CACHE BOOL "Build METIS for partitioning?") --SET(METIS_DIR ${${PROJECT_NAME}_SOURCE_DIR}/SuiteSparse/metis-5.1.0 CACHE PATH "Source directory of METIS") -- --if(BUILD_METIS) -- ## prepare the installation : -- ## using metis target here is not possible because this target is added in another branch of the CMake structure -- ## TRICK: need to dynamically modify the metis CMakeLists.txt file before it going to parsed... -- ## (very ugly/poor for a metis project get from SCM (git/svn/cvs) but it's works ;) and it doesn't matter if metis was get from .zip) -- if(EXISTS "${METIS_DIR}/libmetis/CMakeLists.txt") -- file(READ "${METIS_DIR}/libmetis/CMakeLists.txt" contentFile) -- string(REGEX MATCH "EXPORT SuiteSparseTargets" alreadyModified ${contentFile}) ## use a string pattern to check if we have to do the modif -- if(NOT alreadyModified) -- file(APPEND "${METIS_DIR}/libmetis/CMakeLists.txt" -- " -- set_target_properties(metis PROPERTIES PUBLIC_HEADER \"../include/metis.h\") -- install(TARGETS metis ## this line is also the string pattern to check if the modification had already done -- EXPORT SuiteSparseTargets -- RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} -- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} -- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} -- PUBLIC_HEADER DESTINATION include -- ) -- " -- ) -- endif() -- endif() -- add_subdirectory(SuiteSparse/metis-5.1.0) ## important part for building metis from its src files --endif(BUILD_METIS) -- -- --## For EXPORT only : --## Previous version of cmake (>2.8.12) doesn't auto take into account external lib (here I mean blas and lapack) we need to link to for our current target we want to export. --## Or at least we need to investigate how to do with previous version. --## This may cause some trouble in case you want to build in static mode and then use it into another custom project. --## You will need to manually link your target into your custom project to the correct dependencies link interfaces. --if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}" GREATER 2.8.11) ## (policies introduced both in 2.8.12) -- set(EXPORT_USE_INTERFACE_LINK_LIBRARIES ON CACHE BOOL "") -- mark_as_advanced(EXPORT_USE_INTERFACE_LINK_LIBRARIES) -- if(EXPORT_USE_INTERFACE_LINK_LIBRARIES) -- cmake_policy(SET CMP0023 NEW) ## just for respecting the new target_link_libraries(...) signature procedure -- cmake_policy(SET CMP0022 NEW) ## use INTERFACE_LINK_LIBRARIES property for in-build targets and ignore old properties (IMPORTED_)?LINK_INTERFACE_LIBRARIES(_)? -- ## Here, next version of cmake 2.8.12 auto take into account the link interface dependencies (see generated cmake/SuiteSparse-config*.cmake into your install dir) -- endif() --endif() -- - ## install_suitesparse_project(targetName headersList) - ## factorise the way we will install all projects (part of the suitesparse project) - ## is the target of the current project you build -@@ -176,16 +95,16 @@ macro(declare_suitesparse_library targetName srcsList headersList) - set(dsl_TARGET_PUBLIC_LINK "") - endif() - if(WITH_CUDA) -- find_package(CUDA) -+ find_package(CUDA REQUIRED) - endif() -- IF(${CUDA_FOUND}) -+ IF(CUDA_FOUND) - INCLUDE_DIRECTORIES(${CUDA_INCLUDE_DIRS}) - INCLUDE_DIRECTORIES(${SuiteSparse_GPUQREngine_INCLUDE}) - INCLUDE_DIRECTORIES(${SuiteSparse_GPURuntime_INCLUDE}) - CUDA_ADD_LIBRARY(${targetName} ${srcsList} ${headersList}) -- ELSE(${CUDA_FOUND}) -+ ELSE() - ADD_LIBRARY(${targetName} ${srcsList} ${headersList}) -- ENDIF(${CUDA_FOUND}) -+ ENDIF() - SET_TARGET_PROPERTIES(${targetName} PROPERTIES - OUTPUT_NAME ${SP_LIB_PREFIX}${targetName} - ) -@@ -211,44 +130,30 @@ MACRO(REMOVE_MATCHING_FILES_FROM_LIST match_expr lst_files) - ENDMACRO(REMOVE_MATCHING_FILES_FROM_LIST) - - if(WITH_CUDA) -- FIND_PACKAGE(cuda) -- IF(${CUDA_FOUND}) -+ FIND_PACKAGE(CUDA REQUIRED) -+ IF(CUDA_FOUND) - ADD_DEFINITIONS(-DGPU_BLAS) -- ENDIF(${CUDA_FOUND}) -+ ENDIF() - endif() - --hunter_add_package(LAPACK) # only in effect if HUNTER_ENABLED is set --# prefer LAPACK config file --find_package(LAPACK CONFIG) --if (LAPACK_FOUND AND TARGET blas AND TARGET lapack) -- message(STATUS "found lapack and blas config file. Linking targets lapack and blas") -- message(STATUS "- LAPACK_CONFIG: ${LAPACK_CONFIG}") -- set(SuiteSparse_LINKER_LAPACK_BLAS_LIBS lapack blas) -- # for suitesparse-config file set method used to find LAPACK (and BLAS) -- set(SuiteSparse_LAPACK_used_CONFIG YES) --else() -- # missing config file or targets, try BLAS and LAPACK -- find_package(BLAS) -- find_package(LAPACK) -- if (BLAS_FOUND AND LAPACK_FOUND) -+ find_package(BLAS REQUIRED) -+ find_package(LAPACK REQUIRED) - message(STATUS "found lapack and blas config file. Linking targets lapack and blas") - message(STATUS "- LAPACK_LIBRARIES: ${LAPACK_LIBRARIES}") - message(STATUS "- BLAS_LIBRARIES: ${BLAS_LIBRARIES}") - set(SuiteSparse_LINKER_LAPACK_BLAS_LIBS ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES}) - # for suitesparse-config file set method used to find LAPACK (and BLAS) - set(SuiteSparse_LAPACK_used_CONFIG NO) -- else () # LAPACK is not found -- message(FATAL_ERROR "lapack not found") -- endif() --endif() - --IF(BUILD_METIS) -+IF(USE_VCPKG_METIS) -+ find_package(metis REQUIRED) - set(SuiteSparse_LINKER_METIS_LIBS "metis") -- ## namespaced library target for config -- set(SuiteSparse_EXPORTED_METIS_LIBS "SuiteSparse::metis") -+ set(SuiteSparse_EXPORTED_METIS_LIBS "metis") -+ set(SuiteSparse_FIND_DEPENDENCY_METIS "find_dependency(metis REQUIRED)") - else() - set(SuiteSparse_LINKER_METIS_LIBS "") - set(SuiteSparse_EXPORTED_METIS_LIBS "") -+ set(SuiteSparse_FIND_PACKAGE_METIS "") - ENDIF() - - add_subdirectory(SuiteSparse) -@@ -287,7 +192,7 @@ endmacro() - # get SuiteSparse version - get_SuiteSparse_Version() - --set(ConfigPackageLocation ${CMAKE_INSTALL_LIBDIR}/cmake/suitesparse-${SuiteSparse_VERSION}) -+set(ConfigPackageLocation ${CMAKE_INSTALL_LIBDIR}/cmake/suitesparse) - ## create targets file - export(EXPORT SuiteSparseTargets - FILE "${CMAKE_CURRENT_BINARY_DIR}/suitesparse/suitesparse-targets.cmake" -@@ -301,7 +206,7 @@ configure_file(cmake/SuiteSparse-config-install.cmake.in - ## do the EXPORT for allowing other project to easily use suitesparse with cmake - install(EXPORT SuiteSparseTargets - FILE -- SuiteSparse-targets.cmake -+ suitesparse-targets.cmake - NAMESPACE - SuiteSparse:: - DESTINATION -diff --git a/SuiteSparse/CMakeLists.txt b/SuiteSparse/CMakeLists.txt -index c6e2834..6fdfb01 100644 ---- a/SuiteSparse/CMakeLists.txt -+++ b/SuiteSparse/CMakeLists.txt -@@ -1,23 +1,5 @@ - PROJECT(SuiteSparse) - --# Set optimized building: --IF(CMAKE_COMPILER_IS_GNUCXX AND NOT CMAKE_BUILD_TYPE MATCHES "Debug") -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3") -- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O3") -- # only optimize for native processer when NOT cross compiling -- if(NOT CMAKE_CROSSCOMPILING) -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mtune=native") -- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mtune=native") -- endif(NOT CMAKE_CROSSCOMPILING) --ENDIF(CMAKE_COMPILER_IS_GNUCXX AND NOT CMAKE_BUILD_TYPE MATCHES "Debug") -- --# Global flags: --IF (BUILD_METIS) -- INCLUDE_DIRECTORIES("${METIS_SOURCE_DIR}/include") --ELSE (BUILD_METIS) -- ADD_DEFINITIONS(-DNPARTITION) --ENDIF ( BUILD_METIS) -- - # Disable COMPLEX numbers: disable it by default, since it causes problems in some platforms. - SET(HAVE_COMPLEX OFF CACHE BOOL "Enables building SuiteSparse with complex numbers (disabled by default to avoid problems in some platforms)") - IF (NOT HAVE_COMPLEX) -@@ -38,12 +20,12 @@ if(WITH_CUDA) - set(SUBPROJECTS_TO_ADD - ${SUBPROJECTS_TO_ADD} - SuiteSparse_GPURuntime -- GPUQREngine -+ GPUQREngine - ) - endif() - - set(SUBPROJECTS_TO_ADD -- ${SUBPROJECTS_TO_ADD} -+ ${SUBPROJECTS_TO_ADD} - SuiteSparse_config - AMD - BTF -diff --git a/cmake/SuiteSparse-config-install.cmake.in b/cmake/SuiteSparse-config-install.cmake.in -index 1e587d1..fd8f3a7 100644 ---- a/cmake/SuiteSparse-config-install.cmake.in -+++ b/cmake/SuiteSparse-config-install.cmake.in -@@ -2,20 +2,14 @@ - get_filename_component(_SuiteSparse_SELF_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) - get_filename_component(_SuiteSparse_PREFIX "${_SuiteSparse_SELF_DIR}" PATH) - get_filename_component(_SuiteSparse_PREFIX "${_SuiteSparse_PREFIX}" PATH) --get_filename_component(_SuiteSparse_PREFIX "${_SuiteSparse_PREFIX}" PATH) - - include(CMakeFindDependencyMacro) --if (@SuiteSparse_LAPACK_used_CONFIG@) # SuiteSparse_LAPACK_used_CONFIG -- # use config file which provides LAPACK (and BLAS) for us -- find_dependency(LAPACK CONFIG) --else() -- # try to find BLAS and LAPACK with modules - find_dependency(BLAS) - find_dependency(LAPACK) --endif () -+ @SuiteSparse_FIND_DEPENDENCY_METIS@ - - # Load targets from the install tree. --include(${_SuiteSparse_SELF_DIR}/SuiteSparse-targets.cmake) -+include(${_SuiteSparse_SELF_DIR}/suitesparse-targets.cmake) - - # Report SuiteSparse header search locations. - set(SuiteSparse_INCLUDE_DIRS ${_SuiteSparse_PREFIX}/include) -@@ -39,3 +33,7 @@ set(SuiteSparse_LIBRARIES - - unset(_SuiteSparse_PREFIX) - unset(_SuiteSparse_SELF_DIR) -+set(SUITESPARSE_FOUND TRUE) -+set(SuiteSparse_FOUND TRUE) -+set(SUITESPARSE_LIBRARIES ${SuiteSparse_LIBRARIES}) -+set(SUITESPARSE_INCLUDE_DIRS ${SuiteSparse_INCLUDE_DIRS}) diff --git a/ports/suitesparse/portfile.cmake b/ports/suitesparse/portfile.cmake index c8a8c95e8605ba..065116c276adcf 100644 --- a/ports/suitesparse/portfile.cmake +++ b/ports/suitesparse/portfile.cmake @@ -1,55 +1 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO DrTimothyAldenDavis/SuiteSparse - REF 71e330ca2bc0a2f12f416c461d23dbca21db4d8f - SHA512 06c75927c924cfd5511b07504e826714f504586243d6f3449d67408a33f3ecea824a7f2de7a165171791b9bda4fc09c0d7093125970895c2ed8d4d37ca1d5a3d - HEAD_REF master -) - -vcpkg_from_github( - OUT_SOURCE_PATH SUITESPARSEWIN_SOURCE_PATH - REPO jlblancoc/suitesparse-metis-for-windows - REF c11e8dd7a2ef7d0d93af4c16f75374dd8ca029e2 - SHA512 fbd2a9e6f7df47eeb5d890c7b286bef7fc4c8bcb22783ce800723bacaf2cfe902177828ce5b9e1c2ed9fb5c54591c5fb046a8667e7d354d452a4baac693e47d2 - HEAD_REF master - PATCHES - build_fixes.patch -) - -# Copy suitesparse sources. -message(STATUS "Overwriting SuiteSparseWin source files with SuiteSparse source files...") -# Should probably remove everything but CMakeLists.txt files? -file(GLOB SUITESPARSE_SOURCE_FILES "${SOURCE_PATH}/*") -foreach(SOURCE_FILE ${SUITESPARSE_SOURCE_FILES}) - file(COPY "${SOURCE_FILE}" DESTINATION "${SUITESPARSEWIN_SOURCE_PATH}/SuiteSparse") -endforeach() -message(STATUS "Overwriting SuiteSparseWin source files with SuiteSparse source files... done") -message(STATUS "Removing integrated lapack and metis lib...") -file(REMOVE_RECURSE "${SUITESPARSEWIN_SOURCE_PATH}/lapack_windows") -file(REMOVE_RECURSE "${SUITESPARSEWIN_SOURCE_PATH}/SuiteSparse/metis-5.1.0") -message(STATUS "Removing integrated lapack and metis lib... done") - -vcpkg_cmake_configure( - SOURCE_PATH "${SUITESPARSEWIN_SOURCE_PATH}" - OPTIONS - -DBUILD_METIS=OFF - -DUSE_VCPKG_METIS=ON - "-DMETIS_SOURCE_DIR=${CURRENT_INSTALLED_DIR}" - OPTIONS_DEBUG - "-DSUITESPARSE_INSTALL_PREFIX=${CURRENT_PACKAGES_DIR}/debug" - OPTIONS_RELEASE - "-DSUITESPARSE_INSTALL_PREFIX=${CURRENT_PACKAGES_DIR}" -) - -vcpkg_cmake_install() - -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/suitesparse) - -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") - -file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) -file(INSTALL "${SUITESPARSEWIN_SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright_suitesparse-metis-for-windows) - -file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/cxsparse") -file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper_cxsparse.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/cxsparse" RENAME vcpkg-cmake-wrapper.cmake) -file(COPY "${CMAKE_CURRENT_LIST_DIR}/FindCXSparse.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/cxsparse") +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) diff --git a/ports/suitesparse/vcpkg-cmake-wrapper_cxsparse.cmake b/ports/suitesparse/vcpkg-cmake-wrapper_cxsparse.cmake deleted file mode 100644 index 67d87e8b69055b..00000000000000 --- a/ports/suitesparse/vcpkg-cmake-wrapper_cxsparse.cmake +++ /dev/null @@ -1,10 +0,0 @@ -set(CXSPARSE_PREV_MODULE_PATH ${CMAKE_MODULE_PATH}) -list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}) - -list(REMOVE_ITEM ARGS "NO_MODULE") -list(REMOVE_ITEM ARGS "CONFIG") -list(REMOVE_ITEM ARGS "MODULE") - -_find_package(${ARGS}) - -set(CMAKE_MODULE_PATH ${CXSPARSE_PREV_MODULE_PATH}) diff --git a/ports/suitesparse/vcpkg.json b/ports/suitesparse/vcpkg.json index c3a8f25f2ecb24..f363a1dde8e325 100644 --- a/ports/suitesparse/vcpkg.json +++ b/ports/suitesparse/vcpkg.json @@ -1,19 +1,113 @@ { "name": "suitesparse", - "version-semver": "5.8.0", - "port-version": 2, - "description": "A suite of sparse matrix algorithms. Also provides libcxsparse.", - "homepage": "http://suitesparse.com", + "version-semver": "7.7.0", + "port-version": 3, + "description": "A suite of sparse matrix algorithms", + "homepage": "https://people.engr.tamu.edu/davis/suitesparse.html", + "license": null, "dependencies": [ - "lapack", - "metis", { - "name": "vcpkg-cmake", - "host": true + "name": "suitesparse-config", + "default-features": false }, { - "name": "vcpkg-cmake-config", - "host": true + "name": "suitesparse-graphblas", + "default-features": false + }, + { + "name": "suitesparse-lagraph", + "default-features": false + }, + "suitesparse-amd", + "suitesparse-btf", + "suitesparse-camd", + "suitesparse-ccolamd", + "suitesparse-cholmod", + "suitesparse-colamd", + "suitesparse-cxsparse", + "suitesparse-klu", + "suitesparse-ldl", + "suitesparse-spex" + ], + "default-features": [ + "gpl", + "openmp" + ], + "features": { + "gpl": { + "description": "Enable GPL-licensed packages", + "dependencies": [ + { + "name": "suitesparse-cholmod", + "features": [ + "matrixops", + "modify", + "supernodal" + ] + }, + "suitesparse-mongoose", + "suitesparse-paru", + "suitesparse-rbio", + "suitesparse-spqr", + "suitesparse-umfpack" + ] + }, + "openmp": { + "description": "Enable OpenMP support for SuiteSparse libraries", + "dependencies": [ + { + "name": "suitesparse-config", + "features": [ + "openmp" + ] + }, + { + "name": "suitesparse-graphblas", + "features": [ + "openmp" + ] + }, + { + "name": "suitesparse-lagraph", + "features": [ + "openmp" + ] + } + ] + }, + "cuda": { + "description": "Enable CUDA support for the current compute architecture of this machine", + "dependencies": [ + { + "name": "suitesparse-cholmod", + "features": [ + "cuda" + ] + }, + { + "name": "suitesparse-spqr", + "features": [ + "cuda" + ] + } + ] + }, + "cuda-redist": { + "description": "Enable CUDA support for all major compute architectures", + "dependencies": [ + { + "name": "suitesparse-cholmod", + "features": [ + "cuda-redist" + ] + }, + { + "name": "suitesparse-spqr", + "features": [ + "cuda-redist" + ] + } + ] } - ] + } } From 1df3ccf480459d7857073bb8f62d2560baa4bce3 Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Fri, 14 Jun 2024 16:26:15 +0300 Subject: [PATCH 21/95] [SuiteSparse] update Ceres and g2o to use specific SuiteSparse packages only --- ports/ceres/vcpkg.json | 6 ++---- ports/g2o/vcpkg.json | 3 ++- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/ports/ceres/vcpkg.json b/ports/ceres/vcpkg.json index d7471df4d44fb0..2507ef845f15ca 100644 --- a/ports/ceres/vcpkg.json +++ b/ports/ceres/vcpkg.json @@ -60,10 +60,8 @@ "lapack" ] }, - { - "name": "suitesparse", - "default-features": false - } + "suitesparse-cholmod", + "suitesparse-spqr" ] }, "tools": { diff --git a/ports/g2o/vcpkg.json b/ports/g2o/vcpkg.json index efabcdf092cc50..0d03229fc46bbf 100644 --- a/ports/g2o/vcpkg.json +++ b/ports/g2o/vcpkg.json @@ -8,7 +8,8 @@ "ceres", "eigen3", "lapack", - "suitesparse", + "suitesparse-cholmod", + "suitesparse-cxsparse", { "name": "vcpkg-cmake", "host": true From 730b0ef07ee2cb46e3996db96bcf17e0197aa08a Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Fri, 14 Jun 2024 16:35:34 +0300 Subject: [PATCH 22/95] [SuiteSparse] fix vcpkg.json formatting --- ports/suitesparse-cholmod/vcpkg.json | 28 ++++----- ports/suitesparse/vcpkg.json | 92 ++++++++++++++-------------- 2 files changed, 60 insertions(+), 60 deletions(-) diff --git a/ports/suitesparse-cholmod/vcpkg.json b/ports/suitesparse-cholmod/vcpkg.json index 7efda6bbd1c360..69226a8a041e5d 100644 --- a/ports/suitesparse-cholmod/vcpkg.json +++ b/ports/suitesparse-cholmod/vcpkg.json @@ -23,6 +23,20 @@ "partition" ], "features": { + "cuda": { + "description": "Enable CUDA support for the current compute architecture of this machine", + "license": "GPL-2.0-or-later AND LGPL-2.1-or-later AND Apache-2.0", + "dependencies": [ + "cuda" + ] + }, + "cuda-redist": { + "description": "Enable CUDA support for all major compute architectures", + "license": "GPL-2.0-or-later AND LGPL-2.1-or-later AND Apache-2.0", + "dependencies": [ + "cuda" + ] + }, "matrixops": { "description": "Build MatrixOps module", "license": "GPL-2.0-or-later AND LGPL-2.1-or-later AND Apache-2.0" @@ -40,20 +54,6 @@ "dependencies": [ "lapack" ] - }, - "cuda": { - "description": "Enable CUDA support for the current compute architecture of this machine", - "license": "GPL-2.0-or-later AND LGPL-2.1-or-later AND Apache-2.0", - "dependencies": [ - "cuda" - ] - }, - "cuda-redist": { - "description": "Enable CUDA support for all major compute architectures", - "license": "GPL-2.0-or-later AND LGPL-2.1-or-later AND Apache-2.0", - "dependencies": [ - "cuda" - ] } } } diff --git a/ports/suitesparse/vcpkg.json b/ports/suitesparse/vcpkg.json index f363a1dde8e325..a228c550aaafb8 100644 --- a/ports/suitesparse/vcpkg.json +++ b/ports/suitesparse/vcpkg.json @@ -6,26 +6,26 @@ "homepage": "https://people.engr.tamu.edu/davis/suitesparse.html", "license": null, "dependencies": [ - { - "name": "suitesparse-config", - "default-features": false - }, - { - "name": "suitesparse-graphblas", - "default-features": false - }, - { - "name": "suitesparse-lagraph", - "default-features": false - }, "suitesparse-amd", "suitesparse-btf", "suitesparse-camd", "suitesparse-ccolamd", "suitesparse-cholmod", "suitesparse-colamd", + { + "name": "suitesparse-config", + "default-features": false + }, "suitesparse-cxsparse", + { + "name": "suitesparse-graphblas", + "default-features": false + }, "suitesparse-klu", + { + "name": "suitesparse-lagraph", + "default-features": false + }, "suitesparse-ldl", "suitesparse-spex" ], @@ -34,6 +34,40 @@ "openmp" ], "features": { + "cuda": { + "description": "Enable CUDA support for the current compute architecture of this machine", + "dependencies": [ + { + "name": "suitesparse-cholmod", + "features": [ + "cuda" + ] + }, + { + "name": "suitesparse-spqr", + "features": [ + "cuda" + ] + } + ] + }, + "cuda-redist": { + "description": "Enable CUDA support for all major compute architectures", + "dependencies": [ + { + "name": "suitesparse-cholmod", + "features": [ + "cuda-redist" + ] + }, + { + "name": "suitesparse-spqr", + "features": [ + "cuda-redist" + ] + } + ] + }, "gpl": { "description": "Enable GPL-licensed packages", "dependencies": [ @@ -74,40 +108,6 @@ ] } ] - }, - "cuda": { - "description": "Enable CUDA support for the current compute architecture of this machine", - "dependencies": [ - { - "name": "suitesparse-cholmod", - "features": [ - "cuda" - ] - }, - { - "name": "suitesparse-spqr", - "features": [ - "cuda" - ] - } - ] - }, - "cuda-redist": { - "description": "Enable CUDA support for all major compute architectures", - "dependencies": [ - { - "name": "suitesparse-cholmod", - "features": [ - "cuda-redist" - ] - }, - { - "name": "suitesparse-spqr", - "features": [ - "cuda-redist" - ] - } - ] } } } From af990995dd5bdf0ade857f0d342f94c94278cad1 Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Fri, 14 Jun 2024 16:36:35 +0300 Subject: [PATCH 23/95] [SuiteSparse] update version database --- versions/baseline.json | 76 +++++++++++++++++++++++++- versions/c-/ceres.json | 2 +- versions/g-/g2o.json | 2 +- versions/s-/suitesparse-amd.json | 9 +++ versions/s-/suitesparse-btf.json | 9 +++ versions/s-/suitesparse-camd.json | 9 +++ versions/s-/suitesparse-ccolamd.json | 9 +++ versions/s-/suitesparse-cholmod.json | 9 +++ versions/s-/suitesparse-colamd.json | 9 +++ versions/s-/suitesparse-config.json | 9 +++ versions/s-/suitesparse-cxsparse.json | 9 +++ versions/s-/suitesparse-graphblas.json | 9 +++ versions/s-/suitesparse-klu.json | 9 +++ versions/s-/suitesparse-lagraph.json | 9 +++ versions/s-/suitesparse-ldl.json | 9 +++ versions/s-/suitesparse-mongoose.json | 9 +++ versions/s-/suitesparse-paru.json | 9 +++ versions/s-/suitesparse-rbio.json | 9 +++ versions/s-/suitesparse-spex.json | 9 +++ versions/s-/suitesparse-spqr.json | 9 +++ versions/s-/suitesparse-umfpack.json | 9 +++ versions/s-/suitesparse.json | 5 ++ 22 files changed, 243 insertions(+), 4 deletions(-) create mode 100644 versions/s-/suitesparse-amd.json create mode 100644 versions/s-/suitesparse-btf.json create mode 100644 versions/s-/suitesparse-camd.json create mode 100644 versions/s-/suitesparse-ccolamd.json create mode 100644 versions/s-/suitesparse-cholmod.json create mode 100644 versions/s-/suitesparse-colamd.json create mode 100644 versions/s-/suitesparse-config.json create mode 100644 versions/s-/suitesparse-cxsparse.json create mode 100644 versions/s-/suitesparse-graphblas.json create mode 100644 versions/s-/suitesparse-klu.json create mode 100644 versions/s-/suitesparse-lagraph.json create mode 100644 versions/s-/suitesparse-ldl.json create mode 100644 versions/s-/suitesparse-mongoose.json create mode 100644 versions/s-/suitesparse-paru.json create mode 100644 versions/s-/suitesparse-rbio.json create mode 100644 versions/s-/suitesparse-spex.json create mode 100644 versions/s-/suitesparse-spqr.json create mode 100644 versions/s-/suitesparse-umfpack.json diff --git a/versions/baseline.json b/versions/baseline.json index c318a165ae71fe..98e6c61418cb4f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8529,8 +8529,80 @@ "port-version": 7 }, "suitesparse": { - "baseline": "5.8.0", - "port-version": 2 + "baseline": "7.7.0", + "port-version": 3 + }, + "suitesparse-amd": { + "baseline": "3.3.2", + "port-version": 0 + }, + "suitesparse-btf": { + "baseline": "2.3.2", + "port-version": 0 + }, + "suitesparse-camd": { + "baseline": "3.3.2", + "port-version": 0 + }, + "suitesparse-ccolamd": { + "baseline": "3.3.3", + "port-version": 0 + }, + "suitesparse-cholmod": { + "baseline": "5.2.1", + "port-version": 0 + }, + "suitesparse-colamd": { + "baseline": "3.3.3", + "port-version": 0 + }, + "suitesparse-config": { + "baseline": "7.7.0", + "port-version": 0 + }, + "suitesparse-cxsparse": { + "baseline": "4.4.0", + "port-version": 0 + }, + "suitesparse-graphblas": { + "baseline": "9.2.0", + "port-version": 0 + }, + "suitesparse-klu": { + "baseline": "2.3.3", + "port-version": 0 + }, + "suitesparse-lagraph": { + "baseline": "1.1.3", + "port-version": 0 + }, + "suitesparse-ldl": { + "baseline": "3.3.2", + "port-version": 0 + }, + "suitesparse-mongoose": { + "baseline": "3.3.3", + "port-version": 0 + }, + "suitesparse-paru": { + "baseline": "0.1.3", + "port-version": 0 + }, + "suitesparse-rbio": { + "baseline": "4.3.2", + "port-version": 0 + }, + "suitesparse-spex": { + "baseline": "3.1.0", + "port-version": 0 + }, + "suitesparse-spqr": { + "baseline": "4.3.3", + "port-version": 0 + }, + "suitesparse-umfpack": { + "baseline": "6.3.3", + "port-version": 0 }, "sundials": { "baseline": "6.2.0", diff --git a/versions/c-/ceres.json b/versions/c-/ceres.json index eefdfc508f37b3..99f48d7fc16766 100644 --- a/versions/c-/ceres.json +++ b/versions/c-/ceres.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "213619bf4451443bd69f784f9a7fa32fc2436e07", + "git-tree": "ba38d4fd71397d65bebcadd8ddc491492138d767", "version": "2.1.0", "port-version": 5 }, diff --git a/versions/g-/g2o.json b/versions/g-/g2o.json index ac8f6de43cf58d..3ac2baa0771d49 100644 --- a/versions/g-/g2o.json +++ b/versions/g-/g2o.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "dcf90e398d2940de9be1685b435cc4314f348125", + "git-tree": "78d7fbeddf97132477c9c1336f897cc8a44d6ab1", "version-date": "2020-02-07", "port-version": 6 }, diff --git a/versions/s-/suitesparse-amd.json b/versions/s-/suitesparse-amd.json new file mode 100644 index 00000000000000..16a539de1681f7 --- /dev/null +++ b/versions/s-/suitesparse-amd.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "33402a87e9f26ee29f46da053c20f0c9475150f7", + "version-semver": "3.3.2", + "port-version": 0 + } + ] +} diff --git a/versions/s-/suitesparse-btf.json b/versions/s-/suitesparse-btf.json new file mode 100644 index 00000000000000..ac64d576007c10 --- /dev/null +++ b/versions/s-/suitesparse-btf.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "cae90a27d69bb4daa922ec3a3c0992c42a4c4e5c", + "version-semver": "2.3.2", + "port-version": 0 + } + ] +} diff --git a/versions/s-/suitesparse-camd.json b/versions/s-/suitesparse-camd.json new file mode 100644 index 00000000000000..3df09ba2eb1206 --- /dev/null +++ b/versions/s-/suitesparse-camd.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "e1e4d2e74464b4acc10c4b747de7a1cb95085381", + "version-semver": "3.3.2", + "port-version": 0 + } + ] +} diff --git a/versions/s-/suitesparse-ccolamd.json b/versions/s-/suitesparse-ccolamd.json new file mode 100644 index 00000000000000..c3ff1e1c4febde --- /dev/null +++ b/versions/s-/suitesparse-ccolamd.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "95ba4a88349068a58557be078c71a3e92ccdda26", + "version-semver": "3.3.3", + "port-version": 0 + } + ] +} diff --git a/versions/s-/suitesparse-cholmod.json b/versions/s-/suitesparse-cholmod.json new file mode 100644 index 00000000000000..696bc10d61fba0 --- /dev/null +++ b/versions/s-/suitesparse-cholmod.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "7b29be5777c6e2f83475e67dd51bc558b0675cb7", + "version-semver": "5.2.1", + "port-version": 0 + } + ] +} diff --git a/versions/s-/suitesparse-colamd.json b/versions/s-/suitesparse-colamd.json new file mode 100644 index 00000000000000..599dd7f6fd8868 --- /dev/null +++ b/versions/s-/suitesparse-colamd.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "eeac8ae2f083fc949915f1125f79888320c83233", + "version-semver": "3.3.3", + "port-version": 0 + } + ] +} diff --git a/versions/s-/suitesparse-config.json b/versions/s-/suitesparse-config.json new file mode 100644 index 00000000000000..e259bc4c3b622c --- /dev/null +++ b/versions/s-/suitesparse-config.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "1b86b1affb2300dc3ba8d5f498ab9c281e0dcb05", + "version-semver": "7.7.0", + "port-version": 0 + } + ] +} diff --git a/versions/s-/suitesparse-cxsparse.json b/versions/s-/suitesparse-cxsparse.json new file mode 100644 index 00000000000000..f4a4967c96ac4d --- /dev/null +++ b/versions/s-/suitesparse-cxsparse.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "c002129a0161e37cac0602f71f4a736b4b39a00c", + "version-semver": "4.4.0", + "port-version": 0 + } + ] +} diff --git a/versions/s-/suitesparse-graphblas.json b/versions/s-/suitesparse-graphblas.json new file mode 100644 index 00000000000000..0dabd015c30591 --- /dev/null +++ b/versions/s-/suitesparse-graphblas.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "c5ece022325995bcb03b57d2b55702603c1b5171", + "version-semver": "9.2.0", + "port-version": 0 + } + ] +} diff --git a/versions/s-/suitesparse-klu.json b/versions/s-/suitesparse-klu.json new file mode 100644 index 00000000000000..5bc70fdf7e18bb --- /dev/null +++ b/versions/s-/suitesparse-klu.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "3458d73b18e2d1c20a4046c8b65be40a86ac354f", + "version-semver": "2.3.3", + "port-version": 0 + } + ] +} diff --git a/versions/s-/suitesparse-lagraph.json b/versions/s-/suitesparse-lagraph.json new file mode 100644 index 00000000000000..ac8294ce013471 --- /dev/null +++ b/versions/s-/suitesparse-lagraph.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "eb76160af81f7dcf002433a444602379c9396e9b", + "version-semver": "1.1.3", + "port-version": 0 + } + ] +} diff --git a/versions/s-/suitesparse-ldl.json b/versions/s-/suitesparse-ldl.json new file mode 100644 index 00000000000000..c7ec8fe158901c --- /dev/null +++ b/versions/s-/suitesparse-ldl.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "5af8686e0867d4cdbd237d8de79d5bcd9f490533", + "version-semver": "3.3.2", + "port-version": 0 + } + ] +} diff --git a/versions/s-/suitesparse-mongoose.json b/versions/s-/suitesparse-mongoose.json new file mode 100644 index 00000000000000..82e18a47e7081a --- /dev/null +++ b/versions/s-/suitesparse-mongoose.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "2accb0705f2ddd7ac4f31be9c33f19304e2a35c5", + "version-semver": "3.3.3", + "port-version": 0 + } + ] +} diff --git a/versions/s-/suitesparse-paru.json b/versions/s-/suitesparse-paru.json new file mode 100644 index 00000000000000..2633e5b51a644e --- /dev/null +++ b/versions/s-/suitesparse-paru.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "53c7acd9652a15abeb998899e08e2e6e549b25d0", + "version-semver": "0.1.3", + "port-version": 0 + } + ] +} diff --git a/versions/s-/suitesparse-rbio.json b/versions/s-/suitesparse-rbio.json new file mode 100644 index 00000000000000..5602350949120d --- /dev/null +++ b/versions/s-/suitesparse-rbio.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "364ccd534e3c30e55933b6bc2fe7315bba87231d", + "version-semver": "4.3.2", + "port-version": 0 + } + ] +} diff --git a/versions/s-/suitesparse-spex.json b/versions/s-/suitesparse-spex.json new file mode 100644 index 00000000000000..3eaeb589c11a3b --- /dev/null +++ b/versions/s-/suitesparse-spex.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "a625a047673f8b1192a56642c4dc5c4d9a65414c", + "version-semver": "3.1.0", + "port-version": 0 + } + ] +} diff --git a/versions/s-/suitesparse-spqr.json b/versions/s-/suitesparse-spqr.json new file mode 100644 index 00000000000000..fcd4d94aedd067 --- /dev/null +++ b/versions/s-/suitesparse-spqr.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "1c3ae695d31ce485353b65444a576e9bc3ca54d1", + "version-semver": "4.3.3", + "port-version": 0 + } + ] +} diff --git a/versions/s-/suitesparse-umfpack.json b/versions/s-/suitesparse-umfpack.json new file mode 100644 index 00000000000000..2c39c995943c92 --- /dev/null +++ b/versions/s-/suitesparse-umfpack.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "ef6b778932aef2bac8fff64368777b55d653f70c", + "version-semver": "6.3.3", + "port-version": 0 + } + ] +} diff --git a/versions/s-/suitesparse.json b/versions/s-/suitesparse.json index 92ee992824c6f9..107211bbeef277 100644 --- a/versions/s-/suitesparse.json +++ b/versions/s-/suitesparse.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "086f6b94fe68987f27f0156d4a146d72139aa208", + "version-semver": "7.7.0", + "port-version": 3 + }, { "git-tree": "fb26833d46e56ee2e9986294be860acc1e81c074", "version-semver": "5.8.0", From f5409a37e457c92f0415ce5e1c6b5b73d86a5d01 Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Fri, 14 Jun 2024 17:31:47 +0300 Subject: [PATCH 24/95] [SuiteSparse] fix suitesparse-config fixup --- ports/suitesparse-config/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/suitesparse-config/portfile.cmake b/ports/suitesparse-config/portfile.cmake index 72d2ecf2d51926..ade91e3fe9c6e7 100644 --- a/ports/suitesparse-config/portfile.cmake +++ b/ports/suitesparse-config/portfile.cmake @@ -29,7 +29,7 @@ vcpkg_cmake_configure( vcpkg_cmake_install() # Move SuiteSparseBLAS.cmake, SuiteSparsePolicy.cmake etc files -file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/cmake") +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share") file(RENAME "${CURRENT_PACKAGES_DIR}/lib/cmake/SuiteSparse" "${CURRENT_PACKAGES_DIR}/share/SuiteSparse") vcpkg_cmake_config_fixup( From ebe4c939cfd300537b89882dd0d7e3731cb879a7 Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Fri, 14 Jun 2024 17:32:28 +0300 Subject: [PATCH 25/95] [SuiteSparse] vdb --- versions/s-/suitesparse-config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/s-/suitesparse-config.json b/versions/s-/suitesparse-config.json index e259bc4c3b622c..782e070ccbc788 100644 --- a/versions/s-/suitesparse-config.json +++ b/versions/s-/suitesparse-config.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "1b86b1affb2300dc3ba8d5f498ab9c281e0dcb05", + "git-tree": "d7b37626104294369eabeb1e5a0225d921ebf3b7", "version-semver": "7.7.0", "port-version": 0 } From e83bd3441c8902e605e488f8eac2b8903379bfc5 Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Fri, 14 Jun 2024 18:35:10 +0300 Subject: [PATCH 26/95] [SuiteSparse] set DISABLE_PARALLEL_CONFIGURE Parallel configure fails due to race conditions with configure_file(). --- ports/suitesparse-amd/portfile.cmake | 1 + ports/suitesparse-btf/portfile.cmake | 1 + ports/suitesparse-camd/portfile.cmake | 1 + ports/suitesparse-ccolamd/portfile.cmake | 1 + ports/suitesparse-cholmod/portfile.cmake | 1 + ports/suitesparse-colamd/portfile.cmake | 1 + ports/suitesparse-config/portfile.cmake | 1 + ports/suitesparse-cxsparse/portfile.cmake | 1 + ports/suitesparse-graphblas/portfile.cmake | 1 + ports/suitesparse-klu/portfile.cmake | 1 + ports/suitesparse-lagraph/portfile.cmake | 1 + ports/suitesparse-ldl/portfile.cmake | 1 + ports/suitesparse-mongoose/portfile.cmake | 1 + ports/suitesparse-paru/portfile.cmake | 1 + ports/suitesparse-rbio/portfile.cmake | 1 + ports/suitesparse-spex/portfile.cmake | 1 + ports/suitesparse-spqr/portfile.cmake | 1 + ports/suitesparse-umfpack/portfile.cmake | 1 + 18 files changed, 18 insertions(+) diff --git a/ports/suitesparse-amd/portfile.cmake b/ports/suitesparse-amd/portfile.cmake index 6cf5da8c8d9ebf..81115b152e1671 100644 --- a/ports/suitesparse-amd/portfile.cmake +++ b/ports/suitesparse-amd/portfile.cmake @@ -11,6 +11,7 @@ set(PACKAGE_NAME AMD) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC_LIBS) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}/${PACKAGE_NAME}" + DISABLE_PARALLEL_CONFIGURE OPTIONS -DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS} -DSUITESPARSE_USE_CUDA=OFF diff --git a/ports/suitesparse-btf/portfile.cmake b/ports/suitesparse-btf/portfile.cmake index 7412d231fe2a39..e40066fdae1e3c 100644 --- a/ports/suitesparse-btf/portfile.cmake +++ b/ports/suitesparse-btf/portfile.cmake @@ -11,6 +11,7 @@ set(PACKAGE_NAME BTF) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC_LIBS) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}/${PACKAGE_NAME}" + DISABLE_PARALLEL_CONFIGURE OPTIONS -DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS} -DSUITESPARSE_USE_CUDA=OFF diff --git a/ports/suitesparse-camd/portfile.cmake b/ports/suitesparse-camd/portfile.cmake index a87ea87625ca91..2f64a8aa2f1ff8 100644 --- a/ports/suitesparse-camd/portfile.cmake +++ b/ports/suitesparse-camd/portfile.cmake @@ -11,6 +11,7 @@ set(PACKAGE_NAME CAMD) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC_LIBS) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}/${PACKAGE_NAME}" + DISABLE_PARALLEL_CONFIGURE OPTIONS -DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS} -DSUITESPARSE_USE_CUDA=OFF diff --git a/ports/suitesparse-ccolamd/portfile.cmake b/ports/suitesparse-ccolamd/portfile.cmake index d0b9d97cb9a344..6dfac543451fa9 100644 --- a/ports/suitesparse-ccolamd/portfile.cmake +++ b/ports/suitesparse-ccolamd/portfile.cmake @@ -11,6 +11,7 @@ set(PACKAGE_NAME CCOLAMD) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC_LIBS) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}/${PACKAGE_NAME}" + DISABLE_PARALLEL_CONFIGURE OPTIONS -DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS} -DSUITESPARSE_USE_CUDA=OFF diff --git a/ports/suitesparse-cholmod/portfile.cmake b/ports/suitesparse-cholmod/portfile.cmake index 8bd51dd98a0529..64e6e7c0c6e520 100644 --- a/ports/suitesparse-cholmod/portfile.cmake +++ b/ports/suitesparse-cholmod/portfile.cmake @@ -34,6 +34,7 @@ endif() string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC_LIBS) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}/${PACKAGE_NAME}" + DISABLE_PARALLEL_CONFIGURE OPTIONS -DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS} -DCHOLMOD_GPL=${GPL_ENABLED} diff --git a/ports/suitesparse-colamd/portfile.cmake b/ports/suitesparse-colamd/portfile.cmake index 9053563fbc3232..f764a9684512e0 100644 --- a/ports/suitesparse-colamd/portfile.cmake +++ b/ports/suitesparse-colamd/portfile.cmake @@ -11,6 +11,7 @@ set(PACKAGE_NAME COLAMD) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC_LIBS) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}/${PACKAGE_NAME}" + DISABLE_PARALLEL_CONFIGURE OPTIONS -DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS} -DSUITESPARSE_USE_CUDA=OFF diff --git a/ports/suitesparse-config/portfile.cmake b/ports/suitesparse-config/portfile.cmake index ade91e3fe9c6e7..706501d373ca21 100644 --- a/ports/suitesparse-config/portfile.cmake +++ b/ports/suitesparse-config/portfile.cmake @@ -17,6 +17,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}/${PACKAGE_NAME}" + DISABLE_PARALLEL_CONFIGURE OPTIONS -DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS} -DSUITESPARSE_USE_CUDA=OFF # not applicable here, skip check diff --git a/ports/suitesparse-cxsparse/portfile.cmake b/ports/suitesparse-cxsparse/portfile.cmake index c64bca93e7c6d8..e9a697146a71f7 100644 --- a/ports/suitesparse-cxsparse/portfile.cmake +++ b/ports/suitesparse-cxsparse/portfile.cmake @@ -11,6 +11,7 @@ set(PACKAGE_NAME CXSparse) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC_LIBS) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}/${PACKAGE_NAME}" + DISABLE_PARALLEL_CONFIGURE OPTIONS -DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS} -DSUITESPARSE_USE_CUDA=OFF diff --git a/ports/suitesparse-graphblas/portfile.cmake b/ports/suitesparse-graphblas/portfile.cmake index 3d0508b222652b..27646591c042bf 100644 --- a/ports/suitesparse-graphblas/portfile.cmake +++ b/ports/suitesparse-graphblas/portfile.cmake @@ -16,6 +16,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" + DISABLE_PARALLEL_CONFIGURE OPTIONS -DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS} -DSUITESPARSE_USE_CUDA=OFF diff --git a/ports/suitesparse-klu/portfile.cmake b/ports/suitesparse-klu/portfile.cmake index bcd52216d4a4a6..dfa8f10084dd1e 100644 --- a/ports/suitesparse-klu/portfile.cmake +++ b/ports/suitesparse-klu/portfile.cmake @@ -16,6 +16,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC_LIBS) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}/${PACKAGE_NAME}" + DISABLE_PARALLEL_CONFIGURE OPTIONS -DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS} -DSUITESPARSE_USE_CUDA=OFF diff --git a/ports/suitesparse-lagraph/portfile.cmake b/ports/suitesparse-lagraph/portfile.cmake index da249844b16afe..4a84b8ebfacc1f 100644 --- a/ports/suitesparse-lagraph/portfile.cmake +++ b/ports/suitesparse-lagraph/portfile.cmake @@ -17,6 +17,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}/${PACKAGE_NAME}" + DISABLE_PARALLEL_CONFIGURE OPTIONS -DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS} -DSUITESPARSE_USE_CUDA=OFF diff --git a/ports/suitesparse-ldl/portfile.cmake b/ports/suitesparse-ldl/portfile.cmake index bc9087b735eb10..37f1e3a07bd3b2 100644 --- a/ports/suitesparse-ldl/portfile.cmake +++ b/ports/suitesparse-ldl/portfile.cmake @@ -11,6 +11,7 @@ set(PACKAGE_NAME LDL) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC_LIBS) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}/${PACKAGE_NAME}" + DISABLE_PARALLEL_CONFIGURE OPTIONS -DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS} -DSUITESPARSE_USE_CUDA=OFF diff --git a/ports/suitesparse-mongoose/portfile.cmake b/ports/suitesparse-mongoose/portfile.cmake index f2b0669f4c3907..e27c2fe3670569 100644 --- a/ports/suitesparse-mongoose/portfile.cmake +++ b/ports/suitesparse-mongoose/portfile.cmake @@ -9,6 +9,7 @@ vcpkg_from_github( string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC_LIBS) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}/Mongoose" + DISABLE_PARALLEL_CONFIGURE OPTIONS -DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS} -DSUITESPARSE_USE_CUDA=OFF diff --git a/ports/suitesparse-paru/portfile.cmake b/ports/suitesparse-paru/portfile.cmake index 9a0b7fb1d4ea1b..e59a4880c02269 100644 --- a/ports/suitesparse-paru/portfile.cmake +++ b/ports/suitesparse-paru/portfile.cmake @@ -13,6 +13,7 @@ set(PACKAGE_NAME ParU) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC_LIBS) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}/${PACKAGE_NAME}" + DISABLE_PARALLEL_CONFIGURE OPTIONS -DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS} -DSUITESPARSE_USE_CUDA=OFF diff --git a/ports/suitesparse-rbio/portfile.cmake b/ports/suitesparse-rbio/portfile.cmake index 6df0a1f54c71f0..eaf9323eb5aa74 100644 --- a/ports/suitesparse-rbio/portfile.cmake +++ b/ports/suitesparse-rbio/portfile.cmake @@ -11,6 +11,7 @@ set(PACKAGE_NAME RBio) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC_LIBS) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}/${PACKAGE_NAME}" + DISABLE_PARALLEL_CONFIGURE OPTIONS -DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS} -DSUITESPARSE_USE_CUDA=OFF diff --git a/ports/suitesparse-spex/portfile.cmake b/ports/suitesparse-spex/portfile.cmake index 8f309b8c009e87..61dab9fb3636d9 100644 --- a/ports/suitesparse-spex/portfile.cmake +++ b/ports/suitesparse-spex/portfile.cmake @@ -11,6 +11,7 @@ set(PACKAGE_NAME SPEX) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC_LIBS) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}/${PACKAGE_NAME}" + DISABLE_PARALLEL_CONFIGURE OPTIONS -DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS} -DSUITESPARSE_USE_CUDA=OFF diff --git a/ports/suitesparse-spqr/portfile.cmake b/ports/suitesparse-spqr/portfile.cmake index 6ff3a263bcd0ab..511ed5679cea3f 100644 --- a/ports/suitesparse-spqr/portfile.cmake +++ b/ports/suitesparse-spqr/portfile.cmake @@ -22,6 +22,7 @@ endif() vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}/${PACKAGE_NAME}" + DISABLE_PARALLEL_CONFIGURE OPTIONS -DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS} -DSUITESPARSE_USE_CUDA=${CUDA_ENABLED} diff --git a/ports/suitesparse-umfpack/portfile.cmake b/ports/suitesparse-umfpack/portfile.cmake index 3757a9ab427671..8d9881c721e7b7 100644 --- a/ports/suitesparse-umfpack/portfile.cmake +++ b/ports/suitesparse-umfpack/portfile.cmake @@ -16,6 +16,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC_LIBS) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}/${PACKAGE_NAME}" + DISABLE_PARALLEL_CONFIGURE OPTIONS -DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS} -DSUITESPARSE_USE_CUDA=OFF From bbfbe3bdf57146b5ea4fe73b49e735dc88e50d49 Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Fri, 14 Jun 2024 18:35:25 +0300 Subject: [PATCH 27/95] [SuiteSparse] vdb --- versions/s-/suitesparse-amd.json | 2 +- versions/s-/suitesparse-btf.json | 2 +- versions/s-/suitesparse-camd.json | 2 +- versions/s-/suitesparse-ccolamd.json | 2 +- versions/s-/suitesparse-cholmod.json | 2 +- versions/s-/suitesparse-colamd.json | 2 +- versions/s-/suitesparse-config.json | 2 +- versions/s-/suitesparse-cxsparse.json | 2 +- versions/s-/suitesparse-graphblas.json | 2 +- versions/s-/suitesparse-klu.json | 2 +- versions/s-/suitesparse-lagraph.json | 2 +- versions/s-/suitesparse-ldl.json | 2 +- versions/s-/suitesparse-mongoose.json | 2 +- versions/s-/suitesparse-paru.json | 2 +- versions/s-/suitesparse-rbio.json | 2 +- versions/s-/suitesparse-spex.json | 2 +- versions/s-/suitesparse-spqr.json | 2 +- versions/s-/suitesparse-umfpack.json | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/versions/s-/suitesparse-amd.json b/versions/s-/suitesparse-amd.json index 16a539de1681f7..85d9fe14c16514 100644 --- a/versions/s-/suitesparse-amd.json +++ b/versions/s-/suitesparse-amd.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "33402a87e9f26ee29f46da053c20f0c9475150f7", + "git-tree": "5341e142af27abb899627b3af6fb6955383c7771", "version-semver": "3.3.2", "port-version": 0 } diff --git a/versions/s-/suitesparse-btf.json b/versions/s-/suitesparse-btf.json index ac64d576007c10..6cdae67054480b 100644 --- a/versions/s-/suitesparse-btf.json +++ b/versions/s-/suitesparse-btf.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "cae90a27d69bb4daa922ec3a3c0992c42a4c4e5c", + "git-tree": "b63e148c5d258b48b772fc0922df8a3d6a972689", "version-semver": "2.3.2", "port-version": 0 } diff --git a/versions/s-/suitesparse-camd.json b/versions/s-/suitesparse-camd.json index 3df09ba2eb1206..873ddb95d91acb 100644 --- a/versions/s-/suitesparse-camd.json +++ b/versions/s-/suitesparse-camd.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "e1e4d2e74464b4acc10c4b747de7a1cb95085381", + "git-tree": "2a54c0be183393d4689b8cb5f23b833304475309", "version-semver": "3.3.2", "port-version": 0 } diff --git a/versions/s-/suitesparse-ccolamd.json b/versions/s-/suitesparse-ccolamd.json index c3ff1e1c4febde..1f205288b864d6 100644 --- a/versions/s-/suitesparse-ccolamd.json +++ b/versions/s-/suitesparse-ccolamd.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "95ba4a88349068a58557be078c71a3e92ccdda26", + "git-tree": "595ac812339cbc0dd2bc764dc71734f9f0f901a5", "version-semver": "3.3.3", "port-version": 0 } diff --git a/versions/s-/suitesparse-cholmod.json b/versions/s-/suitesparse-cholmod.json index 696bc10d61fba0..4d89826d4d97eb 100644 --- a/versions/s-/suitesparse-cholmod.json +++ b/versions/s-/suitesparse-cholmod.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "7b29be5777c6e2f83475e67dd51bc558b0675cb7", + "git-tree": "257290d802dcd9f48c45c2f0767b5454b2f0fe54", "version-semver": "5.2.1", "port-version": 0 } diff --git a/versions/s-/suitesparse-colamd.json b/versions/s-/suitesparse-colamd.json index 599dd7f6fd8868..273bc6ef90d8af 100644 --- a/versions/s-/suitesparse-colamd.json +++ b/versions/s-/suitesparse-colamd.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "eeac8ae2f083fc949915f1125f79888320c83233", + "git-tree": "e5998134274fadb1b5f39e1435b68d3776c3f192", "version-semver": "3.3.3", "port-version": 0 } diff --git a/versions/s-/suitesparse-config.json b/versions/s-/suitesparse-config.json index 782e070ccbc788..0c6a84f6b7ca9a 100644 --- a/versions/s-/suitesparse-config.json +++ b/versions/s-/suitesparse-config.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "d7b37626104294369eabeb1e5a0225d921ebf3b7", + "git-tree": "eb2b97034531932f8c47a7fbc6ab78bb157bf816", "version-semver": "7.7.0", "port-version": 0 } diff --git a/versions/s-/suitesparse-cxsparse.json b/versions/s-/suitesparse-cxsparse.json index f4a4967c96ac4d..75c8fc104da065 100644 --- a/versions/s-/suitesparse-cxsparse.json +++ b/versions/s-/suitesparse-cxsparse.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "c002129a0161e37cac0602f71f4a736b4b39a00c", + "git-tree": "8ed2420156f9fcbbee911fbdd4c54600d0a7fdaa", "version-semver": "4.4.0", "port-version": 0 } diff --git a/versions/s-/suitesparse-graphblas.json b/versions/s-/suitesparse-graphblas.json index 0dabd015c30591..47ef81a0879b0f 100644 --- a/versions/s-/suitesparse-graphblas.json +++ b/versions/s-/suitesparse-graphblas.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "c5ece022325995bcb03b57d2b55702603c1b5171", + "git-tree": "679e6bb7cb9aad34d3e407179d0d1de780b28def", "version-semver": "9.2.0", "port-version": 0 } diff --git a/versions/s-/suitesparse-klu.json b/versions/s-/suitesparse-klu.json index 5bc70fdf7e18bb..4c43f3f2edd8b1 100644 --- a/versions/s-/suitesparse-klu.json +++ b/versions/s-/suitesparse-klu.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "3458d73b18e2d1c20a4046c8b65be40a86ac354f", + "git-tree": "ad3c97e33a141b79a0bb4d95b4cd9d6a979f8263", "version-semver": "2.3.3", "port-version": 0 } diff --git a/versions/s-/suitesparse-lagraph.json b/versions/s-/suitesparse-lagraph.json index ac8294ce013471..5e906f44ad9dc5 100644 --- a/versions/s-/suitesparse-lagraph.json +++ b/versions/s-/suitesparse-lagraph.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "eb76160af81f7dcf002433a444602379c9396e9b", + "git-tree": "d81c549789207e10693ca85904655c73505cc1a1", "version-semver": "1.1.3", "port-version": 0 } diff --git a/versions/s-/suitesparse-ldl.json b/versions/s-/suitesparse-ldl.json index c7ec8fe158901c..7c79acbdbbd2d6 100644 --- a/versions/s-/suitesparse-ldl.json +++ b/versions/s-/suitesparse-ldl.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "5af8686e0867d4cdbd237d8de79d5bcd9f490533", + "git-tree": "44f9c757ae3b69581155112f33a3ca6738d33449", "version-semver": "3.3.2", "port-version": 0 } diff --git a/versions/s-/suitesparse-mongoose.json b/versions/s-/suitesparse-mongoose.json index 82e18a47e7081a..3acff8108e2b00 100644 --- a/versions/s-/suitesparse-mongoose.json +++ b/versions/s-/suitesparse-mongoose.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "2accb0705f2ddd7ac4f31be9c33f19304e2a35c5", + "git-tree": "353f2faf1516790cb2ca4308d1c47e71acbec449", "version-semver": "3.3.3", "port-version": 0 } diff --git a/versions/s-/suitesparse-paru.json b/versions/s-/suitesparse-paru.json index 2633e5b51a644e..89199bed260481 100644 --- a/versions/s-/suitesparse-paru.json +++ b/versions/s-/suitesparse-paru.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "53c7acd9652a15abeb998899e08e2e6e549b25d0", + "git-tree": "c943ed1210578eb57404a7c86de1a1661fc9ceb7", "version-semver": "0.1.3", "port-version": 0 } diff --git a/versions/s-/suitesparse-rbio.json b/versions/s-/suitesparse-rbio.json index 5602350949120d..bf5a6b34bb0be4 100644 --- a/versions/s-/suitesparse-rbio.json +++ b/versions/s-/suitesparse-rbio.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "364ccd534e3c30e55933b6bc2fe7315bba87231d", + "git-tree": "eff0cfa52bb7b27685906ff928f92dab8fc3900a", "version-semver": "4.3.2", "port-version": 0 } diff --git a/versions/s-/suitesparse-spex.json b/versions/s-/suitesparse-spex.json index 3eaeb589c11a3b..ab29d8705f6e2b 100644 --- a/versions/s-/suitesparse-spex.json +++ b/versions/s-/suitesparse-spex.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "a625a047673f8b1192a56642c4dc5c4d9a65414c", + "git-tree": "acdaa8efce784f326a8b75893405d71316610a34", "version-semver": "3.1.0", "port-version": 0 } diff --git a/versions/s-/suitesparse-spqr.json b/versions/s-/suitesparse-spqr.json index fcd4d94aedd067..98d91b10e7b193 100644 --- a/versions/s-/suitesparse-spqr.json +++ b/versions/s-/suitesparse-spqr.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "1c3ae695d31ce485353b65444a576e9bc3ca54d1", + "git-tree": "85e1a30febea3dd072a24116b93b62ed84f683e1", "version-semver": "4.3.3", "port-version": 0 } diff --git a/versions/s-/suitesparse-umfpack.json b/versions/s-/suitesparse-umfpack.json index 2c39c995943c92..0d32a9677d5ec8 100644 --- a/versions/s-/suitesparse-umfpack.json +++ b/versions/s-/suitesparse-umfpack.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "ef6b778932aef2bac8fff64368777b55d653f70c", + "git-tree": "6b1015cf74a7cbe3b0f1db003dd85fe7663f9301", "version-semver": "6.3.3", "port-version": 0 } From 29830868e1c17d6ced42dbe64d7ba221ba5c0e4b Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Sat, 15 Jun 2024 18:14:39 +0300 Subject: [PATCH 28/95] [SuiteSparse] disable OpenMP by default --- ports/suitesparse-cholmod/portfile.cmake | 2 ++ ports/suitesparse-cholmod/vcpkg.json | 11 +++++++++++ ports/suitesparse-config/vcpkg.json | 5 +---- ports/suitesparse-graphblas/vcpkg.json | 3 +-- ports/suitesparse-lagraph/portfile.cmake | 6 ------ ports/suitesparse-lagraph/vcpkg.json | 10 +--------- ports/suitesparse-paru/portfile.cmake | 7 +++++++ ports/suitesparse-paru/vcpkg.json | 15 ++++++++++++++- ports/suitesparse-spex/portfile.cmake | 7 +++++++ ports/suitesparse-spex/vcpkg.json | 15 ++++++++++++++- 10 files changed, 58 insertions(+), 23 deletions(-) diff --git a/ports/suitesparse-cholmod/portfile.cmake b/ports/suitesparse-cholmod/portfile.cmake index 64e6e7c0c6e520..4dd46ff6cf916c 100644 --- a/ports/suitesparse-cholmod/portfile.cmake +++ b/ports/suitesparse-cholmod/portfile.cmake @@ -14,6 +14,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS modify CHOLMOD_MODIFY partition CHOLMOD_PARTITION supernodal CHOLMOD_SUPERNODAL + openmp CHOLMOD_USE_OPENMP ) set(CUDA_ENABLED OFF) @@ -38,6 +39,7 @@ vcpkg_cmake_configure( OPTIONS -DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS} -DCHOLMOD_GPL=${GPL_ENABLED} + -DSUITESPARSE_USE_OPENMP=OFF -DSUITESPARSE_USE_CUDA=${CUDA_ENABLED} -DCMAKE_CUDA_ARCHITECTURES=${CUDA_ARCHITECTURES} -DSUITESPARSE_USE_STRICT=ON diff --git a/ports/suitesparse-cholmod/vcpkg.json b/ports/suitesparse-cholmod/vcpkg.json index 69226a8a041e5d..c665852c34defd 100644 --- a/ports/suitesparse-cholmod/vcpkg.json +++ b/ports/suitesparse-cholmod/vcpkg.json @@ -45,6 +45,17 @@ "description": "Build Modify module", "license": "GPL-2.0-or-later AND LGPL-2.1-or-later AND Apache-2.0" }, + "openmp": { + "description": "Enable OpenMP support", + "dependencies": [ + { + "name": "suitesparse-config", + "features": [ + "openmp" + ] + } + ] + }, "partition": { "description": "Build Partition module" }, diff --git a/ports/suitesparse-config/vcpkg.json b/ports/suitesparse-config/vcpkg.json index 0f7e6c47947a46..ac441e551c29eb 100644 --- a/ports/suitesparse-config/vcpkg.json +++ b/ports/suitesparse-config/vcpkg.json @@ -15,12 +15,9 @@ "host": true } ], - "default-features": [ - "openmp" - ], "features": { "openmp": { - "description": "Enable OpenMP support for SuiteSparse libraries" + "description": "Enable OpenMP support (in SuiteSparse_config only)" } } } diff --git a/ports/suitesparse-graphblas/vcpkg.json b/ports/suitesparse-graphblas/vcpkg.json index 08963f24633609..55dce3a6384908 100644 --- a/ports/suitesparse-graphblas/vcpkg.json +++ b/ports/suitesparse-graphblas/vcpkg.json @@ -15,8 +15,7 @@ } ], "default-features": [ - "compact", - "openmp" + "compact" ], "features": { "compact": { diff --git a/ports/suitesparse-lagraph/portfile.cmake b/ports/suitesparse-lagraph/portfile.cmake index 4a84b8ebfacc1f..13b768ba985880 100644 --- a/ports/suitesparse-lagraph/portfile.cmake +++ b/ports/suitesparse-lagraph/portfile.cmake @@ -10,11 +10,6 @@ set(PACKAGE_NAME LAGraph) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC_LIBS) -vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - FEATURES - openmp SUITESPARSE_USE_OPENMP -) - vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}/${PACKAGE_NAME}" DISABLE_PARALLEL_CONFIGURE @@ -24,7 +19,6 @@ vcpkg_cmake_configure( -DSUITESPARSE_USE_STRICT=ON -DSUITESPARSE_USE_FORTRAN=OFF -DSUITESPARSE_DEMOS=OFF - ${FEATURE_OPTIONS} ) vcpkg_cmake_install() diff --git a/ports/suitesparse-lagraph/vcpkg.json b/ports/suitesparse-lagraph/vcpkg.json index 8a423500b5b8e1..f004cfeba8c2a2 100644 --- a/ports/suitesparse-lagraph/vcpkg.json +++ b/ports/suitesparse-lagraph/vcpkg.json @@ -14,13 +14,5 @@ "name": "vcpkg-cmake-config", "host": true } - ], - "default-features": [ - "openmp" - ], - "features": { - "openmp": { - "description": "Enable OpenMP support for SuiteSparse libraries" - } - } + ] } diff --git a/ports/suitesparse-paru/portfile.cmake b/ports/suitesparse-paru/portfile.cmake index e59a4880c02269..a135062a57377c 100644 --- a/ports/suitesparse-paru/portfile.cmake +++ b/ports/suitesparse-paru/portfile.cmake @@ -11,6 +11,12 @@ vcpkg_from_github( set(PACKAGE_NAME ParU) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC_LIBS) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + openmp SUITESPARSE_USE_OPENMP +) + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}/${PACKAGE_NAME}" DISABLE_PARALLEL_CONFIGURE @@ -20,6 +26,7 @@ vcpkg_cmake_configure( -DSUITESPARSE_USE_STRICT=ON -DSUITESPARSE_USE_FORTRAN=OFF -DSUITESPARSE_DEMOS=OFF + ${FEATURE_OPTIONS} ) vcpkg_cmake_install() diff --git a/ports/suitesparse-paru/vcpkg.json b/ports/suitesparse-paru/vcpkg.json index 4e4174abeb3380..b31e348262a8b4 100644 --- a/ports/suitesparse-paru/vcpkg.json +++ b/ports/suitesparse-paru/vcpkg.json @@ -16,5 +16,18 @@ "name": "vcpkg-cmake-config", "host": true } - ] + ], + "features": { + "openmp": { + "description": "Enable OpenMP support", + "dependencies": [ + { + "name": "suitesparse-config", + "features": [ + "openmp" + ] + } + ] + } + } } diff --git a/ports/suitesparse-spex/portfile.cmake b/ports/suitesparse-spex/portfile.cmake index 61dab9fb3636d9..c6e16a1bc2d790 100644 --- a/ports/suitesparse-spex/portfile.cmake +++ b/ports/suitesparse-spex/portfile.cmake @@ -9,6 +9,12 @@ vcpkg_from_github( set(PACKAGE_NAME SPEX) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC_LIBS) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + openmp SUITESPARSE_USE_OPENMP +) + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}/${PACKAGE_NAME}" DISABLE_PARALLEL_CONFIGURE @@ -18,6 +24,7 @@ vcpkg_cmake_configure( -DSUITESPARSE_USE_STRICT=ON -DSUITESPARSE_USE_FORTRAN=OFF -DSUITESPARSE_DEMOS=OFF + ${FEATURE_OPTIONS} ) vcpkg_cmake_install() diff --git a/ports/suitesparse-spex/vcpkg.json b/ports/suitesparse-spex/vcpkg.json index cfc153eec39ddd..ddfa64b4b16304 100644 --- a/ports/suitesparse-spex/vcpkg.json +++ b/ports/suitesparse-spex/vcpkg.json @@ -18,5 +18,18 @@ "name": "vcpkg-cmake-config", "host": true } - ] + ], + "features": { + "openmp": { + "description": "Enable OpenMP support", + "dependencies": [ + { + "name": "suitesparse-config", + "features": [ + "openmp" + ] + } + ] + } + } } From 2a70f3ad69d3b2be0fd67b7022ac296891d6d45f Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Sat, 15 Jun 2024 18:15:44 +0300 Subject: [PATCH 29/95] [SuiteSparse] update vdb --- versions/s-/suitesparse-cholmod.json | 2 +- versions/s-/suitesparse-config.json | 2 +- versions/s-/suitesparse-graphblas.json | 2 +- versions/s-/suitesparse-lagraph.json | 2 +- versions/s-/suitesparse-paru.json | 2 +- versions/s-/suitesparse-spex.json | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/versions/s-/suitesparse-cholmod.json b/versions/s-/suitesparse-cholmod.json index 4d89826d4d97eb..f8202c982ab938 100644 --- a/versions/s-/suitesparse-cholmod.json +++ b/versions/s-/suitesparse-cholmod.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "257290d802dcd9f48c45c2f0767b5454b2f0fe54", + "git-tree": "c27e51b093a40997bef22054c781959c5f5e46c8", "version-semver": "5.2.1", "port-version": 0 } diff --git a/versions/s-/suitesparse-config.json b/versions/s-/suitesparse-config.json index 0c6a84f6b7ca9a..97f6c9542e0fd8 100644 --- a/versions/s-/suitesparse-config.json +++ b/versions/s-/suitesparse-config.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "eb2b97034531932f8c47a7fbc6ab78bb157bf816", + "git-tree": "e614c9e5b1e01d8121e509470339fe1f8d2f33cc", "version-semver": "7.7.0", "port-version": 0 } diff --git a/versions/s-/suitesparse-graphblas.json b/versions/s-/suitesparse-graphblas.json index 47ef81a0879b0f..391484c8bf7c92 100644 --- a/versions/s-/suitesparse-graphblas.json +++ b/versions/s-/suitesparse-graphblas.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "679e6bb7cb9aad34d3e407179d0d1de780b28def", + "git-tree": "42cb22f0bd460773c86a84e89d5dd454d834ef19", "version-semver": "9.2.0", "port-version": 0 } diff --git a/versions/s-/suitesparse-lagraph.json b/versions/s-/suitesparse-lagraph.json index 5e906f44ad9dc5..d29a9765c19e11 100644 --- a/versions/s-/suitesparse-lagraph.json +++ b/versions/s-/suitesparse-lagraph.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "d81c549789207e10693ca85904655c73505cc1a1", + "git-tree": "2ba4ea6ef30cb547a2ed10aa6fbe9738b5c56e44", "version-semver": "1.1.3", "port-version": 0 } diff --git a/versions/s-/suitesparse-paru.json b/versions/s-/suitesparse-paru.json index 89199bed260481..358ef886b91dd2 100644 --- a/versions/s-/suitesparse-paru.json +++ b/versions/s-/suitesparse-paru.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "c943ed1210578eb57404a7c86de1a1661fc9ceb7", + "git-tree": "2d0801bf8728c26481d0a1cfbcc6a331fbc2be13", "version-semver": "0.1.3", "port-version": 0 } diff --git a/versions/s-/suitesparse-spex.json b/versions/s-/suitesparse-spex.json index ab29d8705f6e2b..971411d811cd19 100644 --- a/versions/s-/suitesparse-spex.json +++ b/versions/s-/suitesparse-spex.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "acdaa8efce784f326a8b75893405d71316610a34", + "git-tree": "5bba2ff232f5302414e2c56db9608bf9a4376849", "version-semver": "3.1.0", "port-version": 0 } From c991831727389e009a8353a507993df553b3b840 Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Mon, 17 Jun 2024 08:34:18 +0300 Subject: [PATCH 30/95] [SuiteSparse] fix port-version --- ports/suitesparse/vcpkg.json | 1 - 1 file changed, 1 deletion(-) diff --git a/ports/suitesparse/vcpkg.json b/ports/suitesparse/vcpkg.json index a228c550aaafb8..297b1fa3185e1c 100644 --- a/ports/suitesparse/vcpkg.json +++ b/ports/suitesparse/vcpkg.json @@ -1,7 +1,6 @@ { "name": "suitesparse", "version-semver": "7.7.0", - "port-version": 3, "description": "A suite of sparse matrix algorithms", "homepage": "https://people.engr.tamu.edu/davis/suitesparse.html", "license": null, From 08b7fbe3ee75c4123db7e7aa49e87ff4a03ea300 Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Mon, 17 Jun 2024 08:43:24 +0300 Subject: [PATCH 31/95] [SuiteSparse] update openmp in suitesparse/vcpkg.json --- ports/suitesparse/vcpkg.json | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/ports/suitesparse/vcpkg.json b/ports/suitesparse/vcpkg.json index 297b1fa3185e1c..005a39cbebe8d5 100644 --- a/ports/suitesparse/vcpkg.json +++ b/ports/suitesparse/vcpkg.json @@ -11,26 +11,16 @@ "suitesparse-ccolamd", "suitesparse-cholmod", "suitesparse-colamd", - { - "name": "suitesparse-config", - "default-features": false - }, + "suitesparse-config", "suitesparse-cxsparse", - { - "name": "suitesparse-graphblas", - "default-features": false - }, + "suitesparse-graphblas", "suitesparse-klu", - { - "name": "suitesparse-lagraph", - "default-features": false - }, + "suitesparse-lagraph", "suitesparse-ldl", "suitesparse-spex" ], "default-features": [ - "gpl", - "openmp" + "gpl" ], "features": { "cuda": { @@ -88,6 +78,12 @@ "openmp": { "description": "Enable OpenMP support for SuiteSparse libraries", "dependencies": [ + { + "name": "suitesparse-cholmod", + "features": [ + "openmp" + ] + }, { "name": "suitesparse-config", "features": [ @@ -101,7 +97,13 @@ ] }, { - "name": "suitesparse-lagraph", + "name": "suitesparse-paru", + "features": [ + "openmp" + ] + }, + { + "name": "suitesparse-spex", "features": [ "openmp" ] From 20efbf094a29f7a8dea124649e7131a6be1fd8d1 Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Mon, 17 Jun 2024 10:12:44 +0300 Subject: [PATCH 32/95] [SuiteSparse] workaround for find_package(LAPACK) issues due to BLA_VENDOR --- ports/suitesparse-cholmod/portfile.cmake | 4 ++++ ports/suitesparse-config/portfile.cmake | 4 ++++ ports/suitesparse-spqr/portfile.cmake | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/ports/suitesparse-cholmod/portfile.cmake b/ports/suitesparse-cholmod/portfile.cmake index 4dd46ff6cf916c..0c62bced768754 100644 --- a/ports/suitesparse-cholmod/portfile.cmake +++ b/ports/suitesparse-cholmod/portfile.cmake @@ -8,6 +8,10 @@ vcpkg_from_github( set(PACKAGE_NAME CHOLMOD) +# Avoid overriding of BLA_VENDOR and skip straight to find_package() as done here +# https://github.com/DrTimothyAldenDavis/SuiteSparse/blob/v7.7.0/SuiteSparse_config/cmake_modules/SuiteSparseBLAS.cmake#L240-L245 +file(WRITE "${SOURCE_PATH}/SuiteSparse_config/cmake_modules/SuiteSparseBLAS.cmake" "find_package(BLAS REQUIRED)\nset(BLA_SIZEOF_INTEGER 4)\nset(SuiteSparse_BLAS_integer int32_t)\n") + vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES matrixops CHOLMOD_MATRIXOPS diff --git a/ports/suitesparse-config/portfile.cmake b/ports/suitesparse-config/portfile.cmake index 706501d373ca21..e880bfbc36a980 100644 --- a/ports/suitesparse-config/portfile.cmake +++ b/ports/suitesparse-config/portfile.cmake @@ -8,6 +8,10 @@ vcpkg_from_github( set(PACKAGE_NAME SuiteSparse_config) +# Avoid overriding of BLA_VENDOR and skip straight to find_package() as done here +# https://github.com/DrTimothyAldenDavis/SuiteSparse/blob/v7.7.0/SuiteSparse_config/cmake_modules/SuiteSparseBLAS.cmake#L240-L245 +file(WRITE "${SOURCE_PATH}/SuiteSparse_config/cmake_modules/SuiteSparseBLAS.cmake" "find_package(BLAS REQUIRED)\nset(BLA_SIZEOF_INTEGER 4)\nset(SuiteSparse_BLAS_integer int32_t)\n") + string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC_LIBS) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/suitesparse-spqr/portfile.cmake b/ports/suitesparse-spqr/portfile.cmake index 511ed5679cea3f..f1c402817335cf 100644 --- a/ports/suitesparse-spqr/portfile.cmake +++ b/ports/suitesparse-spqr/portfile.cmake @@ -8,6 +8,10 @@ vcpkg_from_github( set(PACKAGE_NAME SPQR) +# Avoid overriding of BLA_VENDOR and skip straight to find_package() as done here +# https://github.com/DrTimothyAldenDavis/SuiteSparse/blob/v7.7.0/SuiteSparse_config/cmake_modules/SuiteSparseBLAS.cmake#L240-L245 +file(WRITE "${SOURCE_PATH}/SuiteSparse_config/cmake_modules/SuiteSparseBLAS.cmake" "find_package(BLAS REQUIRED)\nset(BLA_SIZEOF_INTEGER 4)\nset(SuiteSparse_BLAS_integer int32_t)\n") + string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC_LIBS) set(CUDA_ENABLED OFF) From 336b50e85b33444310a7c659c69f0a87dc1fecf0 Mon Sep 17 00:00:00 2001 From: Monica Date: Mon, 17 Jun 2024 00:46:19 -0700 Subject: [PATCH 33/95] update git-tree --- versions/baseline.json | 2 +- versions/s-/suitesparse-cholmod.json | 2 +- versions/s-/suitesparse-config.json | 2 +- versions/s-/suitesparse-spqr.json | 2 +- versions/s-/suitesparse.json | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/versions/baseline.json b/versions/baseline.json index 98e6c61418cb4f..f91c28b347c719 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8530,7 +8530,7 @@ }, "suitesparse": { "baseline": "7.7.0", - "port-version": 3 + "port-version": 0 }, "suitesparse-amd": { "baseline": "3.3.2", diff --git a/versions/s-/suitesparse-cholmod.json b/versions/s-/suitesparse-cholmod.json index f8202c982ab938..6ff73e77717c0c 100644 --- a/versions/s-/suitesparse-cholmod.json +++ b/versions/s-/suitesparse-cholmod.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "c27e51b093a40997bef22054c781959c5f5e46c8", + "git-tree": "cddaa587403e37f0a1193f0ee3e96b3f6da9bfe2", "version-semver": "5.2.1", "port-version": 0 } diff --git a/versions/s-/suitesparse-config.json b/versions/s-/suitesparse-config.json index 97f6c9542e0fd8..68f2f934de1153 100644 --- a/versions/s-/suitesparse-config.json +++ b/versions/s-/suitesparse-config.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "e614c9e5b1e01d8121e509470339fe1f8d2f33cc", + "git-tree": "26262a5f8296b1227a70c05d2d94df52e01ff3ad", "version-semver": "7.7.0", "port-version": 0 } diff --git a/versions/s-/suitesparse-spqr.json b/versions/s-/suitesparse-spqr.json index 98d91b10e7b193..c2c7df84077bc7 100644 --- a/versions/s-/suitesparse-spqr.json +++ b/versions/s-/suitesparse-spqr.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "85e1a30febea3dd072a24116b93b62ed84f683e1", + "git-tree": "ff8e4cfa714edffd5fda753858f4624a6ff1ec42", "version-semver": "4.3.3", "port-version": 0 } diff --git a/versions/s-/suitesparse.json b/versions/s-/suitesparse.json index 107211bbeef277..18d65779692a92 100644 --- a/versions/s-/suitesparse.json +++ b/versions/s-/suitesparse.json @@ -1,9 +1,9 @@ { "versions": [ { - "git-tree": "086f6b94fe68987f27f0156d4a146d72139aa208", + "git-tree": "8a76c5c7a9c8406cf212610869e93a732e89f691", "version-semver": "7.7.0", - "port-version": 3 + "port-version": 0 }, { "git-tree": "fb26833d46e56ee2e9986294be860acc1e81c074", From 92707470396e0a8e5790233ba9897695c0db620e Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Mon, 17 Jun 2024 10:45:26 +0300 Subject: [PATCH 34/95] [Ceres] add compatibility with SuiteSparse v7 --- ports/ceres/0003_fix_exported_ceres_config.patch | 5 +++-- .../ceres/0005_suitesparse_v7_compatibility.patch | 15 +++++++++++++++ ports/ceres/find-package-required.patch | 11 ++++++----- ports/ceres/portfile.cmake | 1 + 4 files changed, 25 insertions(+), 7 deletions(-) create mode 100644 ports/ceres/0005_suitesparse_v7_compatibility.patch diff --git a/ports/ceres/0003_fix_exported_ceres_config.patch b/ports/ceres/0003_fix_exported_ceres_config.patch index 9505707da17908..813b14ef1406d3 100644 --- a/ports/ceres/0003_fix_exported_ceres_config.patch +++ b/ports/ceres/0003_fix_exported_ceres_config.patch @@ -2,7 +2,7 @@ diff --git a/cmake/CeresConfig.cmake.in b/cmake/CeresConfig.cmake.in index 4745483..b55462d 100644 --- a/cmake/CeresConfig.cmake.in +++ b/cmake/CeresConfig.cmake.in -@@ -217,55 +217,14 @@ else (Eigen3_FOUND) +@@ -217,55 +217,15 @@ else (Eigen3_FOUND) endif (Eigen3_FOUND) # glog (and maybe gflags). @@ -59,7 +59,8 @@ index 4745483..b55462d 100644 -endif(CERES_USES_MINIGLOG) +# SuiteSparse +if (@SUITESPARSE@) -+ find_dependency(SuiteSparse CONFIG) ++ find_dependency(CHOLMOD REQUIRED) ++ find_dependency(SPQR REQUIRED) +endif() # Import exported Ceres targets, if they have not already been imported. diff --git a/ports/ceres/0005_suitesparse_v7_compatibility.patch b/ports/ceres/0005_suitesparse_v7_compatibility.patch new file mode 100644 index 00000000000000..8391c68732cfa0 --- /dev/null +++ b/ports/ceres/0005_suitesparse_v7_compatibility.patch @@ -0,0 +1,15 @@ +https://github.com/ceres-solver/ceres-solver/commit/9cca671273c2f205ca7350422f48b7b119c5dd78 + +Enable compatibility with SuiteSparse 7.2.0 + +--- a/internal/ceres/covariance_impl.cc ++++ b/internal/ceres/covariance_impl.cc +@@ -630,7 +630,7 @@ + // separately. + const SuiteSparse_long rank = SuiteSparseQR(SPQR_ORDERING_BESTAMD, + SPQR_DEFAULT_TOL, +- cholmod_jacobian.ncol, ++ static_cast(cholmod_jacobian.ncol), + &cholmod_jacobian, + &R, + &permutation, diff --git a/ports/ceres/find-package-required.patch b/ports/ceres/find-package-required.patch index 07785dd137e521..c808898a361957 100644 --- a/ports/ceres/find-package-required.patch +++ b/ports/ceres/find-package-required.patch @@ -13,10 +13,11 @@ index 2d241fe..b79454d 100644 else (LAPACK_FOUND) @@ -266,7 +266,8 @@ if (SUITESPARSE) # built with SuiteSparse support. - +- # Check for SuiteSparse and dependencies. - find_package(SuiteSparse 4.0 COMPONENTS CHOLMOD SPQR) -+ find_package(suitesparse CONFIG REQUIRED) ++ find_package(CHOLMOD CONFIG REQUIRED) ++ find_package(SPQR CONFIG REQUIRED) + set(SuiteSparse_FOUND 1) if (SuiteSparse_FOUND) set(SuiteSparse_DEPENDENCY "find_dependency(SuiteSparse ${SuiteSparse_VERSION})") @@ -98,15 +99,15 @@ index 299b373..33d41d8 100644 add_definitions(-DCERES_SUITESPARSE_VERSION="${SuiteSparse_VERSION}") - list(APPEND CERES_LIBRARY_PRIVATE_DEPENDENCIES SuiteSparse::CHOLMOD - SuiteSparse::SPQR) -+ list(APPEND CERES_LIBRARY_PRIVATE_DEPENDENCIES SuiteSparse::cholmod -+ SuiteSparse::spqr) ++ list(APPEND CERES_LIBRARY_PRIVATE_DEPENDENCIES SuiteSparse::CHOLMOD ++ SuiteSparse::SPQR) endif (SUITESPARSE AND SuiteSparse_FOUND) if (CXSPARSE AND CXSparse_FOUND) # Define version information for use in Solver::FullReport. add_definitions(-DCERES_CXSPARSE_VERSION="${CXSparse_VERSION}") - list(APPEND CERES_LIBRARY_PRIVATE_DEPENDENCIES CXSparse::CXSparse) -+ list(APPEND CERES_LIBRARY_PRIVATE_DEPENDENCIES ${CXSparse_LIBRARIES}) ++ list(APPEND CERES_LIBRARY_PRIVATE_DEPENDENCIES SuiteSparse::CXSparse) endif (CXSPARSE AND CXSparse_FOUND) if (ACCELERATESPARSE AND AccelerateSparse_FOUND) diff --git a/ports/ceres/portfile.cmake b/ports/ceres/portfile.cmake index 6f856bed4bec59..87b974d8d4bf57 100644 --- a/ports/ceres/portfile.cmake +++ b/ports/ceres/portfile.cmake @@ -17,6 +17,7 @@ vcpkg_from_github( 0002_use_glog_target.patch 0003_fix_exported_ceres_config.patch find-package-required.patch + 0005_suitesparse_v7_compatibility.patch ) file(REMOVE "${SOURCE_PATH}/cmake/FindCXSparse.cmake") From e2d601043c3532009c68dadb564add84d59be047 Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Mon, 17 Jun 2024 10:51:18 +0300 Subject: [PATCH 35/95] [Ceres] update vdb --- versions/c-/ceres.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/c-/ceres.json b/versions/c-/ceres.json index 99f48d7fc16766..979e0a29ba68b5 100644 --- a/versions/c-/ceres.json +++ b/versions/c-/ceres.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "ba38d4fd71397d65bebcadd8ddc491492138d767", + "git-tree": "fdb13fdd314d01477a338536609ce98678528d9e", "version": "2.1.0", "port-version": 5 }, From 782adbdc47d66f1c2824f39cefc18f0f86b281bf Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Mon, 17 Jun 2024 11:05:24 +0300 Subject: [PATCH 36/95] [Ceres] add missing suitesparse-cxsparse dependency --- ports/ceres/vcpkg.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ports/ceres/vcpkg.json b/ports/ceres/vcpkg.json index 2507ef845f15ca..d4981a554b5f46 100644 --- a/ports/ceres/vcpkg.json +++ b/ports/ceres/vcpkg.json @@ -36,7 +36,8 @@ "features": [ "suitesparse" ] - } + }, + "suitesparse-cxsparse" ] }, "eigensparse": { From 89b2d51bf4ac796529a3293569529f7e01bcc6b8 Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Mon, 17 Jun 2024 11:07:07 +0300 Subject: [PATCH 37/95] [Ceres] update vdb --- versions/c-/ceres.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/c-/ceres.json b/versions/c-/ceres.json index 979e0a29ba68b5..f6f138196bc1f6 100644 --- a/versions/c-/ceres.json +++ b/versions/c-/ceres.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "fdb13fdd314d01477a338536609ce98678528d9e", + "git-tree": "d37b6d27040875ba58a5ff84233191d8e08f72b8", "version": "2.1.0", "port-version": 5 }, From cffc39ff4010a01ee783fa68cf156fb315bb1428 Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Mon, 17 Jun 2024 14:14:06 +0300 Subject: [PATCH 38/95] [Ceres] fix CeresConfig.cmake.in --- .../0003_fix_exported_ceres_config.patch | 31 +++++++++++++------ 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/ports/ceres/0003_fix_exported_ceres_config.patch b/ports/ceres/0003_fix_exported_ceres_config.patch index 813b14ef1406d3..ae0a89d5b03661 100644 --- a/ports/ceres/0003_fix_exported_ceres_config.patch +++ b/ports/ceres/0003_fix_exported_ceres_config.patch @@ -2,7 +2,24 @@ diff --git a/cmake/CeresConfig.cmake.in b/cmake/CeresConfig.cmake.in index 4745483..b55462d 100644 --- a/cmake/CeresConfig.cmake.in +++ b/cmake/CeresConfig.cmake.in -@@ -217,55 +217,15 @@ else (Eigen3_FOUND) +@@ -179,8 +179,14 @@ + find_dependency(Threads) + + # Optional dependencies +-@CXSparse_DEPENDENCY@ +-@SuiteSparse_DEPENDENCY@ ++include (CMakeFindDependencyMacro) ++if (@CXSPARSE@) ++ find_dependency(CXSparse REQUIRED) ++endif() ++if (@SUITESPARSE@) ++ find_dependency(CHOLMOD REQUIRED) ++ find_dependency(SPQR REQUIRED) ++endif() + + # As imported CMake targets are not re-exported when a dependent target is + # exported, we must invoke find_package(XXX) here to reload the definition +@@ -217,55 +223,7 @@ endif (Eigen3_FOUND) # glog (and maybe gflags). @@ -35,15 +52,13 @@ index 4745483..b55462d 100644 - # Search quietly s/t we control the timing of the error message if not found. - find_package(Glog QUIET) - endif() - +- - if (GLOG_FOUND) - ceres_message(STATUS "Found required Ceres dependency: glog") - else() - ceres_report_not_found("Missing required Ceres dependency: glog.") - endif() -+include (CMakeFindDependencyMacro) -+find_dependency (glog NO_MODULE) - +- - # gflags is only a public dependency of Ceres via glog, thus is not required - # if Ceres was built with MINIGLOG. - if (CERES_USES_GFLAGS) @@ -57,11 +72,7 @@ index 4745483..b55462d 100644 - endif() - endif() -endif(CERES_USES_MINIGLOG) -+# SuiteSparse -+if (@SUITESPARSE@) -+ find_dependency(CHOLMOD REQUIRED) -+ find_dependency(SPQR REQUIRED) -+endif() ++find_dependency(glog CONFIG) # Import exported Ceres targets, if they have not already been imported. if (NOT TARGET ceres AND NOT Ceres_BINARY_DIR) From 5869fb1afcf120de39c33434b4744456c6ad8565 Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Mon, 17 Jun 2024 14:20:23 +0300 Subject: [PATCH 39/95] [Ceres] update vdb --- versions/c-/ceres.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/c-/ceres.json b/versions/c-/ceres.json index f6f138196bc1f6..abd7d29923c83a 100644 --- a/versions/c-/ceres.json +++ b/versions/c-/ceres.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "d37b6d27040875ba58a5ff84233191d8e08f72b8", + "git-tree": "e628219999f68aaf9c3c33ba1a499e6a9b53e23d", "version": "2.1.0", "port-version": 5 }, From 4399aa397e1128b430f78da7d26fb26a1c540fb6 Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Mon, 17 Jun 2024 21:03:23 +0300 Subject: [PATCH 40/95] [SuiteSparse] add missing openmp feature to lagraph --- ports/suitesparse-lagraph/portfile.cmake | 6 ++++++ ports/suitesparse-lagraph/vcpkg.json | 15 ++++++++++++++- ports/suitesparse/vcpkg.json | 6 ++++++ 3 files changed, 26 insertions(+), 1 deletion(-) diff --git a/ports/suitesparse-lagraph/portfile.cmake b/ports/suitesparse-lagraph/portfile.cmake index 13b768ba985880..306e27cce06fa3 100644 --- a/ports/suitesparse-lagraph/portfile.cmake +++ b/ports/suitesparse-lagraph/portfile.cmake @@ -10,6 +10,11 @@ set(PACKAGE_NAME LAGraph) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC_LIBS) +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + openmp LAGRAPH_USE_OPENMP +) + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}/${PACKAGE_NAME}" DISABLE_PARALLEL_CONFIGURE @@ -19,6 +24,7 @@ vcpkg_cmake_configure( -DSUITESPARSE_USE_STRICT=ON -DSUITESPARSE_USE_FORTRAN=OFF -DSUITESPARSE_DEMOS=OFF + ${FEATURE_OPTIONS} ) vcpkg_cmake_install() diff --git a/ports/suitesparse-lagraph/vcpkg.json b/ports/suitesparse-lagraph/vcpkg.json index f004cfeba8c2a2..cc04ce6d9d2e8d 100644 --- a/ports/suitesparse-lagraph/vcpkg.json +++ b/ports/suitesparse-lagraph/vcpkg.json @@ -14,5 +14,18 @@ "name": "vcpkg-cmake-config", "host": true } - ] + ], + "features": { + "openmp": { + "description": "Enable OpenMP support", + "dependencies": [ + { + "name": "suitesparse-graphblas", + "features": [ + "openmp" + ] + } + ] + } + } } diff --git a/ports/suitesparse/vcpkg.json b/ports/suitesparse/vcpkg.json index 005a39cbebe8d5..25397bf9d6ea75 100644 --- a/ports/suitesparse/vcpkg.json +++ b/ports/suitesparse/vcpkg.json @@ -96,6 +96,12 @@ "openmp" ] }, + { + "name": "suitesparse-lagraph", + "features": [ + "openmp" + ] + }, { "name": "suitesparse-paru", "features": [ From 0ab5ad1a76dad9cdbfbb67b7374f5083eabd6846 Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Mon, 17 Jun 2024 21:04:00 +0300 Subject: [PATCH 41/95] [SuiteSparse] update vdb --- versions/s-/suitesparse-lagraph.json | 2 +- versions/s-/suitesparse.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/versions/s-/suitesparse-lagraph.json b/versions/s-/suitesparse-lagraph.json index d29a9765c19e11..6fbbaed9769530 100644 --- a/versions/s-/suitesparse-lagraph.json +++ b/versions/s-/suitesparse-lagraph.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "2ba4ea6ef30cb547a2ed10aa6fbe9738b5c56e44", + "git-tree": "cc0c359210f7dd2f00c76250c1bb661c53a5e4da", "version-semver": "1.1.3", "port-version": 0 } diff --git a/versions/s-/suitesparse.json b/versions/s-/suitesparse.json index 18d65779692a92..64c0da33eb87a7 100644 --- a/versions/s-/suitesparse.json +++ b/versions/s-/suitesparse.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "8a76c5c7a9c8406cf212610869e93a732e89f691", + "git-tree": "20a7e6e9bb0475414244a063ed4dc5b623945a7f", "version-semver": "7.7.0", "port-version": 0 }, From d3f7288bc75ed9f7fa905534ce3cc12bd8d22570 Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Mon, 17 Jun 2024 22:12:02 +0300 Subject: [PATCH 42/95] [theia] add support for SuiteSparse v7 --- ports/theia/portfile.cmake | 1 + ports/theia/suitesparse-v7-support.patch | 35 ++++++++++++++++++++++++ ports/theia/vcpkg.json | 4 ++- 3 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 ports/theia/suitesparse-v7-support.patch diff --git a/ports/theia/portfile.cmake b/ports/theia/portfile.cmake index e972d70925cf98..023e1d0b261f37 100644 --- a/ports/theia/portfile.cmake +++ b/ports/theia/portfile.cmake @@ -11,6 +11,7 @@ vcpkg_from_github( fix-external-dependencies2.patch eigen-3.4.patch 266.diff + suitesparse-v7-support.patch ) file(REMOVE "${SOURCE_PATH}/cmake/FindSuiteSparse.cmake") diff --git a/ports/theia/suitesparse-v7-support.patch b/ports/theia/suitesparse-v7-support.patch new file mode 100644 index 00000000000000..ee83aa46bdd969 --- /dev/null +++ b/ports/theia/suitesparse-v7-support.patch @@ -0,0 +1,35 @@ +--- CMakeLists.txt ++++ CMakeLists.txt +@@ -168,8 +168,12 @@ + endif (OPENIMAGEIO_FOUND) + + # Suitesparse +-find_package(SuiteSparse REQUIRED) +-if (SUITESPARSE_FOUND) ++find_package(CHOLMOD REQUIRED) ++find_package(UMFPACK REQUIRED) ++find_package(SuiteSparse_config REQUIRED) ++set(SUITESPARSE_LIBRARIES SuiteSparse::CHOLMOD SuiteSparse::UMFPACK) ++set(SUITESPARSE_VERSION SuiteSparse_config_VERSION) ++if (TRUE) + # On Ubuntu the system install of SuiteSparse (v3.4.0) up to at least + # Ubuntu 13.10 cannot be used to link shared libraries. + if (BUILD_SHARED_LIBS AND +--- cmake/TheiaConfig.cmake.in ++++ cmake/TheiaConfig.cmake.in +@@ -182,8 +182,13 @@ + endif (ROCKSDB_FOUND) + list(APPEND THEIA_INCLUDE_DIRS ${ROCKSDB_INCLUDE_DIRS}) + +-find_package(SuiteSparse QUIET) +-if (SUITESPARSE_FOUND) ++include(CMakeFindDependencyMacro) ++find_dependency(CHOLMOD REQUIRED) ++find_dependency(UMFPACK REQUIRED) ++find_dependency(SuiteSparse_config REQUIRED) ++set(SUITESPARSE_LIBRARIES SuiteSparse::CHOLMOD SuiteSparse::UMFPACK) ++set(SUITESPARSE_VERSION SuiteSparse_config_VERSION) ++if (TRUE) + # On Ubuntu the system install of SuiteSparse (v3.4.0) up to at least + # Ubuntu 13.10 cannot be used to link shared libraries. + if (BUILD_SHARED_LIBS AND diff --git a/ports/theia/vcpkg.json b/ports/theia/vcpkg.json index 01d31a55d90446..a2412e8e48d897 100644 --- a/ports/theia/vcpkg.json +++ b/ports/theia/vcpkg.json @@ -1,7 +1,7 @@ { "name": "theia", "version": "0.8", - "port-version": 10, + "port-version": 11, "description": "An open source library for multiview geometry and structure from motion", "homepage": "https://github.com/sweeneychris/TheiaSfM", "license": "BSD-3-Clause", @@ -26,6 +26,8 @@ "viewer" ] }, + "suitesparse-cholmod", + "suitesparse-umfpack", { "name": "vcpkg-cmake", "host": true From b7915532807b81b79baf13e29b57ad833c768bae Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Mon, 17 Jun 2024 22:12:18 +0300 Subject: [PATCH 43/95] [theia] update vdb --- versions/baseline.json | 2 +- versions/t-/theia.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/baseline.json b/versions/baseline.json index f91c28b347c719..bab208b15b8d80 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8726,7 +8726,7 @@ }, "theia": { "baseline": "0.8", - "port-version": 10 + "port-version": 11 }, "think-cell-range": { "baseline": "2023.1", diff --git a/versions/t-/theia.json b/versions/t-/theia.json index 095657ad09030a..a1e6320faa51d3 100644 --- a/versions/t-/theia.json +++ b/versions/t-/theia.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2c41938e8f6d977bc7e78c711900979914600218", + "version": "0.8", + "port-version": 11 + }, { "git-tree": "e0486585337480c0d2d32a30cebbbc14be00eec4", "version": "0.8", From c222113cabc90e89caf0a8f574a46e36fb29c627 Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Tue, 18 Jun 2024 10:28:19 +0300 Subject: [PATCH 44/95] [Theia] update and merge patches, drop default [viewer] from openimageio --- ports/theia/fix-external-dependencies.patch | 129 ++++++++++++++----- ports/theia/fix-external-dependencies2.patch | 76 ----------- ports/theia/portfile.cmake | 4 +- ports/theia/suitesparse-v7-support.patch | 35 ----- ports/theia/vcpkg.json | 7 +- 5 files changed, 98 insertions(+), 153 deletions(-) delete mode 100644 ports/theia/fix-external-dependencies2.patch delete mode 100644 ports/theia/suitesparse-v7-support.patch diff --git a/ports/theia/fix-external-dependencies.patch b/ports/theia/fix-external-dependencies.patch index 812aad4319350b..08fc1ce4f0aa5c 100644 --- a/ports/theia/fix-external-dependencies.patch +++ b/ports/theia/fix-external-dependencies.patch @@ -2,7 +2,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index 9c1b150..1adbfed 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -105,10 +105,10 @@ add_definitions(-DTHEIA_DATA_DIR="${CMAKE_SOURCE_DIR}/data") +@@ -105,10 +105,10 @@ # Eigen set(MIN_EIGEN_VERSION 3.2.0) @@ -17,7 +17,7 @@ index 9c1b150..1adbfed 100644 # Use a larger inlining threshold for Clang, since it hobbles Eigen, # resulting in an unreasonably slow version of the blas routines. The -@@ -129,70 +129,27 @@ endif () +@@ -129,70 +129,30 @@ # GFlags. The namespace patch is borrow from Ceres Solver (see license in # FindGflags.cmake) @@ -63,9 +63,9 @@ index 9c1b150..1adbfed 100644 - message(FATAL_ERROR "Can't find OpenImageIO. Please set OPENIMAGEIO_INCLUDE_DIR & " - "OPENIMAGEIO_LIBRARY") -endif (OPENIMAGEIO_FOUND) - - # Suitesparse - find_package(SuiteSparse REQUIRED) +- +-# Suitesparse +-find_package(SuiteSparse REQUIRED) -if (SUITESPARSE_FOUND) - # On Ubuntu the system install of SuiteSparse (v3.4.0) up to at least - # Ubuntu 13.10 cannot be used to link shared libraries. @@ -90,10 +90,24 @@ index 9c1b150..1adbfed 100644 - "for bundle adjustment and for solving convex optimization problems. " - "Please set SUITESPARSE_INCLUDE_DIR & SUITESPARSE_LIBRARY") -endif (SUITESPARSE_FOUND) ++ ++# SuiteSparse ++message("-- Check for SuiteSparse") ++find_package(CHOLMOD REQUIRED) ++find_package(UMFPACK REQUIRED) ++set(SUITESPARSE_LIBRARIES SuiteSparse::CHOLMOD SuiteSparse::UMFPACK) include_directories( include -@@ -225,24 +182,19 @@ include_directories( +@@ -200,7 +160,6 @@ + ${CERES_INCLUDE_DIRS} + ${GFLAGS_INCLUDE_DIRS} + ${GLOG_INCLUDE_DIRS} +- ${SUITESPARSE_INCLUDE_DIRS} + ${OPENIMAGEIO_INCLUDE_DIRS} + ) + +@@ -225,24 +184,19 @@ libraries/spectra ${akaze_SOURCE_DIR} ${akaze_INCLUDE_DIR} @@ -121,7 +135,7 @@ index 9c1b150..1adbfed 100644 if (BUILD_DOCUMENTATION) message("-- Documentation building is enabled") -@@ -260,7 +212,13 @@ install(FILES ${THEIA_HDRS} DESTINATION include/theia) +@@ -260,7 +214,13 @@ file(GLOB_RECURSE THEIA_INTERNAL_HDRS ${CMAKE_SOURCE_DIR}/src/theia/*.h) install(DIRECTORY src/theia/ DESTINATION include/theia FILES_MATCHING PATTERN "*.h") @@ -136,7 +150,7 @@ index 9c1b150..1adbfed 100644 # Add an uninstall target to remove all installed files. configure_file("${CMAKE_SOURCE_DIR}/cmake/uninstall.cmake.in" -@@ -272,17 +230,10 @@ add_custom_target(uninstall +@@ -272,17 +232,10 @@ # Set up install directories. INCLUDE_INSTALL_DIR, LIB_INSTALL_DIR and # CMAKECONFIG_INSTALL_DIR must not be absolute paths. @@ -158,7 +172,7 @@ index 9c1b150..1adbfed 100644 # This "exports" all targets which have been put into the export set # "TheiaExport". This means that CMake generates a file with the given -@@ -319,9 +270,4 @@ configure_file("${CMAKE_SOURCE_DIR}/cmake/TheiaConfigVersion.cmake.in" +@@ -319,9 +272,4 @@ # in the public API of Theia and should thus be present in THEIA_INCLUDE_DIRS. install(FILES "${CMAKE_CURRENT_BINARY_DIR}/TheiaConfig.cmake" "${CMAKE_CURRENT_BINARY_DIR}/TheiaConfigVersion.cmake" @@ -172,9 +186,54 @@ diff --git a/cmake/TheiaConfig.cmake.in b/cmake/TheiaConfig.cmake.in index a3ea187..7e9d912 100644 --- a/cmake/TheiaConfig.cmake.in +++ b/cmake/TheiaConfig.cmake.in -@@ -124,14 +124,7 @@ list(APPEND CERES_INCLUDE_DIR_HINTS @CERES_INCLUDE_DIR@) - get_filename_component(THEIA_BUILD_CERES_LIBRARY_DIR @CERES_LIBRARIES@ PATH) - list(APPEND CERES_LIBRARY_DIR_HINTS ${THEIA_BUILD_CERES_LIBRARY_DIR}) +@@ -43,7 +43,7 @@ + # use the camelcase library name, not uppercase. + if (Theia_FIND_QUIETLY) + message(STATUS "Failed to find Theia - " ${REASON_MSG} ${ARGN}) +- else (Theia_FIND_REQUIRED) ++ elseif (Theia_FIND_REQUIRED) + message(FATAL_ERROR "Failed to find Theia - " ${REASON_MSG} ${ARGN}) + else() + # Neither QUIETLY nor REQUIRED, use SEND_ERROR which emits an error +@@ -101,104 +101,63 @@ + # TheiaTargets-.cmake as link libraries for Theia target. + set(THEIA_INCLUDE_DIRS ${THEIA_INCLUDE_DIR}) + ++include(CMakeFindDependencyMacro) ++ + # Eigen. + # Flag set during configuration and build of Theia. +-set(THEIA_EIGEN_VERSION @EIGEN_VERSION@) ++set(THEIA_EIGEN_VERSION @EIGEN3_VERSION@) + # Append the locations of Eigen when Theia was built to the search path hints. +-list(APPEND EIGEN_INCLUDE_DIR_HINTS @EIGEN_INCLUDE_DIR@) ++list(APPEND EIGEN_INCLUDE_DIR_HINTS @EIGEN3_INCLUDE_DIR@) + # Search quietly s/t we control the timing of the error message if not found. +-find_package(Eigen ${THEIA_EIGEN_VERSION} EXACT QUIET) +-if (EIGEN_FOUND) ++find_dependency(Eigen3 ${THEIA_EIGEN_VERSION} REQUIRED) ++if (EIGEN3_FOUND) + message(STATUS "Found required Theia dependency: " +- "Eigen version ${THEIA_EIGEN_VERSION} in ${EIGEN_INCLUDE_DIRS}") +-else (EIGEN_FOUND) ++ "Eigen version ${THEIA_EIGEN_VERSION} in ${EIGEN3_INCLUDE_DIRS}") ++else (EIGEN3_FOUND) + theia_report_not_found("Missing required Theia " + "dependency: Eigen version ${THEIA_EIGEN_VERSION}, please set " + "EIGEN_INCLUDE_DIR.") +-endif (EIGEN_FOUND) +-list(APPEND THEIA_INCLUDE_DIRS ${EIGEN_INCLUDE_DIRS}) ++endif (EIGEN3_FOUND) ++list(APPEND THEIA_INCLUDE_DIRS ${EIGEN3_INCLUDE_DIRS}) + + # Ceres. + # Append the locations of ceres when Theia was built to the search path hints. +-list(APPEND CERES_INCLUDE_DIR_HINTS @CERES_INCLUDE_DIR@) +-get_filename_component(THEIA_BUILD_CERES_LIBRARY_DIR @CERES_LIBRARIES@ PATH) +-list(APPEND CERES_LIBRARY_DIR_HINTS ${THEIA_BUILD_CERES_LIBRARY_DIR}) ++#list(APPEND CERES_INCLUDE_DIR_HINTS @CERES_INCLUDE_DIR@) ++#get_filename_component(THEIA_BUILD_CERES_LIBRARY_DIR @CERES_LIBRARIES@ PATH) ++#list(APPEND CERES_LIBRARY_DIR_HINTS ${THEIA_BUILD_CERES_LIBRARY_DIR}) # Search quietly s/t we control the timing of the error message if not found. -find_package(Ceres QUIET) -if (CERES_FOUND) @@ -184,13 +243,17 @@ index a3ea187..7e9d912 100644 - theia_report_not_found("Missing required Theia " - "dependency: Ceres, please set CERES_INCLUDE_DIR.") -endif (CERES_FOUND) -+find_package(Ceres REQUIRED) ++find_dependency(Ceres REQUIRED) list(APPEND THEIA_INCLUDE_DIRS ${CERES_INCLUDE_DIRS}) # Glog. -@@ -140,64 +133,19 @@ list(APPEND GLOG_INCLUDE_DIR_HINTS @GLOG_INCLUDE_DIR@) - get_filename_component(THEIA_BUILD_GLOG_LIBRARY_DIR @GLOG_LIBRARY@ PATH) - list(APPEND GLOG_LIBRARY_DIR_HINTS ${THEIA_BUILD_GLOG_LIBRARY_DIR}) + # Append the locations of glog when Theia was built to the search path hints. +-list(APPEND GLOG_INCLUDE_DIR_HINTS @GLOG_INCLUDE_DIR@) +-get_filename_component(THEIA_BUILD_GLOG_LIBRARY_DIR @GLOG_LIBRARY@ PATH) +-list(APPEND GLOG_LIBRARY_DIR_HINTS ${THEIA_BUILD_GLOG_LIBRARY_DIR}) ++#list(APPEND GLOG_INCLUDE_DIR_HINTS @GLOG_INCLUDE_DIR@) ++#get_filename_component(THEIA_BUILD_GLOG_LIBRARY_DIR @GLOG_LIBRARY@ PATH) ++#list(APPEND GLOG_LIBRARY_DIR_HINTS ${THEIA_BUILD_GLOG_LIBRARY_DIR}) # Search quietly s/t we control the timing of the error message if not found. -find_package(Glog QUIET) -if (GLOG_FOUND) @@ -200,7 +263,7 @@ index a3ea187..7e9d912 100644 - theia_report_not_found("Missing required Theia " - "dependency: Glog, please set GLOG_INCLUDE_DIR.") -endif (GLOG_FOUND) -+find_package(Glog REQUIRED) ++find_dependency(Glog REQUIRED) list(APPEND THEIA_INCLUDE_DIRS ${GLOG_INCLUDE_DIRS}) # GFlags. The namespace patch is borrow from Ceres Solver (see license in @@ -214,7 +277,7 @@ index a3ea187..7e9d912 100644 - theia_report_not_found("Missing required Theia dependency: Google Flags, please set " - "GFLAGS_INCLUDE_DIR.") -endif (GFLAGS_FOUND) -+find_package(Gflags REQUIRED) ++find_dependency(Gflags REQUIRED) list(APPEND THEIA_INCLUDE_DIRS ${GFLAGS_INCLUDE_DIRS}) # OpenImageIO @@ -225,7 +288,7 @@ index a3ea187..7e9d912 100644 - theia_report_not_found("Missing required Theia dependency: OpenImageIO. Please set " - "OPENIMAGEIO_INCLUDE_DIR & OPENIMAGEIO_LIBRARY") -endif (OPENIMAGEIO_FOUND) -+find_package(OpenImageIO REQUIRED) ++find_dependency(OpenImageIO REQUIRED) list(APPEND THEIA_INCLUDE_DIRS ${OPENIMAGEIO_INCLUDE_DIRS}) -find_package(SuiteSparse QUIET) @@ -253,23 +316,22 @@ index a3ea187..7e9d912 100644 - "for bundle adjustment and for solving convex optimization problems. " - "Please set SUITESPARSE_INCLUDE_DIR & SUITESPARSE_LIBRARY") -endif (SUITESPARSE_FOUND) -+find_package(SuiteSparse REQUIRED) - list(APPEND THEIA_INCLUDE_DIRS ${SUITESPARSE_INCLUDE_DIRS}) - - # Import exported Theia targets. -@@ -207,22 +155,24 @@ endif (NOT TARGET theia AND NOT Theia_BINARY_DIR) - # Set the expected XX_LIBRARIES variable for FindPackage(). - set(THEIA_LIBRARIES theia) - -+find_package(cereal REQUIRED) +-list(APPEND THEIA_INCLUDE_DIRS ${SUITESPARSE_INCLUDE_DIRS}) ++# SuiteSparse ++find_dependency(CHOLMOD REQUIRED) ++find_dependency(UMFPACK REQUIRED) ++list(APPEND THEIA_INCLUDE_DIRS ${CHOLMOD_INCLUDE_DIR} ${UMFPACK_INCLUDE_DIR}) ++ ++find_dependency(cereal REQUIRED) +list(APPEND THEIA_LIBRARIES cereal) + -+find_package(Flann REQUIRED) ++find_dependency(Flann REQUIRED) +list(APPEND THEIA_INCLUDE_DIRS ${FLANN_INCLUDE_DIR}) +list(APPEND THEIA_LIBRARIES ${FLANN_LIBRARY}) -+ - # Add the libraries included with the distribution. - set(THEIA_INTERNAL_LIB_PREFIX ${THEIA_INCLUDE_DIR}/theia/libraries) + + # Import exported Theia targets. + if (NOT TARGET theia AND NOT Theia_BINARY_DIR) +@@ -212,17 +171,12 @@ set(THEIA_INTERNAL_LIBS_INCLUDES ${THEIA_INTERNAL_LIB_PREFIX} ${THEIA_INTERNAL_LIB_PREFIX}/akaze @@ -449,7 +511,8 @@ index 6830f71..768586d 100644 +++ b/src/theia/CMakeLists.txt @@ -209,7 +209,6 @@ set(THEIA_LIBRARY_DEPENDENCIES ${SUITESPARSE_LIBRARIES} - ${OPENIMAGEIO_LIBRARIES} +- ${OPENIMAGEIO_LIBRARIES} ++ OpenImageIO::OpenImageIO akaze - flann_cpp statx diff --git a/ports/theia/fix-external-dependencies2.patch b/ports/theia/fix-external-dependencies2.patch deleted file mode 100644 index f7026ba1aa36b5..00000000000000 --- a/ports/theia/fix-external-dependencies2.patch +++ /dev/null @@ -1,76 +0,0 @@ -diff --git a/cmake/TheiaConfig.cmake.in b/cmake/TheiaConfig.cmake.in -index 7e9d912..2a98124 100644 ---- a/cmake/TheiaConfig.cmake.in -+++ b/cmake/TheiaConfig.cmake.in -@@ -43,7 +43,7 @@ macro(THEIA_REPORT_NOT_FOUND REASON_MSG) - # use the camelcase library name, not uppercase. - if (Theia_FIND_QUIETLY) - message(STATUS "Failed to find Theia - " ${REASON_MSG} ${ARGN}) -- else (Theia_FIND_REQUIRED) -+ elseif (Theia_FIND_REQUIRED) - message(FATAL_ERROR "Failed to find Theia - " ${REASON_MSG} ${ARGN}) - else() - # Neither QUIETLY nor REQUIRED, use SEND_ERROR which emits an error -@@ -103,35 +103,35 @@ set(THEIA_INCLUDE_DIRS ${THEIA_INCLUDE_DIR}) - - # Eigen. - # Flag set during configuration and build of Theia. --set(THEIA_EIGEN_VERSION @EIGEN_VERSION@) -+set(THEIA_EIGEN_VERSION @EIGEN3_VERSION@) - # Append the locations of Eigen when Theia was built to the search path hints. --list(APPEND EIGEN_INCLUDE_DIR_HINTS @EIGEN_INCLUDE_DIR@) -+list(APPEND EIGEN_INCLUDE_DIR_HINTS @EIGEN3_INCLUDE_DIR@) - # Search quietly s/t we control the timing of the error message if not found. --find_package(Eigen ${THEIA_EIGEN_VERSION} EXACT QUIET) --if (EIGEN_FOUND) -+find_package(Eigen3 ${THEIA_EIGEN_VERSION} REQUIRED) -+if (EIGEN3_FOUND) - message(STATUS "Found required Theia dependency: " -- "Eigen version ${THEIA_EIGEN_VERSION} in ${EIGEN_INCLUDE_DIRS}") --else (EIGEN_FOUND) -+ "Eigen version ${THEIA_EIGEN_VERSION} in ${EIGEN3_INCLUDE_DIRS}") -+else (EIGEN3_FOUND) - theia_report_not_found("Missing required Theia " - "dependency: Eigen version ${THEIA_EIGEN_VERSION}, please set " - "EIGEN_INCLUDE_DIR.") --endif (EIGEN_FOUND) --list(APPEND THEIA_INCLUDE_DIRS ${EIGEN_INCLUDE_DIRS}) -+endif (EIGEN3_FOUND) -+list(APPEND THEIA_INCLUDE_DIRS ${EIGEN3_INCLUDE_DIRS}) - - # Ceres. - # Append the locations of ceres when Theia was built to the search path hints. --list(APPEND CERES_INCLUDE_DIR_HINTS @CERES_INCLUDE_DIR@) --get_filename_component(THEIA_BUILD_CERES_LIBRARY_DIR @CERES_LIBRARIES@ PATH) --list(APPEND CERES_LIBRARY_DIR_HINTS ${THEIA_BUILD_CERES_LIBRARY_DIR}) -+#list(APPEND CERES_INCLUDE_DIR_HINTS @CERES_INCLUDE_DIR@) -+#get_filename_component(THEIA_BUILD_CERES_LIBRARY_DIR @CERES_LIBRARIES@ PATH) -+#list(APPEND CERES_LIBRARY_DIR_HINTS ${THEIA_BUILD_CERES_LIBRARY_DIR}) - # Search quietly s/t we control the timing of the error message if not found. - find_package(Ceres REQUIRED) - list(APPEND THEIA_INCLUDE_DIRS ${CERES_INCLUDE_DIRS}) - - # Glog. - # Append the locations of glog when Theia was built to the search path hints. --list(APPEND GLOG_INCLUDE_DIR_HINTS @GLOG_INCLUDE_DIR@) --get_filename_component(THEIA_BUILD_GLOG_LIBRARY_DIR @GLOG_LIBRARY@ PATH) --list(APPEND GLOG_LIBRARY_DIR_HINTS ${THEIA_BUILD_GLOG_LIBRARY_DIR}) -+#list(APPEND GLOG_INCLUDE_DIR_HINTS @GLOG_INCLUDE_DIR@) -+#get_filename_component(THEIA_BUILD_GLOG_LIBRARY_DIR @GLOG_LIBRARY@ PATH) -+#list(APPEND GLOG_LIBRARY_DIR_HINTS ${THEIA_BUILD_GLOG_LIBRARY_DIR}) - # Search quietly s/t we control the timing of the error message if not found. - find_package(Glog REQUIRED) - list(APPEND THEIA_INCLUDE_DIRS ${GLOG_INCLUDE_DIRS}) -diff --git a/src/theia/CMakeLists.txt b/src/theia/CMakeLists.txt -index 768586d..c1f6593 100644 ---- a/src/theia/CMakeLists.txt -+++ b/src/theia/CMakeLists.txt -@@ -207,7 +207,7 @@ set(THEIA_LIBRARY_DEPENDENCIES - ${GFLAGS_LIBRARIES} - ${GLOG_LIBRARIES} - ${SUITESPARSE_LIBRARIES} -- ${OPENIMAGEIO_LIBRARIES} -+ OpenImageIO::OpenImageIO - akaze - statx - stlplus3 diff --git a/ports/theia/portfile.cmake b/ports/theia/portfile.cmake index 023e1d0b261f37..193c364b66b1f9 100644 --- a/ports/theia/portfile.cmake +++ b/ports/theia/portfile.cmake @@ -8,10 +8,8 @@ vcpkg_from_github( HEAD_REF master PATCHES fix-external-dependencies.patch - fix-external-dependencies2.patch eigen-3.4.patch 266.diff - suitesparse-v7-support.patch ) file(REMOVE "${SOURCE_PATH}/cmake/FindSuiteSparse.cmake") @@ -46,5 +44,5 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/theia/libraries/akaze/datas file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/theia/libraries/spectra/doxygen") # Handle copyright -file(INSTALL "${SOURCE_PATH}/license.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/license.txt") file(COPY "${SOURCE_PATH}/data/camera_sensor_database_license.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/theia/suitesparse-v7-support.patch b/ports/theia/suitesparse-v7-support.patch deleted file mode 100644 index ee83aa46bdd969..00000000000000 --- a/ports/theia/suitesparse-v7-support.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- CMakeLists.txt -+++ CMakeLists.txt -@@ -168,8 +168,12 @@ - endif (OPENIMAGEIO_FOUND) - - # Suitesparse --find_package(SuiteSparse REQUIRED) --if (SUITESPARSE_FOUND) -+find_package(CHOLMOD REQUIRED) -+find_package(UMFPACK REQUIRED) -+find_package(SuiteSparse_config REQUIRED) -+set(SUITESPARSE_LIBRARIES SuiteSparse::CHOLMOD SuiteSparse::UMFPACK) -+set(SUITESPARSE_VERSION SuiteSparse_config_VERSION) -+if (TRUE) - # On Ubuntu the system install of SuiteSparse (v3.4.0) up to at least - # Ubuntu 13.10 cannot be used to link shared libraries. - if (BUILD_SHARED_LIBS AND ---- cmake/TheiaConfig.cmake.in -+++ cmake/TheiaConfig.cmake.in -@@ -182,8 +182,13 @@ - endif (ROCKSDB_FOUND) - list(APPEND THEIA_INCLUDE_DIRS ${ROCKSDB_INCLUDE_DIRS}) - --find_package(SuiteSparse QUIET) --if (SUITESPARSE_FOUND) -+include(CMakeFindDependencyMacro) -+find_dependency(CHOLMOD REQUIRED) -+find_dependency(UMFPACK REQUIRED) -+find_dependency(SuiteSparse_config REQUIRED) -+set(SUITESPARSE_LIBRARIES SuiteSparse::CHOLMOD SuiteSparse::UMFPACK) -+set(SUITESPARSE_VERSION SuiteSparse_config_VERSION) -+if (TRUE) - # On Ubuntu the system install of SuiteSparse (v3.4.0) up to at least - # Ubuntu 13.10 cannot be used to link shared libraries. - if (BUILD_SHARED_LIBS AND diff --git a/ports/theia/vcpkg.json b/ports/theia/vcpkg.json index a2412e8e48d897..fd0a36b6cd1ffc 100644 --- a/ports/theia/vcpkg.json +++ b/ports/theia/vcpkg.json @@ -20,12 +20,7 @@ "platform": "!osx" }, "glew", - { - "name": "openimageio", - "features": [ - "viewer" - ] - }, + "openimageio", "suitesparse-cholmod", "suitesparse-umfpack", { From ef32e0426e4a5e9a7626ce651c6886747f27ccb8 Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Tue, 18 Jun 2024 10:28:55 +0300 Subject: [PATCH 45/95] [Theia] update vdb --- versions/t-/theia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/t-/theia.json b/versions/t-/theia.json index a1e6320faa51d3..fb1585fd9d7179 100644 --- a/versions/t-/theia.json +++ b/versions/t-/theia.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "2c41938e8f6d977bc7e78c711900979914600218", + "git-tree": "3588164d3fa43a79ed02cf4c6f69565d27996e83", "version": "0.8", "port-version": 11 }, From 5c4e3862227a7ea786ad8b40d947c31186d9544f Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Tue, 18 Jun 2024 14:58:11 +0300 Subject: [PATCH 46/95] [SuiteSparse] handle suitesparse_mongoose tool --- ports/suitesparse-mongoose/portfile.cmake | 5 +++++ ports/suitesparse-mongoose/vcpkg.json | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/ports/suitesparse-mongoose/portfile.cmake b/ports/suitesparse-mongoose/portfile.cmake index e27c2fe3670569..45f91d91fb27e1 100644 --- a/ports/suitesparse-mongoose/portfile.cmake +++ b/ports/suitesparse-mongoose/portfile.cmake @@ -27,6 +27,11 @@ vcpkg_cmake_config_fixup( ) vcpkg_fixup_pkgconfig() +vcpkg_copy_tools(TOOL_NAMES suitesparse_mongoose AUTO_CLEAN) +if (NOT "tools" IN_LIST FEATURES) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/tools") +endif() + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/Mongoose/Doc/License.txt") diff --git a/ports/suitesparse-mongoose/vcpkg.json b/ports/suitesparse-mongoose/vcpkg.json index 7556e05428d270..85d5dc85eed78e 100644 --- a/ports/suitesparse-mongoose/vcpkg.json +++ b/ports/suitesparse-mongoose/vcpkg.json @@ -14,5 +14,10 @@ "name": "vcpkg-cmake-config", "host": true } - ] + ], + "features": { + "tools": { + "description": "Build suitesparse_mongoose CLI tool" + } + } } From c6d996123d4fc8ff951479072754b8f622ea0a62 Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Tue, 18 Jun 2024 14:58:33 +0300 Subject: [PATCH 47/95] [SuiteSparse] update vdb --- versions/s-/suitesparse-mongoose.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/s-/suitesparse-mongoose.json b/versions/s-/suitesparse-mongoose.json index 3acff8108e2b00..6f8008d12f737e 100644 --- a/versions/s-/suitesparse-mongoose.json +++ b/versions/s-/suitesparse-mongoose.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "353f2faf1516790cb2ca4308d1c47e71acbec449", + "git-tree": "549b0667bb31a2002f3b085266afb175b4d45bcd", "version-semver": "3.3.3", "port-version": 0 } From ec23261e28545ddbed5921148b9e87133e5ad0e7 Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Tue, 18 Jun 2024 15:30:11 +0300 Subject: [PATCH 48/95] [SuiteSparse] fix GraphBLAS JIT cache dir handling --- ports/suitesparse-graphblas/portfile.cmake | 8 ++++++++ ports/suitesparse-graphblas/vcpkg.json | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ports/suitesparse-graphblas/portfile.cmake b/ports/suitesparse-graphblas/portfile.cmake index 27646591c042bf..ffff4c8d3b734e 100644 --- a/ports/suitesparse-graphblas/portfile.cmake +++ b/ports/suitesparse-graphblas/portfile.cmake @@ -14,6 +14,11 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS openmp GRAPHBLAS_USE_OPENMP ) +# Prevent JIT cache from being created at ~/.SuiteSparse by default. Only used during build. +# see https://github.com/DrTimothyAldenDavis/SuiteSparse/blob/v7.7.0/GraphBLAS/cmake_modules/GraphBLAS_JIT_paths.cmake +vcpkg_backup_env_variables(VARS GRAPHBLAS_CACHE_PATH) +set(ENV{GRAPHBLAS_CACHE_PATH} "${CURRENT_BUILDTREES_DIR}/cache") + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" DISABLE_PARALLEL_CONFIGURE @@ -23,11 +28,14 @@ vcpkg_cmake_configure( -DSUITESPARSE_USE_STRICT=ON -DSUITESPARSE_USE_FORTRAN=OFF -DSUITESPARSE_DEMOS=OFF + -DGRAPHBLAS_JIT_ENABLE_RELOCATE=ON ${FEATURE_OPTIONS} ) vcpkg_cmake_install() +vcpkg_restore_env_variables(VARS GRAPHBLAS_CACHE_PATH) + vcpkg_cmake_config_fixup( PACKAGE_NAME GraphBLAS CONFIG_PATH lib/cmake/GraphBLAS diff --git a/ports/suitesparse-graphblas/vcpkg.json b/ports/suitesparse-graphblas/vcpkg.json index 55dce3a6384908..16d6eb9611bc6d 100644 --- a/ports/suitesparse-graphblas/vcpkg.json +++ b/ports/suitesparse-graphblas/vcpkg.json @@ -19,7 +19,7 @@ ], "features": { "compact": { - "description": "Compile kernels at run-time, via JIT, instead of pre-compiling. Reduces library size and compile time by about 15x." + "description": "Compile kernels at run-time, via JIT, instead of pre-compiling. Reduces library size and compile time by about 15x. Set the JIT cache directory location using the GRAPHBLAS_CACHE_PATH env var at runtime." }, "openmp": { "description": "Enable OpenMP support" From a4ff7a598a926d3b31f24b1d0958df65d9e3bbaf Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Tue, 18 Jun 2024 15:30:29 +0300 Subject: [PATCH 49/95] [SuiteSparse] update vdb --- versions/s-/suitesparse-graphblas.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/s-/suitesparse-graphblas.json b/versions/s-/suitesparse-graphblas.json index 391484c8bf7c92..8cf75e23723acd 100644 --- a/versions/s-/suitesparse-graphblas.json +++ b/versions/s-/suitesparse-graphblas.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "42cb22f0bd460773c86a84e89d5dd454d834ef19", + "git-tree": "943efba27c37ebfb7af91b633277f13d50d3ea1a", "version-semver": "9.2.0", "port-version": 0 } From 4a1de073dd9f1f82c5e76a2dd847ed0246974323 Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Wed, 19 Jun 2024 10:41:30 +0300 Subject: [PATCH 50/95] [SuiteSparse] disable complex data types for ARM android --- ports/suitesparse-cxsparse/portfile.cmake | 6 ++++++ ports/suitesparse-cxsparse/vcpkg.json | 14 +++++++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/ports/suitesparse-cxsparse/portfile.cmake b/ports/suitesparse-cxsparse/portfile.cmake index e9a697146a71f7..c5b6233678c352 100644 --- a/ports/suitesparse-cxsparse/portfile.cmake +++ b/ports/suitesparse-cxsparse/portfile.cmake @@ -8,6 +8,11 @@ vcpkg_from_github( set(PACKAGE_NAME CXSparse) +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + complex CXSPARSE_USE_COMPLEX +) + string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC_LIBS) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}/${PACKAGE_NAME}" @@ -18,6 +23,7 @@ vcpkg_cmake_configure( -DSUITESPARSE_USE_STRICT=ON -DSUITESPARSE_USE_FORTRAN=OFF -DSUITESPARSE_DEMOS=OFF + ${FEATURE_OPTIONS} ) vcpkg_cmake_install() diff --git a/ports/suitesparse-cxsparse/vcpkg.json b/ports/suitesparse-cxsparse/vcpkg.json index 27d02a4b7b9ffd..8c26d57c6188dc 100644 --- a/ports/suitesparse-cxsparse/vcpkg.json +++ b/ports/suitesparse-cxsparse/vcpkg.json @@ -14,5 +14,17 @@ "name": "vcpkg-cmake-config", "host": true } - ] + ], + "default-features": [ + { + "name": "complex", + "platform": "!(android & arm)" + } + ], + "features": { + "complex": { + "description": "Enable complex data type support", + "supports": "!(android & arm)" + } + } } From 4491d50d2efb8294418352ca46f32a2a4bdfaa0f Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Thu, 20 Jun 2024 10:07:24 +0300 Subject: [PATCH 51/95] vdb --- versions/s-/suitesparse-cxsparse.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/s-/suitesparse-cxsparse.json b/versions/s-/suitesparse-cxsparse.json index 75c8fc104da065..2a773fa306f180 100644 --- a/versions/s-/suitesparse-cxsparse.json +++ b/versions/s-/suitesparse-cxsparse.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "8ed2420156f9fcbbee911fbdd4c54600d0a7fdaa", + "git-tree": "5d38d54a02da14d5a4000bdca3143f68164aad01", "version-semver": "4.4.0", "port-version": 0 } From 8db9b2910f6ba1169785d42fd65791ad7f2ee095 Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Tue, 16 Jul 2024 23:51:01 +0300 Subject: [PATCH 52/95] [suitesparse] fix BLAS linking on Windows --- ports/suitesparse-cholmod/portfile.cmake | 9 ++++++--- ports/suitesparse-config/SuiteSparseBLAS.cmake | 9 +++++++++ ports/suitesparse-config/portfile.cmake | 6 +++++- ports/suitesparse-spqr/portfile.cmake | 8 +++++--- 4 files changed, 25 insertions(+), 7 deletions(-) create mode 100644 ports/suitesparse-config/SuiteSparseBLAS.cmake diff --git a/ports/suitesparse-cholmod/portfile.cmake b/ports/suitesparse-cholmod/portfile.cmake index 0c62bced768754..e9b306a6412c34 100644 --- a/ports/suitesparse-cholmod/portfile.cmake +++ b/ports/suitesparse-cholmod/portfile.cmake @@ -8,9 +8,11 @@ vcpkg_from_github( set(PACKAGE_NAME CHOLMOD) -# Avoid overriding of BLA_VENDOR and skip straight to find_package() as done here -# https://github.com/DrTimothyAldenDavis/SuiteSparse/blob/v7.7.0/SuiteSparse_config/cmake_modules/SuiteSparseBLAS.cmake#L240-L245 -file(WRITE "${SOURCE_PATH}/SuiteSparse_config/cmake_modules/SuiteSparseBLAS.cmake" "find_package(BLAS REQUIRED)\nset(BLA_SIZEOF_INTEGER 4)\nset(SuiteSparse_BLAS_integer int32_t)\n") +configure_file( + "${CURRENT_INSTALLED_DIR}/share/SuiteSparse/SuiteSparseBLAS.cmake" + "${SOURCE_PATH}/SuiteSparse_config/cmake_modules/SuiteSparseBLAS.cmake" + COPYONLY +) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES @@ -49,6 +51,7 @@ vcpkg_cmake_configure( -DSUITESPARSE_USE_STRICT=ON -DSUITESPARSE_USE_FORTRAN=OFF -DSUITESPARSE_DEMOS=OFF + -DSUITESPARSE_USE_64BIT_BLAS=1 ${FEATURE_OPTIONS} ) diff --git a/ports/suitesparse-config/SuiteSparseBLAS.cmake b/ports/suitesparse-config/SuiteSparseBLAS.cmake new file mode 100644 index 00000000000000..7cd9522187f37f --- /dev/null +++ b/ports/suitesparse-config/SuiteSparseBLAS.cmake @@ -0,0 +1,9 @@ +find_package(BLAS REQUIRED) +set(BLA_SIZEOF_INTEGER 4) +set(SuiteSparse_BLAS_integer int32_t) + +if(WIN32) + # OpenBLAS includes an underscore suffix on Windows for all of its symbols. + # This is not detected automatically by SuiteSparse or FindBLAS and needs to be set manually. + add_compile_definitions(BLAS64__SUFFIX=_) +endif() diff --git a/ports/suitesparse-config/portfile.cmake b/ports/suitesparse-config/portfile.cmake index e880bfbc36a980..80908958162537 100644 --- a/ports/suitesparse-config/portfile.cmake +++ b/ports/suitesparse-config/portfile.cmake @@ -10,7 +10,11 @@ set(PACKAGE_NAME SuiteSparse_config) # Avoid overriding of BLA_VENDOR and skip straight to find_package() as done here # https://github.com/DrTimothyAldenDavis/SuiteSparse/blob/v7.7.0/SuiteSparse_config/cmake_modules/SuiteSparseBLAS.cmake#L240-L245 -file(WRITE "${SOURCE_PATH}/SuiteSparse_config/cmake_modules/SuiteSparseBLAS.cmake" "find_package(BLAS REQUIRED)\nset(BLA_SIZEOF_INTEGER 4)\nset(SuiteSparse_BLAS_integer int32_t)\n") +configure_file( + "${CMAKE_CURRENT_LIST_DIR}/SuiteSparseBLAS.cmake" + "${SOURCE_PATH}/SuiteSparse_config/cmake_modules/SuiteSparseBLAS.cmake" + COPYONLY +) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC_LIBS) diff --git a/ports/suitesparse-spqr/portfile.cmake b/ports/suitesparse-spqr/portfile.cmake index f1c402817335cf..d96b06fd4204bd 100644 --- a/ports/suitesparse-spqr/portfile.cmake +++ b/ports/suitesparse-spqr/portfile.cmake @@ -8,9 +8,11 @@ vcpkg_from_github( set(PACKAGE_NAME SPQR) -# Avoid overriding of BLA_VENDOR and skip straight to find_package() as done here -# https://github.com/DrTimothyAldenDavis/SuiteSparse/blob/v7.7.0/SuiteSparse_config/cmake_modules/SuiteSparseBLAS.cmake#L240-L245 -file(WRITE "${SOURCE_PATH}/SuiteSparse_config/cmake_modules/SuiteSparseBLAS.cmake" "find_package(BLAS REQUIRED)\nset(BLA_SIZEOF_INTEGER 4)\nset(SuiteSparse_BLAS_integer int32_t)\n") +configure_file( + "${CURRENT_INSTALLED_DIR}/share/SuiteSparse/SuiteSparseBLAS.cmake" + "${SOURCE_PATH}/SuiteSparse_config/cmake_modules/SuiteSparseBLAS.cmake" + COPYONLY +) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC_LIBS) From caec19c8e9fd27467ed4311801e843750ba4ffe0 Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Wed, 17 Jul 2024 00:09:29 +0300 Subject: [PATCH 53/95] [suitesparse-cxsparse] complex is not available on MSVC --- ports/suitesparse-cxsparse/vcpkg.json | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/ports/suitesparse-cxsparse/vcpkg.json b/ports/suitesparse-cxsparse/vcpkg.json index 8c26d57c6188dc..686ea4d896aa74 100644 --- a/ports/suitesparse-cxsparse/vcpkg.json +++ b/ports/suitesparse-cxsparse/vcpkg.json @@ -18,13 +18,12 @@ "default-features": [ { "name": "complex", - "platform": "!(android & arm)" + "platform": "!(android & arm) & !uwp & !windows" } ], "features": { "complex": { - "description": "Enable complex data type support", - "supports": "!(android & arm)" + "description": "Enable complex data type support" } } } From 29cdfc8131b40304b0ae22856790022a9c2cef12 Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Wed, 17 Jul 2024 00:31:52 +0300 Subject: [PATCH 54/95] [suitesparse] fix BLAS linking in components using it transitively --- ports/suitesparse-klu/portfile.cmake | 6 ++++++ ports/suitesparse-paru/portfile.cmake | 6 ++++++ ports/suitesparse-umfpack/portfile.cmake | 6 ++++++ 3 files changed, 18 insertions(+) diff --git a/ports/suitesparse-klu/portfile.cmake b/ports/suitesparse-klu/portfile.cmake index dfa8f10084dd1e..274c7b0672184a 100644 --- a/ports/suitesparse-klu/portfile.cmake +++ b/ports/suitesparse-klu/portfile.cmake @@ -8,6 +8,12 @@ vcpkg_from_github( set(PACKAGE_NAME KLU) +configure_file( + "${CURRENT_INSTALLED_DIR}/share/SuiteSparse/SuiteSparseBLAS.cmake" + "${SOURCE_PATH}/SuiteSparse_config/cmake_modules/SuiteSparseBLAS.cmake" + COPYONLY +) + vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES cholmod KLU_USE_CHOLMOD diff --git a/ports/suitesparse-paru/portfile.cmake b/ports/suitesparse-paru/portfile.cmake index a135062a57377c..9bb7bf08dc29e4 100644 --- a/ports/suitesparse-paru/portfile.cmake +++ b/ports/suitesparse-paru/portfile.cmake @@ -10,6 +10,12 @@ vcpkg_from_github( set(PACKAGE_NAME ParU) +configure_file( + "${CURRENT_INSTALLED_DIR}/share/SuiteSparse/SuiteSparseBLAS.cmake" + "${SOURCE_PATH}/SuiteSparse_config/cmake_modules/SuiteSparseBLAS.cmake" + COPYONLY +) + string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC_LIBS) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/suitesparse-umfpack/portfile.cmake b/ports/suitesparse-umfpack/portfile.cmake index 8d9881c721e7b7..0f6a4464fa9722 100644 --- a/ports/suitesparse-umfpack/portfile.cmake +++ b/ports/suitesparse-umfpack/portfile.cmake @@ -8,6 +8,12 @@ vcpkg_from_github( set(PACKAGE_NAME UMFPACK) +configure_file( + "${CURRENT_INSTALLED_DIR}/share/SuiteSparse/SuiteSparseBLAS.cmake" + "${SOURCE_PATH}/SuiteSparse_config/cmake_modules/SuiteSparseBLAS.cmake" + COPYONLY +) + vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES cholmod UMFPACK_USE_CHOLMOD From 2325caef8f3b41dffedd8772d8d54ca758fae4e1 Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Wed, 17 Jul 2024 00:32:14 +0300 Subject: [PATCH 55/95] vdb --- versions/s-/suitesparse-cholmod.json | 2 +- versions/s-/suitesparse-config.json | 2 +- versions/s-/suitesparse-cxsparse.json | 2 +- versions/s-/suitesparse-klu.json | 2 +- versions/s-/suitesparse-paru.json | 2 +- versions/s-/suitesparse-spqr.json | 2 +- versions/s-/suitesparse-umfpack.json | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/versions/s-/suitesparse-cholmod.json b/versions/s-/suitesparse-cholmod.json index 6ff73e77717c0c..d4a84db585186d 100644 --- a/versions/s-/suitesparse-cholmod.json +++ b/versions/s-/suitesparse-cholmod.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "cddaa587403e37f0a1193f0ee3e96b3f6da9bfe2", + "git-tree": "f982279021c431d2905fedfdab9e51e4cafcf257", "version-semver": "5.2.1", "port-version": 0 } diff --git a/versions/s-/suitesparse-config.json b/versions/s-/suitesparse-config.json index 68f2f934de1153..61007a2fc774ca 100644 --- a/versions/s-/suitesparse-config.json +++ b/versions/s-/suitesparse-config.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "26262a5f8296b1227a70c05d2d94df52e01ff3ad", + "git-tree": "2b3dc0fe01cf40952e1d79e3f6394697d3c7f0b4", "version-semver": "7.7.0", "port-version": 0 } diff --git a/versions/s-/suitesparse-cxsparse.json b/versions/s-/suitesparse-cxsparse.json index 2a773fa306f180..966bc39aaa506c 100644 --- a/versions/s-/suitesparse-cxsparse.json +++ b/versions/s-/suitesparse-cxsparse.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "5d38d54a02da14d5a4000bdca3143f68164aad01", + "git-tree": "cc28c536304de0480bd6f72319adf2514e100170", "version-semver": "4.4.0", "port-version": 0 } diff --git a/versions/s-/suitesparse-klu.json b/versions/s-/suitesparse-klu.json index 4c43f3f2edd8b1..5da75968660c46 100644 --- a/versions/s-/suitesparse-klu.json +++ b/versions/s-/suitesparse-klu.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "ad3c97e33a141b79a0bb4d95b4cd9d6a979f8263", + "git-tree": "cefc776187a204dbcb507a6b19beb5b6e97bf4cb", "version-semver": "2.3.3", "port-version": 0 } diff --git a/versions/s-/suitesparse-paru.json b/versions/s-/suitesparse-paru.json index 358ef886b91dd2..10c50a980bf5ea 100644 --- a/versions/s-/suitesparse-paru.json +++ b/versions/s-/suitesparse-paru.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "2d0801bf8728c26481d0a1cfbcc6a331fbc2be13", + "git-tree": "abcf67bd9db1a16653d0b69a06f72ffb700d9add", "version-semver": "0.1.3", "port-version": 0 } diff --git a/versions/s-/suitesparse-spqr.json b/versions/s-/suitesparse-spqr.json index c2c7df84077bc7..c8328ac8d8753b 100644 --- a/versions/s-/suitesparse-spqr.json +++ b/versions/s-/suitesparse-spqr.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "ff8e4cfa714edffd5fda753858f4624a6ff1ec42", + "git-tree": "04a37880d76b9380ac04926dcdad6e26f37db19d", "version-semver": "4.3.3", "port-version": 0 } diff --git a/versions/s-/suitesparse-umfpack.json b/versions/s-/suitesparse-umfpack.json index 0d32a9677d5ec8..376f5729b247a2 100644 --- a/versions/s-/suitesparse-umfpack.json +++ b/versions/s-/suitesparse-umfpack.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "6b1015cf74a7cbe3b0f1db003dd85fe7663f9301", + "git-tree": "61a678b7d755ca86a0038731c0f834942bba0044", "version-semver": "6.3.3", "port-version": 0 } From df5876bfdcb979eaeccb8d0bb02057f1edd650ea Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Wed, 17 Jul 2024 10:44:12 +0300 Subject: [PATCH 56/95] [suitesparse-graphblas] disable on android GrpahBLAS has a strict requirement for complex math support, which Android NDK seems to lack. --- ports/suitesparse-graphblas/vcpkg.json | 1 + ports/suitesparse/vcpkg.json | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ports/suitesparse-graphblas/vcpkg.json b/ports/suitesparse-graphblas/vcpkg.json index 16d6eb9611bc6d..b1331f029e2f57 100644 --- a/ports/suitesparse-graphblas/vcpkg.json +++ b/ports/suitesparse-graphblas/vcpkg.json @@ -4,6 +4,7 @@ "description": "SuiteSparse:GraphBLAS: graph algorithms in the language of linear algebra", "homepage": "https://people.engr.tamu.edu/davis/GraphBLAS.html", "license": "Apache-2.0", + "supports": "!android", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/ports/suitesparse/vcpkg.json b/ports/suitesparse/vcpkg.json index 25397bf9d6ea75..45485d2a2c53f6 100644 --- a/ports/suitesparse/vcpkg.json +++ b/ports/suitesparse/vcpkg.json @@ -13,7 +13,10 @@ "suitesparse-colamd", "suitesparse-config", "suitesparse-cxsparse", - "suitesparse-graphblas", + { + "name": "suitesparse-graphblas", + "platform": "!android" + }, "suitesparse-klu", "suitesparse-lagraph", "suitesparse-ldl", From a7271b8a88318b5ebb9671bf87b1b6a53c8826a5 Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Wed, 17 Jul 2024 10:44:37 +0300 Subject: [PATCH 57/95] vdb --- versions/s-/suitesparse-graphblas.json | 2 +- versions/s-/suitesparse.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/versions/s-/suitesparse-graphblas.json b/versions/s-/suitesparse-graphblas.json index 8cf75e23723acd..b471ac26a37e31 100644 --- a/versions/s-/suitesparse-graphblas.json +++ b/versions/s-/suitesparse-graphblas.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "943efba27c37ebfb7af91b633277f13d50d3ea1a", + "git-tree": "37722eaf589508dff2901ff09c4100097d6802ea", "version-semver": "9.2.0", "port-version": 0 } diff --git a/versions/s-/suitesparse.json b/versions/s-/suitesparse.json index 64c0da33eb87a7..ef0edc26a0a336 100644 --- a/versions/s-/suitesparse.json +++ b/versions/s-/suitesparse.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "20a7e6e9bb0475414244a063ed4dc5b623945a7f", + "git-tree": "7e5ae24c0cfa5ad14d13025716b528961e2ebad5", "version-semver": "7.7.0", "port-version": 0 }, From 310023a423db13d986488014b595972d97df7e62 Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Fri, 19 Jul 2024 18:35:02 +0300 Subject: [PATCH 58/95] [suitesparse-paru] MSVC OpenMP is not compatible (v2.0 < required v4.5) --- ports/suitesparse-paru/vcpkg.json | 3 ++- ports/suitesparse/vcpkg.json | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ports/suitesparse-paru/vcpkg.json b/ports/suitesparse-paru/vcpkg.json index b31e348262a8b4..4b652c89b4a62e 100644 --- a/ports/suitesparse-paru/vcpkg.json +++ b/ports/suitesparse-paru/vcpkg.json @@ -27,7 +27,8 @@ "openmp" ] } - ] + ], + "supports": "!windows" } } } diff --git a/ports/suitesparse/vcpkg.json b/ports/suitesparse/vcpkg.json index 45485d2a2c53f6..242b18fd8b1388 100644 --- a/ports/suitesparse/vcpkg.json +++ b/ports/suitesparse/vcpkg.json @@ -109,7 +109,8 @@ "name": "suitesparse-paru", "features": [ "openmp" - ] + ], + "platform": "!windows" }, { "name": "suitesparse-spex", From 1aaf2fa0411cb85ee4dab8204d6dfe67336776a8 Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Fri, 19 Jul 2024 18:37:17 +0300 Subject: [PATCH 59/95] [suitesparse-cxsparse] strictly disable 'complex' on Windows --- ports/suitesparse-cxsparse/vcpkg.json | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/ports/suitesparse-cxsparse/vcpkg.json b/ports/suitesparse-cxsparse/vcpkg.json index 686ea4d896aa74..13c630abd4db50 100644 --- a/ports/suitesparse-cxsparse/vcpkg.json +++ b/ports/suitesparse-cxsparse/vcpkg.json @@ -16,14 +16,12 @@ } ], "default-features": [ - { - "name": "complex", - "platform": "!(android & arm) & !uwp & !windows" - } + "complex" ], "features": { "complex": { - "description": "Enable complex data type support" + "description": "Enable complex data type support", + "supports": "!windows & !(android & arm)" } } } From c8ec71da2d62073031624687f7a7a9692e5a6a45 Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Fri, 19 Jul 2024 18:42:32 +0300 Subject: [PATCH 60/95] [suitesparse] disable CUDA feature on Windows Don't have a good enough setup to debug this configuration currently. Works locally on Linux, though. --- ports/suitesparse-cholmod/vcpkg.json | 6 ++++-- ports/suitesparse-spqr/vcpkg.json | 6 ++++-- ports/suitesparse/vcpkg.json | 6 ++++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/ports/suitesparse-cholmod/vcpkg.json b/ports/suitesparse-cholmod/vcpkg.json index c665852c34defd..abf1d0a765c86c 100644 --- a/ports/suitesparse-cholmod/vcpkg.json +++ b/ports/suitesparse-cholmod/vcpkg.json @@ -28,14 +28,16 @@ "license": "GPL-2.0-or-later AND LGPL-2.1-or-later AND Apache-2.0", "dependencies": [ "cuda" - ] + ], + "supports": "(linux & x64) | (linux & arm64)" }, "cuda-redist": { "description": "Enable CUDA support for all major compute architectures", "license": "GPL-2.0-or-later AND LGPL-2.1-or-later AND Apache-2.0", "dependencies": [ "cuda" - ] + ], + "supports": "(linux & x64) | (linux & arm64)" }, "matrixops": { "description": "Build MatrixOps module", diff --git a/ports/suitesparse-spqr/vcpkg.json b/ports/suitesparse-spqr/vcpkg.json index 411af6c297e3d4..6665df15a9220d 100644 --- a/ports/suitesparse-spqr/vcpkg.json +++ b/ports/suitesparse-spqr/vcpkg.json @@ -22,13 +22,15 @@ "description": "Enable CUDA support for the current compute architecture of this machine", "dependencies": [ "cuda" - ] + ], + "supports": "(linux & x64) | (linux & arm64)" }, "cuda-redist": { "description": "Enable CUDA support for all major compute architectures", "dependencies": [ "cuda" - ] + ], + "supports": "(linux & x64) | (linux & arm64)" } } } diff --git a/ports/suitesparse/vcpkg.json b/ports/suitesparse/vcpkg.json index 242b18fd8b1388..4ae65a9cffa538 100644 --- a/ports/suitesparse/vcpkg.json +++ b/ports/suitesparse/vcpkg.json @@ -41,7 +41,8 @@ "cuda" ] } - ] + ], + "supports": "(linux & x64) | (linux & arm64)" }, "cuda-redist": { "description": "Enable CUDA support for all major compute architectures", @@ -58,7 +59,8 @@ "cuda-redist" ] } - ] + ], + "supports": "(linux & x64) | (linux & arm64)" }, "gpl": { "description": "Enable GPL-licensed packages", From 370b36d6dbd358196524202384c257ad9d0387ee Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Fri, 19 Jul 2024 18:48:33 +0300 Subject: [PATCH 61/95] [suitesparse-graphblas] disable x86 Windows unresolved external symbol __InterlockedOr64 --- ports/suitesparse-graphblas/vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/suitesparse-graphblas/vcpkg.json b/ports/suitesparse-graphblas/vcpkg.json index b1331f029e2f57..0885397a4c4e10 100644 --- a/ports/suitesparse-graphblas/vcpkg.json +++ b/ports/suitesparse-graphblas/vcpkg.json @@ -4,7 +4,7 @@ "description": "SuiteSparse:GraphBLAS: graph algorithms in the language of linear algebra", "homepage": "https://people.engr.tamu.edu/davis/GraphBLAS.html", "license": "Apache-2.0", - "supports": "!android", + "supports": "!android & !(windows & x86)", "dependencies": [ { "name": "vcpkg-cmake", From 451db263db64e97f3d77e4daa2f13e1a89469c99 Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Fri, 19 Jul 2024 18:59:55 +0300 Subject: [PATCH 62/95] [suitesparse] fix vcpkg.json formatting --- ports/suitesparse-cholmod/vcpkg.json | 8 ++++---- ports/suitesparse-paru/vcpkg.json | 4 ++-- ports/suitesparse-spqr/vcpkg.json | 8 ++++---- ports/suitesparse/vcpkg.json | 8 ++++---- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/ports/suitesparse-cholmod/vcpkg.json b/ports/suitesparse-cholmod/vcpkg.json index abf1d0a765c86c..9f661f72a53c5d 100644 --- a/ports/suitesparse-cholmod/vcpkg.json +++ b/ports/suitesparse-cholmod/vcpkg.json @@ -25,19 +25,19 @@ "features": { "cuda": { "description": "Enable CUDA support for the current compute architecture of this machine", + "supports": "(linux & x64) | (linux & arm64)", "license": "GPL-2.0-or-later AND LGPL-2.1-or-later AND Apache-2.0", "dependencies": [ "cuda" - ], - "supports": "(linux & x64) | (linux & arm64)" + ] }, "cuda-redist": { "description": "Enable CUDA support for all major compute architectures", + "supports": "(linux & x64) | (linux & arm64)", "license": "GPL-2.0-or-later AND LGPL-2.1-or-later AND Apache-2.0", "dependencies": [ "cuda" - ], - "supports": "(linux & x64) | (linux & arm64)" + ] }, "matrixops": { "description": "Build MatrixOps module", diff --git a/ports/suitesparse-paru/vcpkg.json b/ports/suitesparse-paru/vcpkg.json index 4b652c89b4a62e..51a590b6411d20 100644 --- a/ports/suitesparse-paru/vcpkg.json +++ b/ports/suitesparse-paru/vcpkg.json @@ -20,6 +20,7 @@ "features": { "openmp": { "description": "Enable OpenMP support", + "supports": "!windows", "dependencies": [ { "name": "suitesparse-config", @@ -27,8 +28,7 @@ "openmp" ] } - ], - "supports": "!windows" + ] } } } diff --git a/ports/suitesparse-spqr/vcpkg.json b/ports/suitesparse-spqr/vcpkg.json index 6665df15a9220d..4e648538d6b7e8 100644 --- a/ports/suitesparse-spqr/vcpkg.json +++ b/ports/suitesparse-spqr/vcpkg.json @@ -20,17 +20,17 @@ "features": { "cuda": { "description": "Enable CUDA support for the current compute architecture of this machine", + "supports": "(linux & x64) | (linux & arm64)", "dependencies": [ "cuda" - ], - "supports": "(linux & x64) | (linux & arm64)" + ] }, "cuda-redist": { "description": "Enable CUDA support for all major compute architectures", + "supports": "(linux & x64) | (linux & arm64)", "dependencies": [ "cuda" - ], - "supports": "(linux & x64) | (linux & arm64)" + ] } } } diff --git a/ports/suitesparse/vcpkg.json b/ports/suitesparse/vcpkg.json index 4ae65a9cffa538..98834189aa89c1 100644 --- a/ports/suitesparse/vcpkg.json +++ b/ports/suitesparse/vcpkg.json @@ -28,6 +28,7 @@ "features": { "cuda": { "description": "Enable CUDA support for the current compute architecture of this machine", + "supports": "(linux & x64) | (linux & arm64)", "dependencies": [ { "name": "suitesparse-cholmod", @@ -41,11 +42,11 @@ "cuda" ] } - ], - "supports": "(linux & x64) | (linux & arm64)" + ] }, "cuda-redist": { "description": "Enable CUDA support for all major compute architectures", + "supports": "(linux & x64) | (linux & arm64)", "dependencies": [ { "name": "suitesparse-cholmod", @@ -59,8 +60,7 @@ "cuda-redist" ] } - ], - "supports": "(linux & x64) | (linux & arm64)" + ] }, "gpl": { "description": "Enable GPL-licensed packages", From 01fd771cf3879b8425401d432f489f31a23e2ce2 Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Fri, 19 Jul 2024 19:00:05 +0300 Subject: [PATCH 63/95] vdb --- versions/s-/suitesparse-cholmod.json | 2 +- versions/s-/suitesparse-cxsparse.json | 2 +- versions/s-/suitesparse-graphblas.json | 2 +- versions/s-/suitesparse-paru.json | 2 +- versions/s-/suitesparse-spqr.json | 2 +- versions/s-/suitesparse.json | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/versions/s-/suitesparse-cholmod.json b/versions/s-/suitesparse-cholmod.json index d4a84db585186d..f0aa9dce2cbaed 100644 --- a/versions/s-/suitesparse-cholmod.json +++ b/versions/s-/suitesparse-cholmod.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "f982279021c431d2905fedfdab9e51e4cafcf257", + "git-tree": "e3cca18f2453d6bd7bb9a8c4c1f43a0c58928e12", "version-semver": "5.2.1", "port-version": 0 } diff --git a/versions/s-/suitesparse-cxsparse.json b/versions/s-/suitesparse-cxsparse.json index 966bc39aaa506c..50538b11e1c2d6 100644 --- a/versions/s-/suitesparse-cxsparse.json +++ b/versions/s-/suitesparse-cxsparse.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "cc28c536304de0480bd6f72319adf2514e100170", + "git-tree": "1f5b910ae55e30665f4f131dbb81f149632666d9", "version-semver": "4.4.0", "port-version": 0 } diff --git a/versions/s-/suitesparse-graphblas.json b/versions/s-/suitesparse-graphblas.json index b471ac26a37e31..8e68cad7631f41 100644 --- a/versions/s-/suitesparse-graphblas.json +++ b/versions/s-/suitesparse-graphblas.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "37722eaf589508dff2901ff09c4100097d6802ea", + "git-tree": "9a18de0f99506a9d3a4ad8563a170b71b6a151b0", "version-semver": "9.2.0", "port-version": 0 } diff --git a/versions/s-/suitesparse-paru.json b/versions/s-/suitesparse-paru.json index 10c50a980bf5ea..99a803629d5033 100644 --- a/versions/s-/suitesparse-paru.json +++ b/versions/s-/suitesparse-paru.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "abcf67bd9db1a16653d0b69a06f72ffb700d9add", + "git-tree": "af3341a29d02885778dffc0822c85509f0775016", "version-semver": "0.1.3", "port-version": 0 } diff --git a/versions/s-/suitesparse-spqr.json b/versions/s-/suitesparse-spqr.json index c8328ac8d8753b..527a4112c8c9b9 100644 --- a/versions/s-/suitesparse-spqr.json +++ b/versions/s-/suitesparse-spqr.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "04a37880d76b9380ac04926dcdad6e26f37db19d", + "git-tree": "8cfbdc8da748464cb9910113bd83fee0ebe27e08", "version-semver": "4.3.3", "port-version": 0 } diff --git a/versions/s-/suitesparse.json b/versions/s-/suitesparse.json index ef0edc26a0a336..51675b352ea624 100644 --- a/versions/s-/suitesparse.json +++ b/versions/s-/suitesparse.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "7e5ae24c0cfa5ad14d13025716b528961e2ebad5", + "git-tree": "dd10746ba0e85d0c0191d8493f5de413df6f711d", "version-semver": "7.7.0", "port-version": 0 }, From f76d0b17b29b07995d16423adb97ecb11ce0568e Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Sun, 21 Jul 2024 01:26:43 +0300 Subject: [PATCH 64/95] [suitesparse-cxsparse] don't enable 'complex' on Windows --- ports/suitesparse-cxsparse/vcpkg.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ports/suitesparse-cxsparse/vcpkg.json b/ports/suitesparse-cxsparse/vcpkg.json index 13c630abd4db50..e511287bbc9494 100644 --- a/ports/suitesparse-cxsparse/vcpkg.json +++ b/ports/suitesparse-cxsparse/vcpkg.json @@ -16,7 +16,10 @@ } ], "default-features": [ - "complex" + { + "name": "complex", + "platform": "!windows & !(android & arm)" + } ], "features": { "complex": { From 64819b0a98a4770ec068e304e8e38e028e9cd860 Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Sun, 21 Jul 2024 01:28:38 +0300 Subject: [PATCH 65/95] [suitesparse] fix 'cuda' feature support 'matrixops' feature is required in CHOLMOD and SPQR was not packaging two CMake config files correctly --- ports/suitesparse-cholmod/vcpkg.json | 17 +++++++++++++---- ports/suitesparse-spqr/portfile.cmake | 12 ++++++++++++ ports/suitesparse-spqr/vcpkg.json | 9 ++++++--- ports/suitesparse/vcpkg.json | 8 ++++++-- 4 files changed, 37 insertions(+), 9 deletions(-) diff --git a/ports/suitesparse-cholmod/vcpkg.json b/ports/suitesparse-cholmod/vcpkg.json index 9f661f72a53c5d..77af29429a8dd0 100644 --- a/ports/suitesparse-cholmod/vcpkg.json +++ b/ports/suitesparse-cholmod/vcpkg.json @@ -25,18 +25,27 @@ "features": { "cuda": { "description": "Enable CUDA support for the current compute architecture of this machine", - "supports": "(linux & x64) | (linux & arm64)", "license": "GPL-2.0-or-later AND LGPL-2.1-or-later AND Apache-2.0", "dependencies": [ - "cuda" + "cuda", + { + "name": "suitesparse-cholmod", + "features": [ + "matrixops" + ] + } ] }, "cuda-redist": { "description": "Enable CUDA support for all major compute architectures", - "supports": "(linux & x64) | (linux & arm64)", "license": "GPL-2.0-or-later AND LGPL-2.1-or-later AND Apache-2.0", "dependencies": [ - "cuda" + { + "name": "suitesparse-cholmod", + "features": [ + "cuda" + ] + } ] }, "matrixops": { diff --git a/ports/suitesparse-spqr/portfile.cmake b/ports/suitesparse-spqr/portfile.cmake index d96b06fd4204bd..ac2ef2755e0561 100644 --- a/ports/suitesparse-spqr/portfile.cmake +++ b/ports/suitesparse-spqr/portfile.cmake @@ -41,6 +41,18 @@ vcpkg_cmake_configure( vcpkg_cmake_install() +if("cuda" IN_LIST FEATURES) + vcpkg_cmake_config_fixup( + PACKAGE_NAME SuiteSparse_GPURuntime + CONFIG_PATH lib/cmake/SuiteSparse_GPURuntime + DO_NOT_DELETE_PARENT_CONFIG_PATH + ) + vcpkg_cmake_config_fixup( + PACKAGE_NAME GPUQREngine + CONFIG_PATH lib/cmake/GPUQREngine + DO_NOT_DELETE_PARENT_CONFIG_PATH + ) +endif() vcpkg_cmake_config_fixup( PACKAGE_NAME ${PACKAGE_NAME} CONFIG_PATH lib/cmake/${PACKAGE_NAME} diff --git a/ports/suitesparse-spqr/vcpkg.json b/ports/suitesparse-spqr/vcpkg.json index 4e648538d6b7e8..55704033eac969 100644 --- a/ports/suitesparse-spqr/vcpkg.json +++ b/ports/suitesparse-spqr/vcpkg.json @@ -20,16 +20,19 @@ "features": { "cuda": { "description": "Enable CUDA support for the current compute architecture of this machine", - "supports": "(linux & x64) | (linux & arm64)", "dependencies": [ "cuda" ] }, "cuda-redist": { "description": "Enable CUDA support for all major compute architectures", - "supports": "(linux & x64) | (linux & arm64)", "dependencies": [ - "cuda" + { + "name": "suitesparse-spqr", + "features": [ + "cuda" + ] + } ] } } diff --git a/ports/suitesparse/vcpkg.json b/ports/suitesparse/vcpkg.json index 98834189aa89c1..67bca12d6510fe 100644 --- a/ports/suitesparse/vcpkg.json +++ b/ports/suitesparse/vcpkg.json @@ -28,7 +28,6 @@ "features": { "cuda": { "description": "Enable CUDA support for the current compute architecture of this machine", - "supports": "(linux & x64) | (linux & arm64)", "dependencies": [ { "name": "suitesparse-cholmod", @@ -46,8 +45,13 @@ }, "cuda-redist": { "description": "Enable CUDA support for all major compute architectures", - "supports": "(linux & x64) | (linux & arm64)", "dependencies": [ + { + "name": "suitesparse", + "features": [ + "cuda" + ] + }, { "name": "suitesparse-cholmod", "features": [ From 672661d72c3e139e91c4234c9a91c027cbd9562a Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Sun, 21 Jul 2024 01:33:43 +0300 Subject: [PATCH 66/95] vdb --- versions/s-/suitesparse-cholmod.json | 2 +- versions/s-/suitesparse-cxsparse.json | 2 +- versions/s-/suitesparse-spqr.json | 2 +- versions/s-/suitesparse.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/versions/s-/suitesparse-cholmod.json b/versions/s-/suitesparse-cholmod.json index f0aa9dce2cbaed..b5c21e0db01728 100644 --- a/versions/s-/suitesparse-cholmod.json +++ b/versions/s-/suitesparse-cholmod.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "e3cca18f2453d6bd7bb9a8c4c1f43a0c58928e12", + "git-tree": "e2646c5ac7943b8337a5d869b7029cc30d22a730", "version-semver": "5.2.1", "port-version": 0 } diff --git a/versions/s-/suitesparse-cxsparse.json b/versions/s-/suitesparse-cxsparse.json index 50538b11e1c2d6..0be21419471485 100644 --- a/versions/s-/suitesparse-cxsparse.json +++ b/versions/s-/suitesparse-cxsparse.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "1f5b910ae55e30665f4f131dbb81f149632666d9", + "git-tree": "5d2378f57e348d516161e024b682a26de46ca60f", "version-semver": "4.4.0", "port-version": 0 } diff --git a/versions/s-/suitesparse-spqr.json b/versions/s-/suitesparse-spqr.json index 527a4112c8c9b9..ae42b7b297b6d1 100644 --- a/versions/s-/suitesparse-spqr.json +++ b/versions/s-/suitesparse-spqr.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "8cfbdc8da748464cb9910113bd83fee0ebe27e08", + "git-tree": "14dc9a5af5010fd5c9e0cf33c98858190f91c7dc", "version-semver": "4.3.3", "port-version": 0 } diff --git a/versions/s-/suitesparse.json b/versions/s-/suitesparse.json index 51675b352ea624..e3b8f7b22f7d36 100644 --- a/versions/s-/suitesparse.json +++ b/versions/s-/suitesparse.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "dd10746ba0e85d0c0191d8493f5de413df6f711d", + "git-tree": "4d0cde637ea49691c1e3c6746e584f1f12dd3a0e", "version-semver": "7.7.0", "port-version": 0 }, From fdfddc844593061ac63ceba969742ca987d1c5fc Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Sun, 21 Jul 2024 02:18:07 +0300 Subject: [PATCH 67/95] [colmap] add a missing METIS dependency Used to be provided transitively by SuiteSparse before. --- ports/colmap/vcpkg.json | 1 + 1 file changed, 1 insertion(+) diff --git a/ports/colmap/vcpkg.json b/ports/colmap/vcpkg.json index b2782ad4de192a..89a14f71871e14 100644 --- a/ports/colmap/vcpkg.json +++ b/ports/colmap/vcpkg.json @@ -25,6 +25,7 @@ "gflags", "glew", "glog", + "metis", "qt5-base", "sqlite3", { From 5c539dde78224fb8b94d7bcd5906baa595606cc0 Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Sun, 21 Jul 2024 02:18:33 +0300 Subject: [PATCH 68/95] vdb --- versions/c-/colmap.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/c-/colmap.json b/versions/c-/colmap.json index a42df42c08badb..c0760777808ee7 100644 --- a/versions/c-/colmap.json +++ b/versions/c-/colmap.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "baca06856960d0b705e668bc376b84ebf565e3ce", + "git-tree": "ea8648434951744f9814fdff9a9eebff193c62bf", "version": "3.9.1", "port-version": 0 }, From dcf89d55e6ba1f543ddbb1af175527cad33f5a8b Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Fri, 26 Jul 2024 14:30:19 +0300 Subject: [PATCH 69/95] [suitesparse-graphblas] add x86-windows to ci.baseline.txt --- scripts/ci.baseline.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index f90d814bb03cec..6c144346b7764a 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1160,6 +1160,8 @@ stxxl:x86-windows=skip stxxl:x64-windows=skip stxxl:x64-windows-static=skip stxxl:x64-windows-static-md=skip +# _Interlocked* intrinsic functions are not available on x86 +suitesparse-graphblas:x86-windows=fail systemc:arm64-windows=fail systemc:arm64-uwp=fail systemc:x64-uwp=fail From dca3134afe5cae4b363cb9d9aa79a6062e5c0ddc Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Sat, 27 Jul 2024 15:53:42 +0300 Subject: [PATCH 70/95] Bump port-versions --- ports/ceres/vcpkg.json | 2 +- ports/colmap/vcpkg.json | 1 + ports/g2o/vcpkg.json | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ports/ceres/vcpkg.json b/ports/ceres/vcpkg.json index d4981a554b5f46..c71e304156da23 100644 --- a/ports/ceres/vcpkg.json +++ b/ports/ceres/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ceres", "version": "2.1.0", - "port-version": 5, + "port-version": 6, "description": "non-linear optimization package", "homepage": "https://github.com/ceres-solver/ceres-solver", "license": "Apache-2.0", diff --git a/ports/colmap/vcpkg.json b/ports/colmap/vcpkg.json index 89a14f71871e14..6634dc3b881d32 100644 --- a/ports/colmap/vcpkg.json +++ b/ports/colmap/vcpkg.json @@ -1,6 +1,7 @@ { "name": "colmap", "version": "3.9.1", + "port-version": 1, "description": "COLMAP is a general-purpose Structure-from-Motion (SfM) and Multi-View Stereo (MVS) pipeline with a graphical and command-line interface. It offers a wide range of features for reconstruction of ordered and unordered image collections. The software is licensed under the new BSD license.", "homepage": "https://colmap.github.io/", "license": "BSD-3-Clause", diff --git a/ports/g2o/vcpkg.json b/ports/g2o/vcpkg.json index 0d03229fc46bbf..1dbb6dd3b08eca 100644 --- a/ports/g2o/vcpkg.json +++ b/ports/g2o/vcpkg.json @@ -1,7 +1,7 @@ { "name": "g2o", "version-date": "2020-02-07", - "port-version": 6, + "port-version": 7, "description": "g2o: A General Framework for Graph Optimization", "homepage": "https://openslam.org/g2o.html", "dependencies": [ From acc8bc30110be2f30f82a615ca782afba925df3f Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Sat, 27 Jul 2024 15:54:11 +0300 Subject: [PATCH 71/95] update vdb --- versions/baseline.json | 6 +++--- versions/c-/ceres.json | 5 +++++ versions/c-/colmap.json | 5 +++++ versions/g-/g2o.json | 5 +++++ 4 files changed, 18 insertions(+), 3 deletions(-) diff --git a/versions/baseline.json b/versions/baseline.json index bab208b15b8d80..4c52d1e7ee075b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1554,7 +1554,7 @@ }, "ceres": { "baseline": "2.1.0", - "port-version": 5 + "port-version": 6 }, "cfitsio": { "baseline": "3.49", @@ -1782,7 +1782,7 @@ }, "colmap": { "baseline": "3.9.1", - "port-version": 0 + "port-version": 1 }, "color-console": { "baseline": "2022-03-20", @@ -2910,7 +2910,7 @@ }, "g2o": { "baseline": "2020-02-07", - "port-version": 6 + "port-version": 7 }, "g3log": { "baseline": "2.4", diff --git a/versions/c-/ceres.json b/versions/c-/ceres.json index abd7d29923c83a..96aeac5f372a66 100644 --- a/versions/c-/ceres.json +++ b/versions/c-/ceres.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "faec5674aa7bfc6a124482def6bfb2725f882c09", + "version": "2.1.0", + "port-version": 6 + }, { "git-tree": "e628219999f68aaf9c3c33ba1a499e6a9b53e23d", "version": "2.1.0", diff --git a/versions/c-/colmap.json b/versions/c-/colmap.json index c0760777808ee7..56f1377abb377b 100644 --- a/versions/c-/colmap.json +++ b/versions/c-/colmap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6d94f3670e37370451c35e649b93264774dccdd4", + "version": "3.9.1", + "port-version": 1 + }, { "git-tree": "ea8648434951744f9814fdff9a9eebff193c62bf", "version": "3.9.1", diff --git a/versions/g-/g2o.json b/versions/g-/g2o.json index 3ac2baa0771d49..779bde28c0eee7 100644 --- a/versions/g-/g2o.json +++ b/versions/g-/g2o.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5e5e4896a3be2465c029d0a9d403f22c14f84ce5", + "version-date": "2020-02-07", + "port-version": 7 + }, { "git-tree": "78d7fbeddf97132477c9c1336f897cc8a44d6ab1", "version-date": "2020-02-07", From 8e4c6ecc8d0ebbf19bbf1f7b7271f0832843a778 Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Wed, 7 Aug 2024 09:02:00 +0300 Subject: [PATCH 72/95] CI From f18bcb8686e49870079478dce0fc3c14495f8f30 Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Fri, 16 Aug 2024 18:18:00 +0300 Subject: [PATCH 73/95] vdb --- versions/baseline.json | 2 +- versions/c-/colmap.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/baseline.json b/versions/baseline.json index 4617ca84c519c8..5a787ac35f8023 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1786,7 +1786,7 @@ }, "colmap": { "baseline": "3.10", - "port-version": 0 + "port-version": 1 }, "color-console": { "baseline": "2022-03-20", diff --git a/versions/c-/colmap.json b/versions/c-/colmap.json index 384a2b8893c8c4..56b75ff479c913 100644 --- a/versions/c-/colmap.json +++ b/versions/c-/colmap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c6b47687562a23925c6b5419db4a97725763bf8e", + "version": "3.10", + "port-version": 1 + }, { "git-tree": "29a181de8c80f9008a9a46657a16ed187530a59b", "version": "3.10", From a7e377bdd832cd53f457fbf676461b022df14863 Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Fri, 16 Aug 2024 19:31:46 +0300 Subject: [PATCH 74/95] [suitesparse-graphblas] only supported on x64 for windows --- ports/suitesparse-graphblas/vcpkg.json | 2 +- ports/suitesparse/vcpkg.json | 2 +- scripts/ci.baseline.txt | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ports/suitesparse-graphblas/vcpkg.json b/ports/suitesparse-graphblas/vcpkg.json index 0885397a4c4e10..f0d3da0fa16ecd 100644 --- a/ports/suitesparse-graphblas/vcpkg.json +++ b/ports/suitesparse-graphblas/vcpkg.json @@ -4,7 +4,7 @@ "description": "SuiteSparse:GraphBLAS: graph algorithms in the language of linear algebra", "homepage": "https://people.engr.tamu.edu/davis/GraphBLAS.html", "license": "Apache-2.0", - "supports": "!android & !(windows & x86)", + "supports": "!android & !uwp & !(windows & x86) & !(windows & arm)", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/ports/suitesparse/vcpkg.json b/ports/suitesparse/vcpkg.json index 67bca12d6510fe..78bd117b361d39 100644 --- a/ports/suitesparse/vcpkg.json +++ b/ports/suitesparse/vcpkg.json @@ -15,7 +15,7 @@ "suitesparse-cxsparse", { "name": "suitesparse-graphblas", - "platform": "!android" + "platform": "!android & !uwp & !(windows & x86) & !(windows & arm)" }, "suitesparse-klu", "suitesparse-lagraph", diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 42acc495a61728..ef692aadbcbb37 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1128,6 +1128,9 @@ stxxl:x64-windows=skip stxxl:x64-windows-static=skip stxxl:x64-windows-static-md=skip # _Interlocked* intrinsic functions are not available on x86 +suitesparse-graphblas:arm64-uwp=fail +suitesparse-graphblas:arm64-windows=fail +suitesparse-graphblas:x64-uwp=fail suitesparse-graphblas:x86-windows=fail systemc:arm64-windows=fail systemc:arm64-uwp=fail From 63222ffb647a5f52ac690ff715226e0257e938dd Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Fri, 16 Aug 2024 19:32:14 +0300 Subject: [PATCH 75/95] vdb --- versions/s-/suitesparse-graphblas.json | 2 +- versions/s-/suitesparse.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/versions/s-/suitesparse-graphblas.json b/versions/s-/suitesparse-graphblas.json index 8e68cad7631f41..fa0480d2273deb 100644 --- a/versions/s-/suitesparse-graphblas.json +++ b/versions/s-/suitesparse-graphblas.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "9a18de0f99506a9d3a4ad8563a170b71b6a151b0", + "git-tree": "a8fa64551110d8eb547999f5f3ebcb5dcfb2cd3b", "version-semver": "9.2.0", "port-version": 0 } diff --git a/versions/s-/suitesparse.json b/versions/s-/suitesparse.json index e3b8f7b22f7d36..3fab2f6d94218a 100644 --- a/versions/s-/suitesparse.json +++ b/versions/s-/suitesparse.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "4d0cde637ea49691c1e3c6746e584f1f12dd3a0e", + "git-tree": "cce0e5967536b3a7693770252fec80477153bdc5", "version-semver": "7.7.0", "port-version": 0 }, From eb239f26b1204a7b3b6a6f67c14d0c23c5eba3d1 Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Sat, 17 Aug 2024 13:36:07 +0300 Subject: [PATCH 76/95] [SuiteSparse] update to v7.8.1 --- ports/suitesparse-amd/portfile.cmake | 4 +-- ports/suitesparse-amd/vcpkg.json | 2 +- ports/suitesparse-btf/portfile.cmake | 4 +-- ports/suitesparse-camd/portfile.cmake | 4 +-- ports/suitesparse-camd/vcpkg.json | 2 +- ports/suitesparse-ccolamd/portfile.cmake | 4 +-- ports/suitesparse-ccolamd/vcpkg.json | 2 +- ports/suitesparse-cholmod/portfile.cmake | 4 +-- ports/suitesparse-cholmod/vcpkg.json | 2 +- ports/suitesparse-colamd/portfile.cmake | 4 +-- ports/suitesparse-colamd/vcpkg.json | 2 +- ports/suitesparse-config/portfile.cmake | 6 ++-- ports/suitesparse-config/vcpkg.json | 2 +- ports/suitesparse-cxsparse/portfile.cmake | 4 +-- ports/suitesparse-cxsparse/vcpkg.json | 2 +- ports/suitesparse-graphblas/portfile.cmake | 4 +-- ports/suitesparse-graphblas/vcpkg.json | 2 +- ports/suitesparse-klu/portfile.cmake | 4 +-- ports/suitesparse-klu/vcpkg.json | 2 +- ports/suitesparse-lagraph/portfile.cmake | 4 +-- ports/suitesparse-ldl/portfile.cmake | 4 +-- ports/suitesparse-mongoose/portfile.cmake | 4 +-- ports/suitesparse-mongoose/vcpkg.json | 2 +- .../001-fix-cmake-umfpack.patch | 15 --------- ports/suitesparse-paru/portfile.cmake | 8 ++--- ports/suitesparse-paru/vcpkg.json | 2 +- ports/suitesparse-rbio/portfile.cmake | 4 +-- ports/suitesparse-rbio/vcpkg.json | 2 +- ports/suitesparse-spex/portfile.cmake | 4 +-- ports/suitesparse-spex/vcpkg.json | 2 +- ports/suitesparse-spqr/portfile.cmake | 4 +-- ports/suitesparse-spqr/vcpkg.json | 2 +- ports/suitesparse-umfpack/portfile.cmake | 4 +-- ports/suitesparse-umfpack/vcpkg.json | 2 +- ports/suitesparse/vcpkg.json | 2 +- versions/baseline.json | 32 +++++++++---------- 36 files changed, 70 insertions(+), 87 deletions(-) delete mode 100644 ports/suitesparse-paru/001-fix-cmake-umfpack.patch diff --git a/ports/suitesparse-amd/portfile.cmake b/ports/suitesparse-amd/portfile.cmake index 81115b152e1671..445edcaf0292ba 100644 --- a/ports/suitesparse-amd/portfile.cmake +++ b/ports/suitesparse-amd/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO DrTimothyAldenDavis/SuiteSparse - REF v7.7.0 - SHA512 aa62dae81ae423ce7162ae83b46e5cf606d95482e6c6bb7ae6d61e15987761119d9418ef3a96648e6ba2327871a2847eef8ace197aa375279d71c80329d6f451 + REF v7.8.1 + SHA512 d07709ad8567e5fe954f04d0c38a95a5610394aaa5ff5c809518c378b937d20556114b95c9dc052b316c8e8fcbb2eca294b425b21e8bbfa5c04f72c6f15a5eb6 HEAD_REF dev ) diff --git a/ports/suitesparse-amd/vcpkg.json b/ports/suitesparse-amd/vcpkg.json index 05ce2c927cb8e4..43223d4ff44a18 100644 --- a/ports/suitesparse-amd/vcpkg.json +++ b/ports/suitesparse-amd/vcpkg.json @@ -1,6 +1,6 @@ { "name": "suitesparse-amd", - "version-semver": "3.3.2", + "version-semver": "3.3.3", "description": "AMD: Routines for permuting sparse matrices prior to factorization in SuiteSparse", "homepage": "https://people.engr.tamu.edu/davis/suitesparse.html", "license": "BSD-3-Clause", diff --git a/ports/suitesparse-btf/portfile.cmake b/ports/suitesparse-btf/portfile.cmake index e40066fdae1e3c..82e8abfe48da4a 100644 --- a/ports/suitesparse-btf/portfile.cmake +++ b/ports/suitesparse-btf/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO DrTimothyAldenDavis/SuiteSparse - REF v7.7.0 - SHA512 aa62dae81ae423ce7162ae83b46e5cf606d95482e6c6bb7ae6d61e15987761119d9418ef3a96648e6ba2327871a2847eef8ace197aa375279d71c80329d6f451 + REF v7.8.1 + SHA512 d07709ad8567e5fe954f04d0c38a95a5610394aaa5ff5c809518c378b937d20556114b95c9dc052b316c8e8fcbb2eca294b425b21e8bbfa5c04f72c6f15a5eb6 HEAD_REF dev ) diff --git a/ports/suitesparse-camd/portfile.cmake b/ports/suitesparse-camd/portfile.cmake index 2f64a8aa2f1ff8..56af5bd2ef46c7 100644 --- a/ports/suitesparse-camd/portfile.cmake +++ b/ports/suitesparse-camd/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO DrTimothyAldenDavis/SuiteSparse - REF v7.7.0 - SHA512 aa62dae81ae423ce7162ae83b46e5cf606d95482e6c6bb7ae6d61e15987761119d9418ef3a96648e6ba2327871a2847eef8ace197aa375279d71c80329d6f451 + REF v7.8.1 + SHA512 d07709ad8567e5fe954f04d0c38a95a5610394aaa5ff5c809518c378b937d20556114b95c9dc052b316c8e8fcbb2eca294b425b21e8bbfa5c04f72c6f15a5eb6 HEAD_REF dev ) diff --git a/ports/suitesparse-camd/vcpkg.json b/ports/suitesparse-camd/vcpkg.json index 8c3bcb35a50a98..2ab4bb315833d9 100644 --- a/ports/suitesparse-camd/vcpkg.json +++ b/ports/suitesparse-camd/vcpkg.json @@ -1,6 +1,6 @@ { "name": "suitesparse-camd", - "version-semver": "3.3.2", + "version-semver": "3.3.3", "description": "AMD: Routines for permuting sparse matrices prior to factorization in SuiteSparse", "homepage": "https://people.engr.tamu.edu/davis/suitesparse.html", "license": "BSD-3-Clause", diff --git a/ports/suitesparse-ccolamd/portfile.cmake b/ports/suitesparse-ccolamd/portfile.cmake index 6dfac543451fa9..f95d2198834577 100644 --- a/ports/suitesparse-ccolamd/portfile.cmake +++ b/ports/suitesparse-ccolamd/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO DrTimothyAldenDavis/SuiteSparse - REF v7.7.0 - SHA512 aa62dae81ae423ce7162ae83b46e5cf606d95482e6c6bb7ae6d61e15987761119d9418ef3a96648e6ba2327871a2847eef8ace197aa375279d71c80329d6f451 + REF v7.8.1 + SHA512 d07709ad8567e5fe954f04d0c38a95a5610394aaa5ff5c809518c378b937d20556114b95c9dc052b316c8e8fcbb2eca294b425b21e8bbfa5c04f72c6f15a5eb6 HEAD_REF dev ) diff --git a/ports/suitesparse-ccolamd/vcpkg.json b/ports/suitesparse-ccolamd/vcpkg.json index 8c906369834ce1..0fda8cde4ccba2 100644 --- a/ports/suitesparse-ccolamd/vcpkg.json +++ b/ports/suitesparse-ccolamd/vcpkg.json @@ -1,6 +1,6 @@ { "name": "suitesparse-ccolamd", - "version-semver": "3.3.3", + "version-semver": "3.3.4", "description": "CCOLAMD: Routines for constrained column approximate minimum degree ordering algorithm in SuiteSparse", "homepage": "https://people.engr.tamu.edu/davis/suitesparse.html", "license": "BSD-3-Clause", diff --git a/ports/suitesparse-cholmod/portfile.cmake b/ports/suitesparse-cholmod/portfile.cmake index e9b306a6412c34..ff45c55295982b 100644 --- a/ports/suitesparse-cholmod/portfile.cmake +++ b/ports/suitesparse-cholmod/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO DrTimothyAldenDavis/SuiteSparse - REF v7.7.0 - SHA512 aa62dae81ae423ce7162ae83b46e5cf606d95482e6c6bb7ae6d61e15987761119d9418ef3a96648e6ba2327871a2847eef8ace197aa375279d71c80329d6f451 + REF v7.8.1 + SHA512 d07709ad8567e5fe954f04d0c38a95a5610394aaa5ff5c809518c378b937d20556114b95c9dc052b316c8e8fcbb2eca294b425b21e8bbfa5c04f72c6f15a5eb6 HEAD_REF dev ) diff --git a/ports/suitesparse-cholmod/vcpkg.json b/ports/suitesparse-cholmod/vcpkg.json index 77af29429a8dd0..8c7f059bf6a3d5 100644 --- a/ports/suitesparse-cholmod/vcpkg.json +++ b/ports/suitesparse-cholmod/vcpkg.json @@ -1,6 +1,6 @@ { "name": "suitesparse-cholmod", - "version-semver": "5.2.1", + "version-semver": "5.3.0", "description": "CHOLMOD: Routines for factorizing sparse symmetric positive definite matrices in SuiteSparse", "homepage": "https://people.engr.tamu.edu/davis/suitesparse.html", "license": "LGPL-2.1-or-later AND Apache-2.0", diff --git a/ports/suitesparse-colamd/portfile.cmake b/ports/suitesparse-colamd/portfile.cmake index f764a9684512e0..dd725f1d7381d9 100644 --- a/ports/suitesparse-colamd/portfile.cmake +++ b/ports/suitesparse-colamd/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO DrTimothyAldenDavis/SuiteSparse - REF v7.7.0 - SHA512 aa62dae81ae423ce7162ae83b46e5cf606d95482e6c6bb7ae6d61e15987761119d9418ef3a96648e6ba2327871a2847eef8ace197aa375279d71c80329d6f451 + REF v7.8.1 + SHA512 d07709ad8567e5fe954f04d0c38a95a5610394aaa5ff5c809518c378b937d20556114b95c9dc052b316c8e8fcbb2eca294b425b21e8bbfa5c04f72c6f15a5eb6 HEAD_REF dev ) diff --git a/ports/suitesparse-colamd/vcpkg.json b/ports/suitesparse-colamd/vcpkg.json index 5c8b5c47257c5d..815f744fe937bd 100644 --- a/ports/suitesparse-colamd/vcpkg.json +++ b/ports/suitesparse-colamd/vcpkg.json @@ -1,6 +1,6 @@ { "name": "suitesparse-colamd", - "version-semver": "3.3.3", + "version-semver": "3.3.4", "description": "COLAMD: Routines for column approximate minimum degree ordering algorithm in SuiteSparse", "homepage": "https://people.engr.tamu.edu/davis/suitesparse.html", "license": "BSD-3-Clause", diff --git a/ports/suitesparse-config/portfile.cmake b/ports/suitesparse-config/portfile.cmake index 80908958162537..ae9ea02aba59c9 100644 --- a/ports/suitesparse-config/portfile.cmake +++ b/ports/suitesparse-config/portfile.cmake @@ -1,15 +1,15 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO DrTimothyAldenDavis/SuiteSparse - REF v7.7.0 - SHA512 aa62dae81ae423ce7162ae83b46e5cf606d95482e6c6bb7ae6d61e15987761119d9418ef3a96648e6ba2327871a2847eef8ace197aa375279d71c80329d6f451 + REF v${VERSION} + SHA512 d07709ad8567e5fe954f04d0c38a95a5610394aaa5ff5c809518c378b937d20556114b95c9dc052b316c8e8fcbb2eca294b425b21e8bbfa5c04f72c6f15a5eb6 HEAD_REF dev ) set(PACKAGE_NAME SuiteSparse_config) # Avoid overriding of BLA_VENDOR and skip straight to find_package() as done here -# https://github.com/DrTimothyAldenDavis/SuiteSparse/blob/v7.7.0/SuiteSparse_config/cmake_modules/SuiteSparseBLAS.cmake#L240-L245 +# https://github.com/DrTimothyAldenDavis/SuiteSparse/blob/v7.8.1/SuiteSparse_config/cmake_modules/SuiteSparseBLAS.cmake#L240-L245 configure_file( "${CMAKE_CURRENT_LIST_DIR}/SuiteSparseBLAS.cmake" "${SOURCE_PATH}/SuiteSparse_config/cmake_modules/SuiteSparseBLAS.cmake" diff --git a/ports/suitesparse-config/vcpkg.json b/ports/suitesparse-config/vcpkg.json index ac441e551c29eb..66d80b54aab256 100644 --- a/ports/suitesparse-config/vcpkg.json +++ b/ports/suitesparse-config/vcpkg.json @@ -1,6 +1,6 @@ { "name": "suitesparse-config", - "version-semver": "7.7.0", + "version-semver": "7.8.1", "description": "Configuration for SuiteSparse libraries", "homepage": "https://people.engr.tamu.edu/davis/suitesparse.html", "license": "BSD-3-Clause", diff --git a/ports/suitesparse-cxsparse/portfile.cmake b/ports/suitesparse-cxsparse/portfile.cmake index c5b6233678c352..0732cdad2bed83 100644 --- a/ports/suitesparse-cxsparse/portfile.cmake +++ b/ports/suitesparse-cxsparse/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO DrTimothyAldenDavis/SuiteSparse - REF v7.7.0 - SHA512 aa62dae81ae423ce7162ae83b46e5cf606d95482e6c6bb7ae6d61e15987761119d9418ef3a96648e6ba2327871a2847eef8ace197aa375279d71c80329d6f451 + REF v7.8.1 + SHA512 d07709ad8567e5fe954f04d0c38a95a5610394aaa5ff5c809518c378b937d20556114b95c9dc052b316c8e8fcbb2eca294b425b21e8bbfa5c04f72c6f15a5eb6 HEAD_REF dev ) diff --git a/ports/suitesparse-cxsparse/vcpkg.json b/ports/suitesparse-cxsparse/vcpkg.json index e511287bbc9494..fcae2cadb95396 100644 --- a/ports/suitesparse-cxsparse/vcpkg.json +++ b/ports/suitesparse-cxsparse/vcpkg.json @@ -1,6 +1,6 @@ { "name": "suitesparse-cxsparse", - "version-semver": "4.4.0", + "version-semver": "4.4.1", "description": "CXSparse: Software package for permuting a matrix into block upper triangular form in SuiteSparse", "homepage": "https://people.engr.tamu.edu/davis/suitesparse.html", "license": "LGPL-2.1-or-later", diff --git a/ports/suitesparse-graphblas/portfile.cmake b/ports/suitesparse-graphblas/portfile.cmake index ffff4c8d3b734e..5ca999ecdf3dfd 100644 --- a/ports/suitesparse-graphblas/portfile.cmake +++ b/ports/suitesparse-graphblas/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO DrTimothyAldenDavis/GraphBLAS REF v${VERSION} - SHA512 70bbf2331cdc013ef18456712a823e2f95e8f1773933f94bc55e5b7e1bc8a225bf56b21d9b66caabaf98ee909975820b0d899101289642c6e50253892c5af48e + SHA512 94ebb0c4fb8ed93c5fe71610a730a32f8e6b84389bd75ddc8d997fa82a60401608f75783f60c59209b13e50f922995a9ad745a2bb499e99c3cb32d05db73aea5 HEAD_REF stable ) @@ -15,7 +15,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS ) # Prevent JIT cache from being created at ~/.SuiteSparse by default. Only used during build. -# see https://github.com/DrTimothyAldenDavis/SuiteSparse/blob/v7.7.0/GraphBLAS/cmake_modules/GraphBLAS_JIT_paths.cmake +# see https://github.com/DrTimothyAldenDavis/SuiteSparse/blob/v7.8.1/GraphBLAS/cmake_modules/GraphBLAS_JIT_paths.cmake vcpkg_backup_env_variables(VARS GRAPHBLAS_CACHE_PATH) set(ENV{GRAPHBLAS_CACHE_PATH} "${CURRENT_BUILDTREES_DIR}/cache") diff --git a/ports/suitesparse-graphblas/vcpkg.json b/ports/suitesparse-graphblas/vcpkg.json index f0d3da0fa16ecd..db35e208000238 100644 --- a/ports/suitesparse-graphblas/vcpkg.json +++ b/ports/suitesparse-graphblas/vcpkg.json @@ -1,6 +1,6 @@ { "name": "suitesparse-graphblas", - "version-semver": "9.2.0", + "version-semver": "9.3.1", "description": "SuiteSparse:GraphBLAS: graph algorithms in the language of linear algebra", "homepage": "https://people.engr.tamu.edu/davis/GraphBLAS.html", "license": "Apache-2.0", diff --git a/ports/suitesparse-klu/portfile.cmake b/ports/suitesparse-klu/portfile.cmake index 274c7b0672184a..2369fb0a399cfd 100644 --- a/ports/suitesparse-klu/portfile.cmake +++ b/ports/suitesparse-klu/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO DrTimothyAldenDavis/SuiteSparse - REF v7.7.0 - SHA512 aa62dae81ae423ce7162ae83b46e5cf606d95482e6c6bb7ae6d61e15987761119d9418ef3a96648e6ba2327871a2847eef8ace197aa375279d71c80329d6f451 + REF v7.8.1 + SHA512 d07709ad8567e5fe954f04d0c38a95a5610394aaa5ff5c809518c378b937d20556114b95c9dc052b316c8e8fcbb2eca294b425b21e8bbfa5c04f72c6f15a5eb6 HEAD_REF dev ) diff --git a/ports/suitesparse-klu/vcpkg.json b/ports/suitesparse-klu/vcpkg.json index 0c7774844ec69d..bed9485bf9081b 100644 --- a/ports/suitesparse-klu/vcpkg.json +++ b/ports/suitesparse-klu/vcpkg.json @@ -1,6 +1,6 @@ { "name": "suitesparse-klu", - "version-semver": "2.3.3", + "version-semver": "2.3.4", "description": "KLU: Routines for solving sparse linear systems of equations in SuiteSparse", "homepage": "https://people.engr.tamu.edu/davis/suitesparse.html", "license": "LGPL-2.1-or-later", diff --git a/ports/suitesparse-lagraph/portfile.cmake b/ports/suitesparse-lagraph/portfile.cmake index 306e27cce06fa3..862faa7615d91b 100644 --- a/ports/suitesparse-lagraph/portfile.cmake +++ b/ports/suitesparse-lagraph/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO DrTimothyAldenDavis/SuiteSparse - REF v7.7.0 - SHA512 aa62dae81ae423ce7162ae83b46e5cf606d95482e6c6bb7ae6d61e15987761119d9418ef3a96648e6ba2327871a2847eef8ace197aa375279d71c80329d6f451 + REF v7.8.1 + SHA512 d07709ad8567e5fe954f04d0c38a95a5610394aaa5ff5c809518c378b937d20556114b95c9dc052b316c8e8fcbb2eca294b425b21e8bbfa5c04f72c6f15a5eb6 HEAD_REF dev ) diff --git a/ports/suitesparse-ldl/portfile.cmake b/ports/suitesparse-ldl/portfile.cmake index 37f1e3a07bd3b2..1e23cd0f0752fd 100644 --- a/ports/suitesparse-ldl/portfile.cmake +++ b/ports/suitesparse-ldl/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO DrTimothyAldenDavis/SuiteSparse - REF v7.7.0 - SHA512 aa62dae81ae423ce7162ae83b46e5cf606d95482e6c6bb7ae6d61e15987761119d9418ef3a96648e6ba2327871a2847eef8ace197aa375279d71c80329d6f451 + REF v7.8.1 + SHA512 d07709ad8567e5fe954f04d0c38a95a5610394aaa5ff5c809518c378b937d20556114b95c9dc052b316c8e8fcbb2eca294b425b21e8bbfa5c04f72c6f15a5eb6 HEAD_REF dev ) diff --git a/ports/suitesparse-mongoose/portfile.cmake b/ports/suitesparse-mongoose/portfile.cmake index 45f91d91fb27e1..0fd7dfa0fe7c98 100644 --- a/ports/suitesparse-mongoose/portfile.cmake +++ b/ports/suitesparse-mongoose/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO DrTimothyAldenDavis/SuiteSparse - REF v7.7.0 - SHA512 aa62dae81ae423ce7162ae83b46e5cf606d95482e6c6bb7ae6d61e15987761119d9418ef3a96648e6ba2327871a2847eef8ace197aa375279d71c80329d6f451 + REF v7.8.1 + SHA512 d07709ad8567e5fe954f04d0c38a95a5610394aaa5ff5c809518c378b937d20556114b95c9dc052b316c8e8fcbb2eca294b425b21e8bbfa5c04f72c6f15a5eb6 HEAD_REF dev ) diff --git a/ports/suitesparse-mongoose/vcpkg.json b/ports/suitesparse-mongoose/vcpkg.json index 85d5dc85eed78e..944f6f1260b331 100644 --- a/ports/suitesparse-mongoose/vcpkg.json +++ b/ports/suitesparse-mongoose/vcpkg.json @@ -1,6 +1,6 @@ { "name": "suitesparse-mongoose", - "version-semver": "3.3.3", + "version-semver": "3.3.4", "description": "Mongoose: Graph partitioning library in SuiteSparse", "homepage": "https://people.engr.tamu.edu/davis/suitesparse.html", "license": "GPL-3.0-only", diff --git a/ports/suitesparse-paru/001-fix-cmake-umfpack.patch b/ports/suitesparse-paru/001-fix-cmake-umfpack.patch deleted file mode 100644 index 079e2048d4e1d4..00000000000000 --- a/ports/suitesparse-paru/001-fix-cmake-umfpack.patch +++ /dev/null @@ -1,15 +0,0 @@ -https://github.com/DrTimothyAldenDavis/SuiteSparse/pull/793 - -diff --git a/ParU/CMakeLists.txt b/ParU/CMakeLists.txt -index 7055750b1..7881334ed 100644 ---- a/ParU/CMakeLists.txt -+++ b/ParU/CMakeLists.txt -@@ -111,7 +111,7 @@ if ( NOT SUITESPARSE_ROOT_CMAKELISTS ) - - find_package ( UMFPACK 6.3.3 - PATHS ${CMAKE_SOURCE_DIR}/../UMFPACK/build NO_DEFAULT_PATH ) -- if ( NOT CAMD_FOUND ) -+ if ( NOT UMFPACK_FOUND ) - find_package ( UMFPACK 6.3.3 REQUIRED ) - endif ( ) - endif ( ) diff --git a/ports/suitesparse-paru/portfile.cmake b/ports/suitesparse-paru/portfile.cmake index 9bb7bf08dc29e4..7365b4c19782fa 100644 --- a/ports/suitesparse-paru/portfile.cmake +++ b/ports/suitesparse-paru/portfile.cmake @@ -1,11 +1,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO DrTimothyAldenDavis/SuiteSparse - REF v7.7.0 - SHA512 aa62dae81ae423ce7162ae83b46e5cf606d95482e6c6bb7ae6d61e15987761119d9418ef3a96648e6ba2327871a2847eef8ace197aa375279d71c80329d6f451 + REF v7.8.1 + SHA512 d07709ad8567e5fe954f04d0c38a95a5610394aaa5ff5c809518c378b937d20556114b95c9dc052b316c8e8fcbb2eca294b425b21e8bbfa5c04f72c6f15a5eb6 HEAD_REF dev - PATCHES - 001-fix-cmake-umfpack.patch ) set(PACKAGE_NAME ParU) @@ -45,4 +43,4 @@ vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/${PACKAGE_NAME}/Doc/License.txt") +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/${PACKAGE_NAME}/LICENSE.txt") diff --git a/ports/suitesparse-paru/vcpkg.json b/ports/suitesparse-paru/vcpkg.json index 51a590b6411d20..dad2911d81ae62 100644 --- a/ports/suitesparse-paru/vcpkg.json +++ b/ports/suitesparse-paru/vcpkg.json @@ -1,6 +1,6 @@ { "name": "suitesparse-paru", - "version-semver": "0.1.3", + "version-semver": "0.2.0", "description": "ParU: Routines for solving sparse linear system via parallel multifrontal LU factorization algorithms in SuiteSparse", "homepage": "https://people.engr.tamu.edu/davis/suitesparse.html", "license": "GPL-3.0-or-later", diff --git a/ports/suitesparse-rbio/portfile.cmake b/ports/suitesparse-rbio/portfile.cmake index eaf9323eb5aa74..db1838c5a311b2 100644 --- a/ports/suitesparse-rbio/portfile.cmake +++ b/ports/suitesparse-rbio/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO DrTimothyAldenDavis/SuiteSparse - REF v7.7.0 - SHA512 aa62dae81ae423ce7162ae83b46e5cf606d95482e6c6bb7ae6d61e15987761119d9418ef3a96648e6ba2327871a2847eef8ace197aa375279d71c80329d6f451 + REF v7.8.1 + SHA512 d07709ad8567e5fe954f04d0c38a95a5610394aaa5ff5c809518c378b937d20556114b95c9dc052b316c8e8fcbb2eca294b425b21e8bbfa5c04f72c6f15a5eb6 HEAD_REF dev ) diff --git a/ports/suitesparse-rbio/vcpkg.json b/ports/suitesparse-rbio/vcpkg.json index 700b9b239ae079..58b592d436cc96 100644 --- a/ports/suitesparse-rbio/vcpkg.json +++ b/ports/suitesparse-rbio/vcpkg.json @@ -1,6 +1,6 @@ { "name": "suitesparse-rbio", - "version-semver": "4.3.2", + "version-semver": "4.3.3", "description": "RBio: routines for reading/writing sparse matrices in Rutherford/Boeing format in SuiteSparse", "homepage": "https://people.engr.tamu.edu/davis/suitesparse.html", "license": "GPL-2.0-or-later", diff --git a/ports/suitesparse-spex/portfile.cmake b/ports/suitesparse-spex/portfile.cmake index c6e16a1bc2d790..98647173647aba 100644 --- a/ports/suitesparse-spex/portfile.cmake +++ b/ports/suitesparse-spex/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO DrTimothyAldenDavis/SuiteSparse - REF v7.7.0 - SHA512 aa62dae81ae423ce7162ae83b46e5cf606d95482e6c6bb7ae6d61e15987761119d9418ef3a96648e6ba2327871a2847eef8ace197aa375279d71c80329d6f451 + REF v7.8.1 + SHA512 d07709ad8567e5fe954f04d0c38a95a5610394aaa5ff5c809518c378b937d20556114b95c9dc052b316c8e8fcbb2eca294b425b21e8bbfa5c04f72c6f15a5eb6 HEAD_REF dev ) diff --git a/ports/suitesparse-spex/vcpkg.json b/ports/suitesparse-spex/vcpkg.json index ddfa64b4b16304..1d69de3b7fb0a8 100644 --- a/ports/suitesparse-spex/vcpkg.json +++ b/ports/suitesparse-spex/vcpkg.json @@ -1,6 +1,6 @@ { "name": "suitesparse-spex", - "version-semver": "3.1.0", + "version-semver": "3.2.0", "description": "SPEX: Software package for SParse EXact algebra in SuiteSparse", "homepage": "https://people.engr.tamu.edu/davis/suitesparse.html", "license": "GPL-2.0-or-later OR LGPL-3.0-or-later", diff --git a/ports/suitesparse-spqr/portfile.cmake b/ports/suitesparse-spqr/portfile.cmake index ac2ef2755e0561..1ffaa1cb0355a1 100644 --- a/ports/suitesparse-spqr/portfile.cmake +++ b/ports/suitesparse-spqr/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO DrTimothyAldenDavis/SuiteSparse - REF v7.7.0 - SHA512 aa62dae81ae423ce7162ae83b46e5cf606d95482e6c6bb7ae6d61e15987761119d9418ef3a96648e6ba2327871a2847eef8ace197aa375279d71c80329d6f451 + REF v7.8.1 + SHA512 d07709ad8567e5fe954f04d0c38a95a5610394aaa5ff5c809518c378b937d20556114b95c9dc052b316c8e8fcbb2eca294b425b21e8bbfa5c04f72c6f15a5eb6 HEAD_REF dev ) diff --git a/ports/suitesparse-spqr/vcpkg.json b/ports/suitesparse-spqr/vcpkg.json index 55704033eac969..967959049ca450 100644 --- a/ports/suitesparse-spqr/vcpkg.json +++ b/ports/suitesparse-spqr/vcpkg.json @@ -1,6 +1,6 @@ { "name": "suitesparse-spqr", - "version-semver": "4.3.3", + "version-semver": "4.3.4", "description": "SPQR: Multithreaded, multifrontal, rank-revealing sparse QR factorization method in SuiteSparse", "homepage": "https://people.engr.tamu.edu/davis/suitesparse.html", "license": "GPL-2.0-or-later", diff --git a/ports/suitesparse-umfpack/portfile.cmake b/ports/suitesparse-umfpack/portfile.cmake index 0f6a4464fa9722..4e2093b4b3dd99 100644 --- a/ports/suitesparse-umfpack/portfile.cmake +++ b/ports/suitesparse-umfpack/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO DrTimothyAldenDavis/SuiteSparse - REF v7.7.0 - SHA512 aa62dae81ae423ce7162ae83b46e5cf606d95482e6c6bb7ae6d61e15987761119d9418ef3a96648e6ba2327871a2847eef8ace197aa375279d71c80329d6f451 + REF v7.8.1 + SHA512 d07709ad8567e5fe954f04d0c38a95a5610394aaa5ff5c809518c378b937d20556114b95c9dc052b316c8e8fcbb2eca294b425b21e8bbfa5c04f72c6f15a5eb6 HEAD_REF dev ) diff --git a/ports/suitesparse-umfpack/vcpkg.json b/ports/suitesparse-umfpack/vcpkg.json index be548e12583250..f464134a02c6c0 100644 --- a/ports/suitesparse-umfpack/vcpkg.json +++ b/ports/suitesparse-umfpack/vcpkg.json @@ -1,6 +1,6 @@ { "name": "suitesparse-umfpack", - "version-semver": "6.3.3", + "version-semver": "6.3.4", "description": "UMFPACK: Routines solving sparse linear systems via LU factorization in SuiteSparse", "homepage": "https://people.engr.tamu.edu/davis/suitesparse.html", "license": "GPL-2.0-or-later", diff --git a/ports/suitesparse/vcpkg.json b/ports/suitesparse/vcpkg.json index 78bd117b361d39..590ee0497b55e0 100644 --- a/ports/suitesparse/vcpkg.json +++ b/ports/suitesparse/vcpkg.json @@ -1,6 +1,6 @@ { "name": "suitesparse", - "version-semver": "7.7.0", + "version-semver": "7.8.1", "description": "A suite of sparse matrix algorithms", "homepage": "https://people.engr.tamu.edu/davis/suitesparse.html", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index 5a787ac35f8023..f64f5395f266df 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8625,11 +8625,11 @@ "port-version": 8 }, "suitesparse": { - "baseline": "7.7.0", + "baseline": "7.8.1", "port-version": 0 }, "suitesparse-amd": { - "baseline": "3.3.2", + "baseline": "3.3.3", "port-version": 0 }, "suitesparse-btf": { @@ -8637,35 +8637,35 @@ "port-version": 0 }, "suitesparse-camd": { - "baseline": "3.3.2", + "baseline": "3.3.3", "port-version": 0 }, "suitesparse-ccolamd": { - "baseline": "3.3.3", + "baseline": "3.3.4", "port-version": 0 }, "suitesparse-cholmod": { - "baseline": "5.2.1", + "baseline": "5.3.0", "port-version": 0 }, "suitesparse-colamd": { - "baseline": "3.3.3", + "baseline": "3.3.4", "port-version": 0 }, "suitesparse-config": { - "baseline": "7.7.0", + "baseline": "7.8.1", "port-version": 0 }, "suitesparse-cxsparse": { - "baseline": "4.4.0", + "baseline": "4.4.1", "port-version": 0 }, "suitesparse-graphblas": { - "baseline": "9.2.0", + "baseline": "9.3.1", "port-version": 0 }, "suitesparse-klu": { - "baseline": "2.3.3", + "baseline": "2.3.4", "port-version": 0 }, "suitesparse-lagraph": { @@ -8677,27 +8677,27 @@ "port-version": 0 }, "suitesparse-mongoose": { - "baseline": "3.3.3", + "baseline": "3.3.4", "port-version": 0 }, "suitesparse-paru": { - "baseline": "0.1.3", + "baseline": "0.2.0", "port-version": 0 }, "suitesparse-rbio": { - "baseline": "4.3.2", + "baseline": "4.3.3", "port-version": 0 }, "suitesparse-spex": { - "baseline": "3.1.0", + "baseline": "3.2.0", "port-version": 0 }, "suitesparse-spqr": { - "baseline": "4.3.3", + "baseline": "4.3.4", "port-version": 0 }, "suitesparse-umfpack": { - "baseline": "6.3.3", + "baseline": "6.3.4", "port-version": 0 }, "sundials": { From ac7fd503143d3e75a8a98f6c44ca21c9fec096a7 Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Sat, 17 Aug 2024 13:58:18 +0300 Subject: [PATCH 77/95] vdb --- versions/s-/suitesparse-amd.json | 4 ++-- versions/s-/suitesparse-btf.json | 2 +- versions/s-/suitesparse-camd.json | 4 ++-- versions/s-/suitesparse-ccolamd.json | 4 ++-- versions/s-/suitesparse-cholmod.json | 4 ++-- versions/s-/suitesparse-colamd.json | 4 ++-- versions/s-/suitesparse-config.json | 4 ++-- versions/s-/suitesparse-cxsparse.json | 4 ++-- versions/s-/suitesparse-graphblas.json | 4 ++-- versions/s-/suitesparse-klu.json | 4 ++-- versions/s-/suitesparse-lagraph.json | 2 +- versions/s-/suitesparse-ldl.json | 2 +- versions/s-/suitesparse-mongoose.json | 4 ++-- versions/s-/suitesparse-paru.json | 4 ++-- versions/s-/suitesparse-rbio.json | 4 ++-- versions/s-/suitesparse-spex.json | 4 ++-- versions/s-/suitesparse-spqr.json | 4 ++-- versions/s-/suitesparse-umfpack.json | 4 ++-- versions/s-/suitesparse.json | 4 ++-- 19 files changed, 35 insertions(+), 35 deletions(-) diff --git a/versions/s-/suitesparse-amd.json b/versions/s-/suitesparse-amd.json index 85d9fe14c16514..0c51582d0872e1 100644 --- a/versions/s-/suitesparse-amd.json +++ b/versions/s-/suitesparse-amd.json @@ -1,8 +1,8 @@ { "versions": [ { - "git-tree": "5341e142af27abb899627b3af6fb6955383c7771", - "version-semver": "3.3.2", + "git-tree": "8432640163f19d91cb2e0c45364644e0487ff093", + "version-semver": "3.3.3", "port-version": 0 } ] diff --git a/versions/s-/suitesparse-btf.json b/versions/s-/suitesparse-btf.json index 6cdae67054480b..97ae100dd658c4 100644 --- a/versions/s-/suitesparse-btf.json +++ b/versions/s-/suitesparse-btf.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "b63e148c5d258b48b772fc0922df8a3d6a972689", + "git-tree": "1c55edd14ca31b7c339057014cdf2c49181a298f", "version-semver": "2.3.2", "port-version": 0 } diff --git a/versions/s-/suitesparse-camd.json b/versions/s-/suitesparse-camd.json index 873ddb95d91acb..3bc4437a0aaf87 100644 --- a/versions/s-/suitesparse-camd.json +++ b/versions/s-/suitesparse-camd.json @@ -1,8 +1,8 @@ { "versions": [ { - "git-tree": "2a54c0be183393d4689b8cb5f23b833304475309", - "version-semver": "3.3.2", + "git-tree": "87b9283062e0a69062d52e31ca5d30968903f192", + "version-semver": "3.3.3", "port-version": 0 } ] diff --git a/versions/s-/suitesparse-ccolamd.json b/versions/s-/suitesparse-ccolamd.json index 1f205288b864d6..e011f2f93a966d 100644 --- a/versions/s-/suitesparse-ccolamd.json +++ b/versions/s-/suitesparse-ccolamd.json @@ -1,8 +1,8 @@ { "versions": [ { - "git-tree": "595ac812339cbc0dd2bc764dc71734f9f0f901a5", - "version-semver": "3.3.3", + "git-tree": "bca9db27f636a5e0df62997cf4dd9da3cb2ba849", + "version-semver": "3.3.4", "port-version": 0 } ] diff --git a/versions/s-/suitesparse-cholmod.json b/versions/s-/suitesparse-cholmod.json index b5c21e0db01728..5e301e92230dc6 100644 --- a/versions/s-/suitesparse-cholmod.json +++ b/versions/s-/suitesparse-cholmod.json @@ -1,8 +1,8 @@ { "versions": [ { - "git-tree": "e2646c5ac7943b8337a5d869b7029cc30d22a730", - "version-semver": "5.2.1", + "git-tree": "9fbc74627b30a8ac49eae2d1f2ced6b31647c367", + "version-semver": "5.3.0", "port-version": 0 } ] diff --git a/versions/s-/suitesparse-colamd.json b/versions/s-/suitesparse-colamd.json index 273bc6ef90d8af..259f62f39d28af 100644 --- a/versions/s-/suitesparse-colamd.json +++ b/versions/s-/suitesparse-colamd.json @@ -1,8 +1,8 @@ { "versions": [ { - "git-tree": "e5998134274fadb1b5f39e1435b68d3776c3f192", - "version-semver": "3.3.3", + "git-tree": "1fddd25ebb0075e5c246a635dc45d4161ae55a18", + "version-semver": "3.3.4", "port-version": 0 } ] diff --git a/versions/s-/suitesparse-config.json b/versions/s-/suitesparse-config.json index 61007a2fc774ca..ed32be09f71e77 100644 --- a/versions/s-/suitesparse-config.json +++ b/versions/s-/suitesparse-config.json @@ -1,8 +1,8 @@ { "versions": [ { - "git-tree": "2b3dc0fe01cf40952e1d79e3f6394697d3c7f0b4", - "version-semver": "7.7.0", + "git-tree": "db232c55bb00c6dede1ce74ef767a6bb292d6f2d", + "version-semver": "7.8.1", "port-version": 0 } ] diff --git a/versions/s-/suitesparse-cxsparse.json b/versions/s-/suitesparse-cxsparse.json index 0be21419471485..089253b3e6efd6 100644 --- a/versions/s-/suitesparse-cxsparse.json +++ b/versions/s-/suitesparse-cxsparse.json @@ -1,8 +1,8 @@ { "versions": [ { - "git-tree": "5d2378f57e348d516161e024b682a26de46ca60f", - "version-semver": "4.4.0", + "git-tree": "e1fbbd6dc88b26c1a63ec615400a9fcd2abf0c52", + "version-semver": "4.4.1", "port-version": 0 } ] diff --git a/versions/s-/suitesparse-graphblas.json b/versions/s-/suitesparse-graphblas.json index fa0480d2273deb..26b63f3b884ee1 100644 --- a/versions/s-/suitesparse-graphblas.json +++ b/versions/s-/suitesparse-graphblas.json @@ -1,8 +1,8 @@ { "versions": [ { - "git-tree": "a8fa64551110d8eb547999f5f3ebcb5dcfb2cd3b", - "version-semver": "9.2.0", + "git-tree": "6b249e4bdc6c6ebc07959dac490e9bd1840012df", + "version-semver": "9.3.1", "port-version": 0 } ] diff --git a/versions/s-/suitesparse-klu.json b/versions/s-/suitesparse-klu.json index 5da75968660c46..855c4d55177340 100644 --- a/versions/s-/suitesparse-klu.json +++ b/versions/s-/suitesparse-klu.json @@ -1,8 +1,8 @@ { "versions": [ { - "git-tree": "cefc776187a204dbcb507a6b19beb5b6e97bf4cb", - "version-semver": "2.3.3", + "git-tree": "8bc933e376a7f861ba3821a68f1ec8e6c5d90c10", + "version-semver": "2.3.4", "port-version": 0 } ] diff --git a/versions/s-/suitesparse-lagraph.json b/versions/s-/suitesparse-lagraph.json index 6fbbaed9769530..58279e6ba72d8d 100644 --- a/versions/s-/suitesparse-lagraph.json +++ b/versions/s-/suitesparse-lagraph.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "cc0c359210f7dd2f00c76250c1bb661c53a5e4da", + "git-tree": "f4dba6bc55d31aac51ddfdac05e1e9744128db26", "version-semver": "1.1.3", "port-version": 0 } diff --git a/versions/s-/suitesparse-ldl.json b/versions/s-/suitesparse-ldl.json index 7c79acbdbbd2d6..987e820d38d476 100644 --- a/versions/s-/suitesparse-ldl.json +++ b/versions/s-/suitesparse-ldl.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "44f9c757ae3b69581155112f33a3ca6738d33449", + "git-tree": "46a505fcbaf3255b2fcb0e2b17e42b1bbac5e436", "version-semver": "3.3.2", "port-version": 0 } diff --git a/versions/s-/suitesparse-mongoose.json b/versions/s-/suitesparse-mongoose.json index 6f8008d12f737e..a055d4f8338bab 100644 --- a/versions/s-/suitesparse-mongoose.json +++ b/versions/s-/suitesparse-mongoose.json @@ -1,8 +1,8 @@ { "versions": [ { - "git-tree": "549b0667bb31a2002f3b085266afb175b4d45bcd", - "version-semver": "3.3.3", + "git-tree": "9fe69f635eed0e602dbf94c728e0664e9d36e0a3", + "version-semver": "3.3.4", "port-version": 0 } ] diff --git a/versions/s-/suitesparse-paru.json b/versions/s-/suitesparse-paru.json index 99a803629d5033..4c939233c8ca74 100644 --- a/versions/s-/suitesparse-paru.json +++ b/versions/s-/suitesparse-paru.json @@ -1,8 +1,8 @@ { "versions": [ { - "git-tree": "af3341a29d02885778dffc0822c85509f0775016", - "version-semver": "0.1.3", + "git-tree": "f267866793db7de357631cf0d52803bbdb86f033", + "version-semver": "0.2.0", "port-version": 0 } ] diff --git a/versions/s-/suitesparse-rbio.json b/versions/s-/suitesparse-rbio.json index bf5a6b34bb0be4..e5eca446459c27 100644 --- a/versions/s-/suitesparse-rbio.json +++ b/versions/s-/suitesparse-rbio.json @@ -1,8 +1,8 @@ { "versions": [ { - "git-tree": "eff0cfa52bb7b27685906ff928f92dab8fc3900a", - "version-semver": "4.3.2", + "git-tree": "dcc8d575b5178b60467225b5a9343d6c6049fe0b", + "version-semver": "4.3.3", "port-version": 0 } ] diff --git a/versions/s-/suitesparse-spex.json b/versions/s-/suitesparse-spex.json index 971411d811cd19..0c502aaa5cb738 100644 --- a/versions/s-/suitesparse-spex.json +++ b/versions/s-/suitesparse-spex.json @@ -1,8 +1,8 @@ { "versions": [ { - "git-tree": "5bba2ff232f5302414e2c56db9608bf9a4376849", - "version-semver": "3.1.0", + "git-tree": "fcee12db786b1ea3253ce5f80c655608ada9ff8f", + "version-semver": "3.2.0", "port-version": 0 } ] diff --git a/versions/s-/suitesparse-spqr.json b/versions/s-/suitesparse-spqr.json index ae42b7b297b6d1..e83ed9dbf5682d 100644 --- a/versions/s-/suitesparse-spqr.json +++ b/versions/s-/suitesparse-spqr.json @@ -1,8 +1,8 @@ { "versions": [ { - "git-tree": "14dc9a5af5010fd5c9e0cf33c98858190f91c7dc", - "version-semver": "4.3.3", + "git-tree": "a8ab18c6be791c8afa2cb3a3257f8f0a1482fad5", + "version-semver": "4.3.4", "port-version": 0 } ] diff --git a/versions/s-/suitesparse-umfpack.json b/versions/s-/suitesparse-umfpack.json index 376f5729b247a2..8e1f1e47a4f625 100644 --- a/versions/s-/suitesparse-umfpack.json +++ b/versions/s-/suitesparse-umfpack.json @@ -1,8 +1,8 @@ { "versions": [ { - "git-tree": "61a678b7d755ca86a0038731c0f834942bba0044", - "version-semver": "6.3.3", + "git-tree": "40f8e747af836d32ee33b9f1bfc8c57ed871bc4f", + "version-semver": "6.3.4", "port-version": 0 } ] diff --git a/versions/s-/suitesparse.json b/versions/s-/suitesparse.json index 3fab2f6d94218a..f572c42cf0a2a8 100644 --- a/versions/s-/suitesparse.json +++ b/versions/s-/suitesparse.json @@ -1,8 +1,8 @@ { "versions": [ { - "git-tree": "cce0e5967536b3a7693770252fec80477153bdc5", - "version-semver": "7.7.0", + "git-tree": "e6eb6776b38cf073637a9c35e565f7338299fa15", + "version-semver": "7.8.1", "port-version": 0 }, { From b3722e85336fd7806f619ab84784bc7b2dd980d3 Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Sat, 17 Aug 2024 21:06:56 +0300 Subject: [PATCH 78/95] [suitesparse-spqr] add a missing 'supernodal' requirement for cholmod --- ports/suitesparse-spqr/vcpkg.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/ports/suitesparse-spqr/vcpkg.json b/ports/suitesparse-spqr/vcpkg.json index 967959049ca450..ca381307beee9f 100644 --- a/ports/suitesparse-spqr/vcpkg.json +++ b/ports/suitesparse-spqr/vcpkg.json @@ -6,7 +6,12 @@ "license": "GPL-2.0-or-later", "dependencies": [ "lapack", - "suitesparse-cholmod", + { + "name": "suitesparse-cholmod", + "features": [ + "supernodal" + ] + }, "suitesparse-config", { "name": "vcpkg-cmake", From 5bcb8b48f60b3b6fafe31406b70c8533f6c2bea5 Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Sat, 17 Aug 2024 21:07:19 +0300 Subject: [PATCH 79/95] vdb --- versions/s-/suitesparse-spqr.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/s-/suitesparse-spqr.json b/versions/s-/suitesparse-spqr.json index e83ed9dbf5682d..96545eb45f781b 100644 --- a/versions/s-/suitesparse-spqr.json +++ b/versions/s-/suitesparse-spqr.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "a8ab18c6be791c8afa2cb3a3257f8f0a1482fad5", + "git-tree": "8f13fa814a90cafde895e28e4e057ec8307d6add", "version-semver": "4.3.4", "port-version": 0 } From 75ccb70f8a56328b1b20020ca96fd58c2fa27b02 Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Sun, 18 Aug 2024 14:07:03 +0300 Subject: [PATCH 80/95] [ceres] require matrixops feature from cholmod --- ports/ceres/vcpkg.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/ports/ceres/vcpkg.json b/ports/ceres/vcpkg.json index c71e304156da23..4d3ea4534569bf 100644 --- a/ports/ceres/vcpkg.json +++ b/ports/ceres/vcpkg.json @@ -61,7 +61,12 @@ "lapack" ] }, - "suitesparse-cholmod", + { + "name": "suitesparse-cholmod", + "features": [ + "matrixops" + ] + }, "suitesparse-spqr" ] }, From dd86272ad36672a57cff9e5352bf58cd05c8cd8f Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Sun, 18 Aug 2024 14:13:42 +0300 Subject: [PATCH 81/95] vdb --- versions/c-/ceres.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/c-/ceres.json b/versions/c-/ceres.json index 96aeac5f372a66..9adaada8cdb5e7 100644 --- a/versions/c-/ceres.json +++ b/versions/c-/ceres.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "faec5674aa7bfc6a124482def6bfb2725f882c09", + "git-tree": "3a2c4332ea4c0794c5deb699316d1cb3cbf200f1", "version": "2.1.0", "port-version": 6 }, From 6caed0d66d9c02ae05d499011d413a8dc28c6c9b Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Sun, 18 Aug 2024 15:17:13 +0300 Subject: [PATCH 82/95] [suitesparse-graphblas] move failures from "supports" to ci.baseline.txt --- ports/suitesparse-graphblas/vcpkg.json | 2 +- ports/suitesparse/vcpkg.json | 2 +- scripts/ci.baseline.txt | 6 ++++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ports/suitesparse-graphblas/vcpkg.json b/ports/suitesparse-graphblas/vcpkg.json index db35e208000238..1e89984295935c 100644 --- a/ports/suitesparse-graphblas/vcpkg.json +++ b/ports/suitesparse-graphblas/vcpkg.json @@ -4,7 +4,7 @@ "description": "SuiteSparse:GraphBLAS: graph algorithms in the language of linear algebra", "homepage": "https://people.engr.tamu.edu/davis/GraphBLAS.html", "license": "Apache-2.0", - "supports": "!android & !uwp & !(windows & x86) & !(windows & arm)", + "supports": "!android & !(windows & x86)", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/ports/suitesparse/vcpkg.json b/ports/suitesparse/vcpkg.json index 590ee0497b55e0..2ba1800c61825d 100644 --- a/ports/suitesparse/vcpkg.json +++ b/ports/suitesparse/vcpkg.json @@ -15,7 +15,7 @@ "suitesparse-cxsparse", { "name": "suitesparse-graphblas", - "platform": "!android & !uwp & !(windows & x86) & !(windows & arm)" + "platform": "!android" }, "suitesparse-klu", "suitesparse-lagraph", diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index ef692aadbcbb37..5a048cf7b8ade7 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1128,10 +1128,12 @@ stxxl:x64-windows=skip stxxl:x64-windows-static=skip stxxl:x64-windows-static-md=skip # _Interlocked* intrinsic functions are not available on x86 -suitesparse-graphblas:arm64-uwp=fail +suitesparse-graphblas:x86-windows=fail +# "ninja: error: failed recompaction: Permission denied" suitesparse-graphblas:arm64-windows=fail +# uwp: "unresolved external symbol __imp_RoInitialize referenced in function __scrt_initialize_winrt" suitesparse-graphblas:x64-uwp=fail -suitesparse-graphblas:x86-windows=fail +suitesparse-graphblas:arm64-uwp=fail systemc:arm64-windows=fail systemc:arm64-uwp=fail systemc:x64-uwp=fail From 61749a973b7f63651dd32f6a890594d00a7ff4c3 Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Sun, 18 Aug 2024 15:17:36 +0300 Subject: [PATCH 83/95] vdb --- versions/s-/suitesparse-graphblas.json | 2 +- versions/s-/suitesparse.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/versions/s-/suitesparse-graphblas.json b/versions/s-/suitesparse-graphblas.json index 26b63f3b884ee1..4e04d4d8f6880e 100644 --- a/versions/s-/suitesparse-graphblas.json +++ b/versions/s-/suitesparse-graphblas.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "6b249e4bdc6c6ebc07959dac490e9bd1840012df", + "git-tree": "ca9f985d6ea48cfb2c425e75d12998786ddd0951", "version-semver": "9.3.1", "port-version": 0 } diff --git a/versions/s-/suitesparse.json b/versions/s-/suitesparse.json index f572c42cf0a2a8..b7facadcf0dc05 100644 --- a/versions/s-/suitesparse.json +++ b/versions/s-/suitesparse.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "e6eb6776b38cf073637a9c35e565f7338299fa15", + "git-tree": "b25218719c028623de9df3bd5eee9ac103cc9bf2", "version-semver": "7.8.1", "port-version": 0 }, From 311ce890158345dca02dc02f30259968d9c546f5 Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Mon, 19 Aug 2024 15:17:02 +0300 Subject: [PATCH 84/95] fix ceres vdb --- versions/c-/ceres.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/c-/ceres.json b/versions/c-/ceres.json index 9adaada8cdb5e7..da9757911b842b 100644 --- a/versions/c-/ceres.json +++ b/versions/c-/ceres.json @@ -6,7 +6,7 @@ "port-version": 6 }, { - "git-tree": "e628219999f68aaf9c3c33ba1a499e6a9b53e23d", + "git-tree": "213619bf4451443bd69f784f9a7fa32fc2436e07", "version": "2.1.0", "port-version": 5 }, From f3a86f666ffb04a0004dd77af8eb716b6b32ab5e Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Mon, 19 Aug 2024 15:18:53 +0300 Subject: [PATCH 85/95] fix g2o vdb --- versions/g-/g2o.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/g-/g2o.json b/versions/g-/g2o.json index 779bde28c0eee7..a92a5c7c4c8e3a 100644 --- a/versions/g-/g2o.json +++ b/versions/g-/g2o.json @@ -6,7 +6,7 @@ "port-version": 7 }, { - "git-tree": "78d7fbeddf97132477c9c1336f897cc8a44d6ab1", + "git-tree": "dcf90e398d2940de9be1685b435cc4314f348125", "version-date": "2020-02-07", "port-version": 6 }, From b867d2d881d81bf79516ce331ed8f77742301a83 Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Tue, 20 Aug 2024 22:52:19 +0300 Subject: [PATCH 86/95] [suitesparse-graphblas] adjust "supports" --- ports/suitesparse-graphblas/vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/suitesparse-graphblas/vcpkg.json b/ports/suitesparse-graphblas/vcpkg.json index 1e89984295935c..06b894b0e9294b 100644 --- a/ports/suitesparse-graphblas/vcpkg.json +++ b/ports/suitesparse-graphblas/vcpkg.json @@ -4,7 +4,7 @@ "description": "SuiteSparse:GraphBLAS: graph algorithms in the language of linear algebra", "homepage": "https://people.engr.tamu.edu/davis/GraphBLAS.html", "license": "Apache-2.0", - "supports": "!android & !(windows & x86)", + "supports": "!android", "dependencies": [ { "name": "vcpkg-cmake", From 4d65cd3e32ef723aa19495e9e8f87eb31f520b92 Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Tue, 20 Aug 2024 22:54:58 +0300 Subject: [PATCH 87/95] vdb --- versions/s-/suitesparse-graphblas.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/s-/suitesparse-graphblas.json b/versions/s-/suitesparse-graphblas.json index 4e04d4d8f6880e..891702ceb10e57 100644 --- a/versions/s-/suitesparse-graphblas.json +++ b/versions/s-/suitesparse-graphblas.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "ca9f985d6ea48cfb2c425e75d12998786ddd0951", + "git-tree": "f4caa23b81701d0c2adaa0dbcbfdd0f5eb7e3245", "version-semver": "9.3.1", "port-version": 0 } From b6c5da386698b87ae78fb1b8d38618ac56751748 Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Tue, 20 Aug 2024 23:46:53 +0300 Subject: [PATCH 88/95] [g2o] disable use of vendored CSparse --- ports/g2o/portfile.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/ports/g2o/portfile.cmake b/ports/g2o/portfile.cmake index fbfad1b96087d7..e273fc02cca619 100644 --- a/ports/g2o/portfile.cmake +++ b/ports/g2o/portfile.cmake @@ -17,6 +17,7 @@ vcpkg_cmake_configure( -DBUILD_LGPL_SHARED_LIBS=${BUILD_LGPL_SHARED_LIBS} -DG2O_BUILD_EXAMPLES=OFF -DG2O_BUILD_APPS=OFF + -DBUILD_CSPARSE=OFF ) vcpkg_cmake_install() From 5c86dd088549e94d461aa83944890a92a548e14e Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Tue, 20 Aug 2024 23:47:12 +0300 Subject: [PATCH 89/95] vdb --- versions/g-/g2o.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/g-/g2o.json b/versions/g-/g2o.json index a92a5c7c4c8e3a..7b0fc57dc49854 100644 --- a/versions/g-/g2o.json +++ b/versions/g-/g2o.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "5e5e4896a3be2465c029d0a9d403f22c14f84ce5", + "git-tree": "dff64d705b60a0a14c4bb033e131b276728fb6b9", "version-date": "2020-02-07", "port-version": 7 }, From b16ed70fbafda5fd7ab93e84c72eab74b4d4bb02 Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Tue, 27 Aug 2024 10:57:46 +0300 Subject: [PATCH 90/95] [SuiteSparse] add update_suitesparse.py script --- ports/suitesparse-amd/vcpkg.json | 1 + ports/suitesparse-btf/vcpkg.json | 1 + ports/suitesparse-camd/vcpkg.json | 1 + ports/suitesparse-ccolamd/vcpkg.json | 1 + ports/suitesparse-cholmod/vcpkg.json | 1 + ports/suitesparse-colamd/vcpkg.json | 1 + ports/suitesparse-config/vcpkg.json | 1 + ports/suitesparse-cxsparse/vcpkg.json | 1 + ports/suitesparse-graphblas/vcpkg.json | 1 + ports/suitesparse-klu/vcpkg.json | 1 + ports/suitesparse-lagraph/vcpkg.json | 1 + ports/suitesparse-ldl/vcpkg.json | 1 + ports/suitesparse-mongoose/vcpkg.json | 1 + ports/suitesparse-paru/vcpkg.json | 1 + ports/suitesparse-rbio/vcpkg.json | 1 + ports/suitesparse-spex/vcpkg.json | 1 + ports/suitesparse-spqr/vcpkg.json | 1 + ports/suitesparse-umfpack/vcpkg.json | 1 + ports/suitesparse/update_suitesparse.py | 120 ++++++++++++++++++++++++ ports/suitesparse/vcpkg.json | 1 + 20 files changed, 139 insertions(+) create mode 100755 ports/suitesparse/update_suitesparse.py diff --git a/ports/suitesparse-amd/vcpkg.json b/ports/suitesparse-amd/vcpkg.json index 43223d4ff44a18..1379a6757a1cc0 100644 --- a/ports/suitesparse-amd/vcpkg.json +++ b/ports/suitesparse-amd/vcpkg.json @@ -1,4 +1,5 @@ { + "$comment": "Use the suitesparse/update_suitesparse.py script to update all SuiteSparse ports", "name": "suitesparse-amd", "version-semver": "3.3.3", "description": "AMD: Routines for permuting sparse matrices prior to factorization in SuiteSparse", diff --git a/ports/suitesparse-btf/vcpkg.json b/ports/suitesparse-btf/vcpkg.json index cc44e1136ab107..09626861c48629 100644 --- a/ports/suitesparse-btf/vcpkg.json +++ b/ports/suitesparse-btf/vcpkg.json @@ -1,4 +1,5 @@ { + "$comment": "Use the suitesparse/update_suitesparse.py script to update all SuiteSparse ports", "name": "suitesparse-btf", "version-semver": "2.3.2", "description": "BTF: Software package for permuting a matrix into block upper triangular form in SuiteSparse", diff --git a/ports/suitesparse-camd/vcpkg.json b/ports/suitesparse-camd/vcpkg.json index 2ab4bb315833d9..cd0ead74fb3f4a 100644 --- a/ports/suitesparse-camd/vcpkg.json +++ b/ports/suitesparse-camd/vcpkg.json @@ -1,4 +1,5 @@ { + "$comment": "Use the suitesparse/update_suitesparse.py script to update all SuiteSparse ports", "name": "suitesparse-camd", "version-semver": "3.3.3", "description": "AMD: Routines for permuting sparse matrices prior to factorization in SuiteSparse", diff --git a/ports/suitesparse-ccolamd/vcpkg.json b/ports/suitesparse-ccolamd/vcpkg.json index 0fda8cde4ccba2..bf362f19031556 100644 --- a/ports/suitesparse-ccolamd/vcpkg.json +++ b/ports/suitesparse-ccolamd/vcpkg.json @@ -1,4 +1,5 @@ { + "$comment": "Use the suitesparse/update_suitesparse.py script to update all SuiteSparse ports", "name": "suitesparse-ccolamd", "version-semver": "3.3.4", "description": "CCOLAMD: Routines for constrained column approximate minimum degree ordering algorithm in SuiteSparse", diff --git a/ports/suitesparse-cholmod/vcpkg.json b/ports/suitesparse-cholmod/vcpkg.json index 8c7f059bf6a3d5..eee6fc9c5849a0 100644 --- a/ports/suitesparse-cholmod/vcpkg.json +++ b/ports/suitesparse-cholmod/vcpkg.json @@ -1,4 +1,5 @@ { + "$comment": "Use the suitesparse/update_suitesparse.py script to update all SuiteSparse ports", "name": "suitesparse-cholmod", "version-semver": "5.3.0", "description": "CHOLMOD: Routines for factorizing sparse symmetric positive definite matrices in SuiteSparse", diff --git a/ports/suitesparse-colamd/vcpkg.json b/ports/suitesparse-colamd/vcpkg.json index 815f744fe937bd..5f98e74490f6ee 100644 --- a/ports/suitesparse-colamd/vcpkg.json +++ b/ports/suitesparse-colamd/vcpkg.json @@ -1,4 +1,5 @@ { + "$comment": "Use the suitesparse/update_suitesparse.py script to update all SuiteSparse ports", "name": "suitesparse-colamd", "version-semver": "3.3.4", "description": "COLAMD: Routines for column approximate minimum degree ordering algorithm in SuiteSparse", diff --git a/ports/suitesparse-config/vcpkg.json b/ports/suitesparse-config/vcpkg.json index 66d80b54aab256..5c5a1e431c3bb0 100644 --- a/ports/suitesparse-config/vcpkg.json +++ b/ports/suitesparse-config/vcpkg.json @@ -1,4 +1,5 @@ { + "$comment": "Use the suitesparse/update_suitesparse.py script to update all SuiteSparse ports", "name": "suitesparse-config", "version-semver": "7.8.1", "description": "Configuration for SuiteSparse libraries", diff --git a/ports/suitesparse-cxsparse/vcpkg.json b/ports/suitesparse-cxsparse/vcpkg.json index fcae2cadb95396..619d6547934410 100644 --- a/ports/suitesparse-cxsparse/vcpkg.json +++ b/ports/suitesparse-cxsparse/vcpkg.json @@ -1,4 +1,5 @@ { + "$comment": "Use the suitesparse/update_suitesparse.py script to update all SuiteSparse ports", "name": "suitesparse-cxsparse", "version-semver": "4.4.1", "description": "CXSparse: Software package for permuting a matrix into block upper triangular form in SuiteSparse", diff --git a/ports/suitesparse-graphblas/vcpkg.json b/ports/suitesparse-graphblas/vcpkg.json index 06b894b0e9294b..22dcc7a2fbc781 100644 --- a/ports/suitesparse-graphblas/vcpkg.json +++ b/ports/suitesparse-graphblas/vcpkg.json @@ -1,4 +1,5 @@ { + "$comment": "Use the suitesparse/update_suitesparse.py script to update all SuiteSparse ports", "name": "suitesparse-graphblas", "version-semver": "9.3.1", "description": "SuiteSparse:GraphBLAS: graph algorithms in the language of linear algebra", diff --git a/ports/suitesparse-klu/vcpkg.json b/ports/suitesparse-klu/vcpkg.json index bed9485bf9081b..e23599510cb5a1 100644 --- a/ports/suitesparse-klu/vcpkg.json +++ b/ports/suitesparse-klu/vcpkg.json @@ -1,4 +1,5 @@ { + "$comment": "Use the suitesparse/update_suitesparse.py script to update all SuiteSparse ports", "name": "suitesparse-klu", "version-semver": "2.3.4", "description": "KLU: Routines for solving sparse linear systems of equations in SuiteSparse", diff --git a/ports/suitesparse-lagraph/vcpkg.json b/ports/suitesparse-lagraph/vcpkg.json index cc04ce6d9d2e8d..0bd08d5c387ba8 100644 --- a/ports/suitesparse-lagraph/vcpkg.json +++ b/ports/suitesparse-lagraph/vcpkg.json @@ -1,4 +1,5 @@ { + "$comment": "Use the suitesparse/update_suitesparse.py script to update all SuiteSparse ports", "name": "suitesparse-lagraph", "version-semver": "1.1.3", "description": "LAGraph: Library plus test harness for collecting algorithms that use GraphBLAS", diff --git a/ports/suitesparse-ldl/vcpkg.json b/ports/suitesparse-ldl/vcpkg.json index 143d63dc88b0fb..36971aea155010 100644 --- a/ports/suitesparse-ldl/vcpkg.json +++ b/ports/suitesparse-ldl/vcpkg.json @@ -1,4 +1,5 @@ { + "$comment": "Use the suitesparse/update_suitesparse.py script to update all SuiteSparse ports", "name": "suitesparse-ldl", "version-semver": "3.3.2", "description": "LDL: A sparse LDL' factorization and solve package in SuiteSparse", diff --git a/ports/suitesparse-mongoose/vcpkg.json b/ports/suitesparse-mongoose/vcpkg.json index 944f6f1260b331..6dbf6872817d44 100644 --- a/ports/suitesparse-mongoose/vcpkg.json +++ b/ports/suitesparse-mongoose/vcpkg.json @@ -1,4 +1,5 @@ { + "$comment": "Use the suitesparse/update_suitesparse.py script to update all SuiteSparse ports", "name": "suitesparse-mongoose", "version-semver": "3.3.4", "description": "Mongoose: Graph partitioning library in SuiteSparse", diff --git a/ports/suitesparse-paru/vcpkg.json b/ports/suitesparse-paru/vcpkg.json index dad2911d81ae62..2a9752f69580d9 100644 --- a/ports/suitesparse-paru/vcpkg.json +++ b/ports/suitesparse-paru/vcpkg.json @@ -1,4 +1,5 @@ { + "$comment": "Use the suitesparse/update_suitesparse.py script to update all SuiteSparse ports", "name": "suitesparse-paru", "version-semver": "0.2.0", "description": "ParU: Routines for solving sparse linear system via parallel multifrontal LU factorization algorithms in SuiteSparse", diff --git a/ports/suitesparse-rbio/vcpkg.json b/ports/suitesparse-rbio/vcpkg.json index 58b592d436cc96..586f735246caa8 100644 --- a/ports/suitesparse-rbio/vcpkg.json +++ b/ports/suitesparse-rbio/vcpkg.json @@ -1,4 +1,5 @@ { + "$comment": "Use the suitesparse/update_suitesparse.py script to update all SuiteSparse ports", "name": "suitesparse-rbio", "version-semver": "4.3.3", "description": "RBio: routines for reading/writing sparse matrices in Rutherford/Boeing format in SuiteSparse", diff --git a/ports/suitesparse-spex/vcpkg.json b/ports/suitesparse-spex/vcpkg.json index 1d69de3b7fb0a8..6139785c823213 100644 --- a/ports/suitesparse-spex/vcpkg.json +++ b/ports/suitesparse-spex/vcpkg.json @@ -1,4 +1,5 @@ { + "$comment": "Use the suitesparse/update_suitesparse.py script to update all SuiteSparse ports", "name": "suitesparse-spex", "version-semver": "3.2.0", "description": "SPEX: Software package for SParse EXact algebra in SuiteSparse", diff --git a/ports/suitesparse-spqr/vcpkg.json b/ports/suitesparse-spqr/vcpkg.json index ca381307beee9f..55e71ac8842e6e 100644 --- a/ports/suitesparse-spqr/vcpkg.json +++ b/ports/suitesparse-spqr/vcpkg.json @@ -1,4 +1,5 @@ { + "$comment": "Use the suitesparse/update_suitesparse.py script to update all SuiteSparse ports", "name": "suitesparse-spqr", "version-semver": "4.3.4", "description": "SPQR: Multithreaded, multifrontal, rank-revealing sparse QR factorization method in SuiteSparse", diff --git a/ports/suitesparse-umfpack/vcpkg.json b/ports/suitesparse-umfpack/vcpkg.json index f464134a02c6c0..9b80ea02b3af1d 100644 --- a/ports/suitesparse-umfpack/vcpkg.json +++ b/ports/suitesparse-umfpack/vcpkg.json @@ -1,4 +1,5 @@ { + "$comment": "Use the suitesparse/update_suitesparse.py script to update all SuiteSparse ports", "name": "suitesparse-umfpack", "version-semver": "6.3.4", "description": "UMFPACK: Routines solving sparse linear systems via LU factorization in SuiteSparse", diff --git a/ports/suitesparse/update_suitesparse.py b/ports/suitesparse/update_suitesparse.py new file mode 100755 index 00000000000000..fabda3775275fa --- /dev/null +++ b/ports/suitesparse/update_suitesparse.py @@ -0,0 +1,120 @@ +#!/usr/bin/env python3 + +# Usage: ./update_suitesparse.py +# +# Updates the `suitesparse` port and all of its `suitesparse-*` sub-packages +# based on the source archive automatically downloaded of the given version. + +import hashlib +import io +import json +import re +import sys +import tarfile +from pathlib import Path + +import requests + +ports_root = Path(__file__).resolve().parent.parent + + +def download(url): + print(f"Downloading {url}...") + r = requests.get(url) + r.raise_for_status() + return r.content + + +def sha512(data): + sha = hashlib.sha512() + sha.update(data) + return sha.hexdigest() + + +def extract_version(content): + major = re.search(r"^set *\( *(\w+)_VERSION_MAJOR +(\d+) ", content, re.M).group(2) + minor = re.search(r"^set *\( *(\w+)_VERSION_MINOR +(\d+) ", content, re.M).group(2) + sub = re.search(r"^set *\( *(\w+)_VERSION_(?:SUB|PATCH|UPDATE) +(\d+) ", content, re.M).group(2) + return f"{major}.{minor}.{sub}" + + +def load_versions(tar_gz_bytes): + versions = {} + tar_gz_file = io.BytesIO(tar_gz_bytes) + with tarfile.open(fileobj=tar_gz_file, mode="r:gz") as tar: + for member in tar.getmembers(): + if not member.isfile(): + continue + if m := re.fullmatch(r"SuiteSparse-[^/]+/(\w+)/CMakeLists.txt", member.name): + name = m.group(1) + if name in ["Example", "GraphBLAS", "CSparse"]: + continue + content = tar.extractfile(member).read().decode("utf8") + versions[name] = extract_version(content) + elif member.name.endswith("GraphBLAS_version.cmake"): + content = tar.extractfile(member).read().decode("utf8") + versions["GraphBLAS"] = extract_version(content) + return versions + + +def update_manifest(pkg_name, version): + port_dir = ports_root / pkg_name + manifest_path = port_dir / "vcpkg.json" + manifest = json.loads(manifest_path.read_text("utf8")) + if manifest["version-semver"] == version: + return False + manifest["version-semver"] = version + manifest_path.write_text(json.dumps(manifest, indent=2) + "\n") + return True + + +def update_portfile(pkg_name, new_version, new_hash): + port_dir = ports_root / pkg_name + portfile_path = port_dir / "portfile.cmake" + content = portfile_path.read_text("utf8") + content, n = re.subn(r"\bREF v\S+", f"REF v{new_version}", content, re.M) + if n != 1: + raise Exception(f"Updating {pkg_name} portfile ref failed!") + content, n = re.subn(r"\bSHA512 \S+", f"SHA512 {new_hash}", content, re.M) + if n != 1: + raise Exception(f"Updating {pkg_name} portfile hash failed!") + portfile_path.write_text(content) + + +def update_port(pkg_name, new_version, suitesparse_hash): + port_dir = ports_root / pkg_name + if not port_dir.exists(): + raise Exception(f"'{pkg_name}' does not exist!") + needs_updating = update_manifest(pkg_name, new_version) + if not needs_updating: + print(f"{pkg_name}: up to date") + return + print(f"{pkg_name}: updating...") + if pkg_name == "suitesparse-graphblas": + url = f"https://github.com/DrTimothyAldenDavis/GraphBLAS/archive/refs/tags/v{new_version}.tar.gz" + graphblas_hash = sha512(download(url)) + update_portfile(pkg_name, new_version, graphblas_hash) + else: + update_portfile(pkg_name, suitesparse_version, suitesparse_hash) + + +def main(suitesparse_version): + suitesparse_url = ( + f"https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/refs/tags/v{suitesparse_version}.tar.gz" + ) + tar_gz_bytes = download(suitesparse_url) + suitesparse_hash = sha512(tar_gz_bytes) + print("Reading versions from CMakeLists.txt files...") + versions = load_versions(tar_gz_bytes) + for lib, new_version in versions.items(): + pkg_name = "suitesparse-config" if lib == "SuiteSparse_config" else "suitesparse-" + lib.lower() + update_port(pkg_name, new_version, suitesparse_hash) + update_manifest("suitesparse", suitesparse_version) + + +if __name__ == "__main__": + if len(sys.argv) != 2: + print("Usage: ./update_suitesparse.py ") + sys.exit(1) + suitesparse_version = sys.argv[1] + main(suitesparse_version) diff --git a/ports/suitesparse/vcpkg.json b/ports/suitesparse/vcpkg.json index 2ba1800c61825d..9bada7fdd78eb8 100644 --- a/ports/suitesparse/vcpkg.json +++ b/ports/suitesparse/vcpkg.json @@ -1,4 +1,5 @@ { + "$comment": "Use the suitesparse/update_suitesparse.py script to update all SuiteSparse ports", "name": "suitesparse", "version-semver": "7.8.1", "description": "A suite of sparse matrix algorithms", From 4efaf5d97fbb023527d2aa475cdcad4865b57cfb Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Tue, 27 Aug 2024 11:06:36 +0300 Subject: [PATCH 91/95] [SuiteSparse] update to v7.8.2 --- ports/suitesparse-config/portfile.cmake | 4 ++-- ports/suitesparse-config/vcpkg.json | 2 +- ports/suitesparse-lagraph/portfile.cmake | 4 ++-- ports/suitesparse-lagraph/vcpkg.json | 2 +- ports/suitesparse-paru/portfile.cmake | 4 ++-- ports/suitesparse-paru/vcpkg.json | 2 +- ports/suitesparse-spex/portfile.cmake | 4 ++-- ports/suitesparse-spex/vcpkg.json | 2 +- ports/suitesparse/vcpkg.json | 2 +- 9 files changed, 13 insertions(+), 13 deletions(-) diff --git a/ports/suitesparse-config/portfile.cmake b/ports/suitesparse-config/portfile.cmake index ae9ea02aba59c9..55fb3660ef2e1b 100644 --- a/ports/suitesparse-config/portfile.cmake +++ b/ports/suitesparse-config/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO DrTimothyAldenDavis/SuiteSparse - REF v${VERSION} - SHA512 d07709ad8567e5fe954f04d0c38a95a5610394aaa5ff5c809518c378b937d20556114b95c9dc052b316c8e8fcbb2eca294b425b21e8bbfa5c04f72c6f15a5eb6 + REF v7.8.2 + SHA512 beb9ea85b47e46785a91913d0b52ef86a59f797f3a3a6df4fced31c4f990277ef627b6baae52256dea10e60e4eff5e82e8b5a3d6e20a63de47953674cf34f921 HEAD_REF dev ) diff --git a/ports/suitesparse-config/vcpkg.json b/ports/suitesparse-config/vcpkg.json index 5c5a1e431c3bb0..7e83e252189b0c 100644 --- a/ports/suitesparse-config/vcpkg.json +++ b/ports/suitesparse-config/vcpkg.json @@ -1,7 +1,7 @@ { "$comment": "Use the suitesparse/update_suitesparse.py script to update all SuiteSparse ports", "name": "suitesparse-config", - "version-semver": "7.8.1", + "version-semver": "7.8.2", "description": "Configuration for SuiteSparse libraries", "homepage": "https://people.engr.tamu.edu/davis/suitesparse.html", "license": "BSD-3-Clause", diff --git a/ports/suitesparse-lagraph/portfile.cmake b/ports/suitesparse-lagraph/portfile.cmake index 862faa7615d91b..8e406b4428cfaa 100644 --- a/ports/suitesparse-lagraph/portfile.cmake +++ b/ports/suitesparse-lagraph/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO DrTimothyAldenDavis/SuiteSparse - REF v7.8.1 - SHA512 d07709ad8567e5fe954f04d0c38a95a5610394aaa5ff5c809518c378b937d20556114b95c9dc052b316c8e8fcbb2eca294b425b21e8bbfa5c04f72c6f15a5eb6 + REF v7.8.2 + SHA512 beb9ea85b47e46785a91913d0b52ef86a59f797f3a3a6df4fced31c4f990277ef627b6baae52256dea10e60e4eff5e82e8b5a3d6e20a63de47953674cf34f921 HEAD_REF dev ) diff --git a/ports/suitesparse-lagraph/vcpkg.json b/ports/suitesparse-lagraph/vcpkg.json index 0bd08d5c387ba8..8564df462f2ee0 100644 --- a/ports/suitesparse-lagraph/vcpkg.json +++ b/ports/suitesparse-lagraph/vcpkg.json @@ -1,7 +1,7 @@ { "$comment": "Use the suitesparse/update_suitesparse.py script to update all SuiteSparse ports", "name": "suitesparse-lagraph", - "version-semver": "1.1.3", + "version-semver": "1.1.4", "description": "LAGraph: Library plus test harness for collecting algorithms that use GraphBLAS", "homepage": "https://lagraph.readthedocs.io/en/latest/", "license": "BSD-2-Clause", diff --git a/ports/suitesparse-paru/portfile.cmake b/ports/suitesparse-paru/portfile.cmake index 7365b4c19782fa..a6faf412adc8ee 100644 --- a/ports/suitesparse-paru/portfile.cmake +++ b/ports/suitesparse-paru/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO DrTimothyAldenDavis/SuiteSparse - REF v7.8.1 - SHA512 d07709ad8567e5fe954f04d0c38a95a5610394aaa5ff5c809518c378b937d20556114b95c9dc052b316c8e8fcbb2eca294b425b21e8bbfa5c04f72c6f15a5eb6 + REF v7.8.2 + SHA512 beb9ea85b47e46785a91913d0b52ef86a59f797f3a3a6df4fced31c4f990277ef627b6baae52256dea10e60e4eff5e82e8b5a3d6e20a63de47953674cf34f921 HEAD_REF dev ) diff --git a/ports/suitesparse-paru/vcpkg.json b/ports/suitesparse-paru/vcpkg.json index 2a9752f69580d9..970c1100788d17 100644 --- a/ports/suitesparse-paru/vcpkg.json +++ b/ports/suitesparse-paru/vcpkg.json @@ -1,7 +1,7 @@ { "$comment": "Use the suitesparse/update_suitesparse.py script to update all SuiteSparse ports", "name": "suitesparse-paru", - "version-semver": "0.2.0", + "version-semver": "0.3.0", "description": "ParU: Routines for solving sparse linear system via parallel multifrontal LU factorization algorithms in SuiteSparse", "homepage": "https://people.engr.tamu.edu/davis/suitesparse.html", "license": "GPL-3.0-or-later", diff --git a/ports/suitesparse-spex/portfile.cmake b/ports/suitesparse-spex/portfile.cmake index 98647173647aba..b52a1c88eb2b2d 100644 --- a/ports/suitesparse-spex/portfile.cmake +++ b/ports/suitesparse-spex/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO DrTimothyAldenDavis/SuiteSparse - REF v7.8.1 - SHA512 d07709ad8567e5fe954f04d0c38a95a5610394aaa5ff5c809518c378b937d20556114b95c9dc052b316c8e8fcbb2eca294b425b21e8bbfa5c04f72c6f15a5eb6 + REF v7.8.2 + SHA512 beb9ea85b47e46785a91913d0b52ef86a59f797f3a3a6df4fced31c4f990277ef627b6baae52256dea10e60e4eff5e82e8b5a3d6e20a63de47953674cf34f921 HEAD_REF dev ) diff --git a/ports/suitesparse-spex/vcpkg.json b/ports/suitesparse-spex/vcpkg.json index 6139785c823213..37ac0ba69f8642 100644 --- a/ports/suitesparse-spex/vcpkg.json +++ b/ports/suitesparse-spex/vcpkg.json @@ -1,7 +1,7 @@ { "$comment": "Use the suitesparse/update_suitesparse.py script to update all SuiteSparse ports", "name": "suitesparse-spex", - "version-semver": "3.2.0", + "version-semver": "3.2.1", "description": "SPEX: Software package for SParse EXact algebra in SuiteSparse", "homepage": "https://people.engr.tamu.edu/davis/suitesparse.html", "license": "GPL-2.0-or-later OR LGPL-3.0-or-later", diff --git a/ports/suitesparse/vcpkg.json b/ports/suitesparse/vcpkg.json index 9bada7fdd78eb8..6989462aa37002 100644 --- a/ports/suitesparse/vcpkg.json +++ b/ports/suitesparse/vcpkg.json @@ -1,7 +1,7 @@ { "$comment": "Use the suitesparse/update_suitesparse.py script to update all SuiteSparse ports", "name": "suitesparse", - "version-semver": "7.8.1", + "version-semver": "7.8.2", "description": "A suite of sparse matrix algorithms", "homepage": "https://people.engr.tamu.edu/davis/suitesparse.html", "license": null, From b37eb81e41716aed75fb674a046621342e3518c8 Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Tue, 27 Aug 2024 11:09:30 +0300 Subject: [PATCH 92/95] [SuiteSparse] use lower-case `share/suitesparse` subdir --- ports/suitesparse-cholmod/portfile.cmake | 2 +- ports/suitesparse-config/portfile.cmake | 2 +- ports/suitesparse-klu/portfile.cmake | 2 +- ports/suitesparse-paru/portfile.cmake | 2 +- ports/suitesparse-spqr/portfile.cmake | 2 +- ports/suitesparse-umfpack/portfile.cmake | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ports/suitesparse-cholmod/portfile.cmake b/ports/suitesparse-cholmod/portfile.cmake index ff45c55295982b..98dd0cc0cf036e 100644 --- a/ports/suitesparse-cholmod/portfile.cmake +++ b/ports/suitesparse-cholmod/portfile.cmake @@ -9,7 +9,7 @@ vcpkg_from_github( set(PACKAGE_NAME CHOLMOD) configure_file( - "${CURRENT_INSTALLED_DIR}/share/SuiteSparse/SuiteSparseBLAS.cmake" + "${CURRENT_INSTALLED_DIR}/share/suitesparse/SuiteSparseBLAS.cmake" "${SOURCE_PATH}/SuiteSparse_config/cmake_modules/SuiteSparseBLAS.cmake" COPYONLY ) diff --git a/ports/suitesparse-config/portfile.cmake b/ports/suitesparse-config/portfile.cmake index 55fb3660ef2e1b..95dcf1fc000b29 100644 --- a/ports/suitesparse-config/portfile.cmake +++ b/ports/suitesparse-config/portfile.cmake @@ -39,7 +39,7 @@ vcpkg_cmake_install() # Move SuiteSparseBLAS.cmake, SuiteSparsePolicy.cmake etc files file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share") -file(RENAME "${CURRENT_PACKAGES_DIR}/lib/cmake/SuiteSparse" "${CURRENT_PACKAGES_DIR}/share/SuiteSparse") +file(RENAME "${CURRENT_PACKAGES_DIR}/lib/cmake/SuiteSparse" "${CURRENT_PACKAGES_DIR}/share/suitesparse") vcpkg_cmake_config_fixup( PACKAGE_NAME ${PACKAGE_NAME} diff --git a/ports/suitesparse-klu/portfile.cmake b/ports/suitesparse-klu/portfile.cmake index 2369fb0a399cfd..7c8d616925f4d9 100644 --- a/ports/suitesparse-klu/portfile.cmake +++ b/ports/suitesparse-klu/portfile.cmake @@ -9,7 +9,7 @@ vcpkg_from_github( set(PACKAGE_NAME KLU) configure_file( - "${CURRENT_INSTALLED_DIR}/share/SuiteSparse/SuiteSparseBLAS.cmake" + "${CURRENT_INSTALLED_DIR}/share/suitesparse/SuiteSparseBLAS.cmake" "${SOURCE_PATH}/SuiteSparse_config/cmake_modules/SuiteSparseBLAS.cmake" COPYONLY ) diff --git a/ports/suitesparse-paru/portfile.cmake b/ports/suitesparse-paru/portfile.cmake index a6faf412adc8ee..d597e1533ab21e 100644 --- a/ports/suitesparse-paru/portfile.cmake +++ b/ports/suitesparse-paru/portfile.cmake @@ -9,7 +9,7 @@ vcpkg_from_github( set(PACKAGE_NAME ParU) configure_file( - "${CURRENT_INSTALLED_DIR}/share/SuiteSparse/SuiteSparseBLAS.cmake" + "${CURRENT_INSTALLED_DIR}/share/suitesparse/SuiteSparseBLAS.cmake" "${SOURCE_PATH}/SuiteSparse_config/cmake_modules/SuiteSparseBLAS.cmake" COPYONLY ) diff --git a/ports/suitesparse-spqr/portfile.cmake b/ports/suitesparse-spqr/portfile.cmake index 1ffaa1cb0355a1..01b9ba73f44882 100644 --- a/ports/suitesparse-spqr/portfile.cmake +++ b/ports/suitesparse-spqr/portfile.cmake @@ -9,7 +9,7 @@ vcpkg_from_github( set(PACKAGE_NAME SPQR) configure_file( - "${CURRENT_INSTALLED_DIR}/share/SuiteSparse/SuiteSparseBLAS.cmake" + "${CURRENT_INSTALLED_DIR}/share/suitesparse/SuiteSparseBLAS.cmake" "${SOURCE_PATH}/SuiteSparse_config/cmake_modules/SuiteSparseBLAS.cmake" COPYONLY ) diff --git a/ports/suitesparse-umfpack/portfile.cmake b/ports/suitesparse-umfpack/portfile.cmake index 4e2093b4b3dd99..8f3f6476d2d2f4 100644 --- a/ports/suitesparse-umfpack/portfile.cmake +++ b/ports/suitesparse-umfpack/portfile.cmake @@ -9,7 +9,7 @@ vcpkg_from_github( set(PACKAGE_NAME UMFPACK) configure_file( - "${CURRENT_INSTALLED_DIR}/share/SuiteSparse/SuiteSparseBLAS.cmake" + "${CURRENT_INSTALLED_DIR}/share/suitesparse/SuiteSparseBLAS.cmake" "${SOURCE_PATH}/SuiteSparse_config/cmake_modules/SuiteSparseBLAS.cmake" COPYONLY ) From b3aa13723188a97295a98269ff5c41995b14e65d Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Tue, 27 Aug 2024 11:12:07 +0300 Subject: [PATCH 93/95] vdb --- versions/baseline.json | 10 +++++----- versions/s-/suitesparse-amd.json | 2 +- versions/s-/suitesparse-btf.json | 2 +- versions/s-/suitesparse-camd.json | 2 +- versions/s-/suitesparse-ccolamd.json | 2 +- versions/s-/suitesparse-cholmod.json | 2 +- versions/s-/suitesparse-colamd.json | 2 +- versions/s-/suitesparse-config.json | 4 ++-- versions/s-/suitesparse-cxsparse.json | 2 +- versions/s-/suitesparse-graphblas.json | 2 +- versions/s-/suitesparse-klu.json | 2 +- versions/s-/suitesparse-lagraph.json | 4 ++-- versions/s-/suitesparse-ldl.json | 2 +- versions/s-/suitesparse-mongoose.json | 2 +- versions/s-/suitesparse-paru.json | 4 ++-- versions/s-/suitesparse-rbio.json | 2 +- versions/s-/suitesparse-spex.json | 4 ++-- versions/s-/suitesparse-spqr.json | 2 +- versions/s-/suitesparse-umfpack.json | 2 +- versions/s-/suitesparse.json | 4 ++-- 20 files changed, 29 insertions(+), 29 deletions(-) diff --git a/versions/baseline.json b/versions/baseline.json index 18388e6cfd76f4..2d978a34eb465b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8645,7 +8645,7 @@ "port-version": 8 }, "suitesparse": { - "baseline": "7.8.1", + "baseline": "7.8.2", "port-version": 0 }, "suitesparse-amd": { @@ -8673,7 +8673,7 @@ "port-version": 0 }, "suitesparse-config": { - "baseline": "7.8.1", + "baseline": "7.8.2", "port-version": 0 }, "suitesparse-cxsparse": { @@ -8689,7 +8689,7 @@ "port-version": 0 }, "suitesparse-lagraph": { - "baseline": "1.1.3", + "baseline": "1.1.4", "port-version": 0 }, "suitesparse-ldl": { @@ -8701,7 +8701,7 @@ "port-version": 0 }, "suitesparse-paru": { - "baseline": "0.2.0", + "baseline": "0.3.0", "port-version": 0 }, "suitesparse-rbio": { @@ -8709,7 +8709,7 @@ "port-version": 0 }, "suitesparse-spex": { - "baseline": "3.2.0", + "baseline": "3.2.1", "port-version": 0 }, "suitesparse-spqr": { diff --git a/versions/s-/suitesparse-amd.json b/versions/s-/suitesparse-amd.json index 0c51582d0872e1..526db29638a41b 100644 --- a/versions/s-/suitesparse-amd.json +++ b/versions/s-/suitesparse-amd.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "8432640163f19d91cb2e0c45364644e0487ff093", + "git-tree": "257ff4be1ed40606af339b6693d468f3ae12a86d", "version-semver": "3.3.3", "port-version": 0 } diff --git a/versions/s-/suitesparse-btf.json b/versions/s-/suitesparse-btf.json index 97ae100dd658c4..5a1f7ee3c666e2 100644 --- a/versions/s-/suitesparse-btf.json +++ b/versions/s-/suitesparse-btf.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "1c55edd14ca31b7c339057014cdf2c49181a298f", + "git-tree": "264291ecefce3e3233aed9a297651f9f38866945", "version-semver": "2.3.2", "port-version": 0 } diff --git a/versions/s-/suitesparse-camd.json b/versions/s-/suitesparse-camd.json index 3bc4437a0aaf87..402053b832b295 100644 --- a/versions/s-/suitesparse-camd.json +++ b/versions/s-/suitesparse-camd.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "87b9283062e0a69062d52e31ca5d30968903f192", + "git-tree": "b5ed213a02a6f2f5d386d385adcf240dd6cc5001", "version-semver": "3.3.3", "port-version": 0 } diff --git a/versions/s-/suitesparse-ccolamd.json b/versions/s-/suitesparse-ccolamd.json index e011f2f93a966d..6dd4a5d71cc22c 100644 --- a/versions/s-/suitesparse-ccolamd.json +++ b/versions/s-/suitesparse-ccolamd.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "bca9db27f636a5e0df62997cf4dd9da3cb2ba849", + "git-tree": "a4d04e8e5365852006418256ab3fe8a30ff7e3ad", "version-semver": "3.3.4", "port-version": 0 } diff --git a/versions/s-/suitesparse-cholmod.json b/versions/s-/suitesparse-cholmod.json index 5e301e92230dc6..9bd0a8de95349a 100644 --- a/versions/s-/suitesparse-cholmod.json +++ b/versions/s-/suitesparse-cholmod.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "9fbc74627b30a8ac49eae2d1f2ced6b31647c367", + "git-tree": "61aa1f95153d89b64716cedadacfa23502e09e3a", "version-semver": "5.3.0", "port-version": 0 } diff --git a/versions/s-/suitesparse-colamd.json b/versions/s-/suitesparse-colamd.json index 259f62f39d28af..26f7a259c58e9e 100644 --- a/versions/s-/suitesparse-colamd.json +++ b/versions/s-/suitesparse-colamd.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "1fddd25ebb0075e5c246a635dc45d4161ae55a18", + "git-tree": "ee2cb1f71a6b8d46bd28fec6d2323ad322430e6a", "version-semver": "3.3.4", "port-version": 0 } diff --git a/versions/s-/suitesparse-config.json b/versions/s-/suitesparse-config.json index ed32be09f71e77..5fb654d9b24803 100644 --- a/versions/s-/suitesparse-config.json +++ b/versions/s-/suitesparse-config.json @@ -1,8 +1,8 @@ { "versions": [ { - "git-tree": "db232c55bb00c6dede1ce74ef767a6bb292d6f2d", - "version-semver": "7.8.1", + "git-tree": "0c0496c7769b2de4dcefea8b133df1c7d93f3365", + "version-semver": "7.8.2", "port-version": 0 } ] diff --git a/versions/s-/suitesparse-cxsparse.json b/versions/s-/suitesparse-cxsparse.json index 089253b3e6efd6..057d2fec0ecd38 100644 --- a/versions/s-/suitesparse-cxsparse.json +++ b/versions/s-/suitesparse-cxsparse.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "e1fbbd6dc88b26c1a63ec615400a9fcd2abf0c52", + "git-tree": "7b2ec5b53e2b9d41e149b69d9f5121d126e3f7be", "version-semver": "4.4.1", "port-version": 0 } diff --git a/versions/s-/suitesparse-graphblas.json b/versions/s-/suitesparse-graphblas.json index 891702ceb10e57..28b7a893ccf9cb 100644 --- a/versions/s-/suitesparse-graphblas.json +++ b/versions/s-/suitesparse-graphblas.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "f4caa23b81701d0c2adaa0dbcbfdd0f5eb7e3245", + "git-tree": "1548f43df0e674f5b653d152dd78991fb18f0a17", "version-semver": "9.3.1", "port-version": 0 } diff --git a/versions/s-/suitesparse-klu.json b/versions/s-/suitesparse-klu.json index 855c4d55177340..c799802b441995 100644 --- a/versions/s-/suitesparse-klu.json +++ b/versions/s-/suitesparse-klu.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "8bc933e376a7f861ba3821a68f1ec8e6c5d90c10", + "git-tree": "fd3f89ae280c223b56a462330db21f4fddb66ffd", "version-semver": "2.3.4", "port-version": 0 } diff --git a/versions/s-/suitesparse-lagraph.json b/versions/s-/suitesparse-lagraph.json index 58279e6ba72d8d..c698af698e1472 100644 --- a/versions/s-/suitesparse-lagraph.json +++ b/versions/s-/suitesparse-lagraph.json @@ -1,8 +1,8 @@ { "versions": [ { - "git-tree": "f4dba6bc55d31aac51ddfdac05e1e9744128db26", - "version-semver": "1.1.3", + "git-tree": "dcba31e7a311c2e6d01b90cbde148da291053a7b", + "version-semver": "1.1.4", "port-version": 0 } ] diff --git a/versions/s-/suitesparse-ldl.json b/versions/s-/suitesparse-ldl.json index 987e820d38d476..7e659b57ca5124 100644 --- a/versions/s-/suitesparse-ldl.json +++ b/versions/s-/suitesparse-ldl.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "46a505fcbaf3255b2fcb0e2b17e42b1bbac5e436", + "git-tree": "c2ceca24e074a6fc39b3e0b8e09254dc72bf8699", "version-semver": "3.3.2", "port-version": 0 } diff --git a/versions/s-/suitesparse-mongoose.json b/versions/s-/suitesparse-mongoose.json index a055d4f8338bab..1c3433b02851a7 100644 --- a/versions/s-/suitesparse-mongoose.json +++ b/versions/s-/suitesparse-mongoose.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "9fe69f635eed0e602dbf94c728e0664e9d36e0a3", + "git-tree": "6187a549802889ed39cc5446645486c816978555", "version-semver": "3.3.4", "port-version": 0 } diff --git a/versions/s-/suitesparse-paru.json b/versions/s-/suitesparse-paru.json index 4c939233c8ca74..4b0437756cb8a5 100644 --- a/versions/s-/suitesparse-paru.json +++ b/versions/s-/suitesparse-paru.json @@ -1,8 +1,8 @@ { "versions": [ { - "git-tree": "f267866793db7de357631cf0d52803bbdb86f033", - "version-semver": "0.2.0", + "git-tree": "dde9f8161e8c6e45f97c7ea19a70afe54db0aa36", + "version-semver": "0.3.0", "port-version": 0 } ] diff --git a/versions/s-/suitesparse-rbio.json b/versions/s-/suitesparse-rbio.json index e5eca446459c27..d798f29dceec9c 100644 --- a/versions/s-/suitesparse-rbio.json +++ b/versions/s-/suitesparse-rbio.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "dcc8d575b5178b60467225b5a9343d6c6049fe0b", + "git-tree": "9f092f93478865aa4cedac0441ad79736b397e16", "version-semver": "4.3.3", "port-version": 0 } diff --git a/versions/s-/suitesparse-spex.json b/versions/s-/suitesparse-spex.json index 0c502aaa5cb738..42a6f996a4052c 100644 --- a/versions/s-/suitesparse-spex.json +++ b/versions/s-/suitesparse-spex.json @@ -1,8 +1,8 @@ { "versions": [ { - "git-tree": "fcee12db786b1ea3253ce5f80c655608ada9ff8f", - "version-semver": "3.2.0", + "git-tree": "088456eafb6a5bdbfc6b95ed53e4b37f8f1e805d", + "version-semver": "3.2.1", "port-version": 0 } ] diff --git a/versions/s-/suitesparse-spqr.json b/versions/s-/suitesparse-spqr.json index 96545eb45f781b..c9440acdb83e34 100644 --- a/versions/s-/suitesparse-spqr.json +++ b/versions/s-/suitesparse-spqr.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "8f13fa814a90cafde895e28e4e057ec8307d6add", + "git-tree": "bf7802b1850cc119ecef8015a4c06da698ae3c71", "version-semver": "4.3.4", "port-version": 0 } diff --git a/versions/s-/suitesparse-umfpack.json b/versions/s-/suitesparse-umfpack.json index 8e1f1e47a4f625..cf01b562aa865e 100644 --- a/versions/s-/suitesparse-umfpack.json +++ b/versions/s-/suitesparse-umfpack.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "40f8e747af836d32ee33b9f1bfc8c57ed871bc4f", + "git-tree": "cc57736cfd9f5a572554a707de66031aa66dca36", "version-semver": "6.3.4", "port-version": 0 } diff --git a/versions/s-/suitesparse.json b/versions/s-/suitesparse.json index b7facadcf0dc05..703ba0fa0d6a88 100644 --- a/versions/s-/suitesparse.json +++ b/versions/s-/suitesparse.json @@ -1,8 +1,8 @@ { "versions": [ { - "git-tree": "b25218719c028623de9df3bd5eee9ac103cc9bf2", - "version-semver": "7.8.1", + "git-tree": "47e6b00b9260ffb06ec90aaee126382ccb189c92", + "version-semver": "7.8.2", "port-version": 0 }, { From f58ac5d0eb2672a4a6ec1a53b9b1c068d7dd3e9b Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Tue, 27 Aug 2024 11:15:26 +0300 Subject: [PATCH 94/95] [theia] drop REQUIRED from `find_dependency(Ceres REQUIRED)` --- ports/theia/fix-external-dependencies.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/theia/fix-external-dependencies.patch b/ports/theia/fix-external-dependencies.patch index 08fc1ce4f0aa5c..78df9f781d6e43 100644 --- a/ports/theia/fix-external-dependencies.patch +++ b/ports/theia/fix-external-dependencies.patch @@ -243,7 +243,7 @@ index a3ea187..7e9d912 100644 - theia_report_not_found("Missing required Theia " - "dependency: Ceres, please set CERES_INCLUDE_DIR.") -endif (CERES_FOUND) -+find_dependency(Ceres REQUIRED) ++find_dependency(Ceres) list(APPEND THEIA_INCLUDE_DIRS ${CERES_INCLUDE_DIRS}) # Glog. From 99dcf8acbe4a3500fd25236d569853876bd1f0ef Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Tue, 27 Aug 2024 11:15:48 +0300 Subject: [PATCH 95/95] vdb --- versions/t-/theia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/t-/theia.json b/versions/t-/theia.json index fb1585fd9d7179..93a6450856f158 100644 --- a/versions/t-/theia.json +++ b/versions/t-/theia.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "3588164d3fa43a79ed02cf4c6f69565d27996e83", + "git-tree": "e9a4503be5f25d2ae3909164770e96c69416d5a6", "version": "0.8", "port-version": 11 },