commit: e8d067ddd94ab22d8289778eed92b71582feabfe
Author: Sv. Lockal <lockalsash <AT> gmail <DOT> com>
AuthorDate: Thu Jan 30 14:20:17 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Feb 13 08:35:21 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8d067dd
sci-libs/rocSOLVER: drop 5.1.3-r1, 5.4.2
Signed-off-by: Sv. Lockal <lockalsash <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-libs/rocSOLVER/Manifest | 2 -
.../files/rocSOLVER-4.2.0-add-stdint-header.patch | 12 --
.../rocSOLVER/files/rocSOLVER-5.0.2-libfmt8.patch | 173 ---------------------
.../rocSOLVER/files/rocSOLVER-5.4.2-libfmt9.patch | 34 ----
sci-libs/rocSOLVER/rocSOLVER-5.1.3-r1.ebuild | 78 ----------
sci-libs/rocSOLVER/rocSOLVER-5.4.2.ebuild | 68 --------
6 files changed, 367 deletions(-)
diff --git a/sci-libs/rocSOLVER/Manifest b/sci-libs/rocSOLVER/Manifest
index 98fdd27b993f..906cfee0a9e7 100644
--- a/sci-libs/rocSOLVER/Manifest
+++ b/sci-libs/rocSOLVER/Manifest
@@ -1,5 +1,3 @@
-DIST rocSOLVER-5.1.3.tar.gz 545627 BLAKE2B
2cca24a1310efba7f8c66d1614fb50704221ebc8aa50d6aba11083baf9a7427575642fd28218ce80f8a7b83d3406348c2dd18373fb32e533509d01d37cf06927
SHA512
38e7a4ed6b67e83960ad3416d1008f82f895d19dc85427cd6f9c76f00b1ce18f78a4dd73d1ab53ffe81588890cd5545315029e903e2e09b85d6cfb854d405753
-DIST rocSOLVER-5.4.2.tar.gz 674866 BLAKE2B
0628353d567da92e3f7c3a11e19859329f3ea916184d554ee9c7172084ee4698c93408f397f493331d4dc47d833c56ead41bb4445081ba9ac73809ca0478770c
SHA512
b3a60c65a18c3864568e1e0b1524850eb1b322f6005cf8a2763c9b457e43e03c8ce74be1d13f3cc3adef1f6ac979f54fb903831f4a60447a9a915a40dcbe5ff6
DIST rocSOLVER-5.7.1.tar.gz 1859403 BLAKE2B
f7a40494deda9dd66f2fb2f57e13665688e89e1f82733701ec60a520bc4b9f7d5899ada618a37e73baa3a910757be4f11d5fced5d4d2ad82c56918b34d265511
SHA512
78e0a2b5b069378696afebf5e3e023449b3d7705aa79099eb7721c142d7525255825b41bf413324c33178091315e3909980a1bf0cbb66e0891c85e757858ee1c
DIST rocSOLVER-6.1.1.tar.gz 2971118 BLAKE2B
2611b6b65704e7cd64df682728013f07d20c6e17e6729cec7befb91dbed57aabaaed2887a252d4ae610fe0bcb336dfcd4b98d63c107694c22e35be06d06363db
SHA512
a96901226cbe5b410fa2885023a080b5ca7dc4659be92b363c37e10eba97d3da09d97488ecdc040452a535ad3284017c64b3b68646f258655583302baa009f34
DIST rocSOLVER-6.3.0.tar.gz 3077185 BLAKE2B
2ac2260aa631756d32a92b9386bda16a46a1b16922072d6962497b2f009c237a0386cc0006ffdd56e6396322fc2408d49fc18e2ccd7120492a2270fce3eba3d9
SHA512
a2655cce8c2eb287893988e8b69e77e2dbcad0f627fac74916be2789cd3357cf29f3e3090a9c88a86ef9a0e80dd0aa949ddfb145a6a0d1c128eac0a8fe708d94
diff --git a/sci-libs/rocSOLVER/files/rocSOLVER-4.2.0-add-stdint-header.patch
b/sci-libs/rocSOLVER/files/rocSOLVER-4.2.0-add-stdint-header.patch
deleted file mode 100644
index 4afff8f467ea..000000000000
--- a/sci-libs/rocSOLVER/files/rocSOLVER-4.2.0-add-stdint-header.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-fix compilation error rocsolver-extra-types.h:11:9: error: unknown type name
'uint32_t'
---- a/library/include/rocsolver-extra-types.h
-+++ b/library/include/rocsolver-extra-types.h
-@@ -5,6 +5,8 @@
- #ifndef ROCSOLVER_EXTRAS_H_
- #define ROCSOLVER_EXTRAS_H_
-
-+#include "stdint.h"
-+
- /*! \brief Used to specify the logging layer mode using a bitwise combination
- *of rocblas_layer_mode values.
-
********************************************************************************/
diff --git a/sci-libs/rocSOLVER/files/rocSOLVER-5.0.2-libfmt8.patch
b/sci-libs/rocSOLVER/files/rocSOLVER-5.0.2-libfmt8.patch
deleted file mode 100644
index 3f2c0553689b..000000000000
--- a/sci-libs/rocSOLVER/files/rocSOLVER-5.0.2-libfmt8.patch
+++ /dev/null
@@ -1,173 +0,0 @@
-Backported from upstream to fix dev-cpp/libfmt-8 compatibility
-
-remove changes of CHANGELOG.md from original git commit
-
-From 2bbfb8976f6e4d667499c77e41a6433850063e88 Mon Sep 17 00:00:00 2001
-From: Cory Bloor <cordell.bl...@amd.com>
-Date: Tue, 8 Feb 2022 23:53:57 -0700
-Subject: [PATCH] Fix compatibility with fmt v8.1 (#371)
-
-* Make rocsolver_logvalue fmt specializations const
-
-This allows for compile-time format string processing in fmt v8.0.
-
-* Fix compatibility with fmt v7.1
-
-* Update CHANGELOG.md
----
- CHANGELOG.md | 2 ++
- library/src/include/rocsolver_logvalue.hpp | 38 +++++++++++++---------
- 2 files changed, 25 insertions(+), 15 deletions(-)
-
-diff --git a/library/src/include/rocsolver_logvalue.hpp
b/library/src/include/rocsolver_logvalue.hpp
-index 199f8d57d..9b3791031 100644
---- a/library/src/include/rocsolver_logvalue.hpp
-+++ b/library/src/include/rocsolver_logvalue.hpp
-@@ -1,5 +1,5 @@
- /* ************************************************************************
-- * Copyright (c) 2021 Advanced Micro Devices, Inc.
-+ * Copyright (c) 2021-2022 Advanced Micro Devices, Inc.
- * ************************************************************************ */
-
- #pragma once
-@@ -8,6 +8,14 @@
-
- #include "rocsolver_datatype2string.hpp"
-
-+/* The format function for user-defined types cannot be const before fmt v8.0
-+ but must be const in fmt v8.1 if the type is used in a tuple. */
-+#if FMT_VERSION < 80000
-+#define ROCSOLVER_FMT_CONST
-+#else
-+#define ROCSOLVER_FMT_CONST const
-+#endif
-+
- /***************************************************************************
- * Wrapper for types passed to logger, so we can more easily adjust the
- * default way of printing built-in types without doing it globally. (e.g.
-@@ -37,7 +45,7 @@ template <typename T>
- struct formatter<rocsolver_logvalue<T>> : formatter<T>
- {
- template <typename FormatCtx>
-- auto format(rocsolver_logvalue<T> wrapper, FormatCtx& ctx)
-+ auto format(rocsolver_logvalue<T> wrapper, FormatCtx& ctx)
ROCSOLVER_FMT_CONST
- {
- return formatter<T>::format(wrapper.value, ctx);
- }
-@@ -49,7 +57,7 @@ template <>
- struct formatter<rocsolver_logvalue<bool>> : formatter<char>
- {
- template <typename FormatCtx>
-- auto format(rocsolver_logvalue<bool> wrapper, FormatCtx& ctx)
-+ auto format(rocsolver_logvalue<bool> wrapper, FormatCtx& ctx)
ROCSOLVER_FMT_CONST
- {
- return formatter<char>::format(wrapper.value ? '1' : '0', ctx);
- }
-@@ -58,7 +66,7 @@ template <>
- struct formatter<rocsolver_logvalue<rocblas_operation>> : formatter<char>
- {
- template <typename FormatCtx>
-- auto format(rocsolver_logvalue<rocblas_operation> wrapper, FormatCtx& ctx)
-+ auto format(rocsolver_logvalue<rocblas_operation> wrapper, FormatCtx&
ctx) ROCSOLVER_FMT_CONST
- {
- return formatter<char>::format(rocblas2char_operation(wrapper.value),
ctx);
- }
-@@ -67,7 +75,7 @@ template <>
- struct formatter<rocsolver_logvalue<rocblas_fill>> : formatter<char>
- {
- template <typename FormatCtx>
-- auto format(rocsolver_logvalue<rocblas_fill> wrapper, FormatCtx& ctx)
-+ auto format(rocsolver_logvalue<rocblas_fill> wrapper, FormatCtx& ctx)
ROCSOLVER_FMT_CONST
- {
- return formatter<char>::format(rocblas2char_fill(wrapper.value), ctx);
- }
-@@ -76,7 +84,7 @@ template <>
- struct formatter<rocsolver_logvalue<rocblas_diagonal>> : formatter<char>
- {
- template <typename FormatCtx>
-- auto format(rocsolver_logvalue<rocblas_diagonal> wrapper, FormatCtx& ctx)
-+ auto format(rocsolver_logvalue<rocblas_diagonal> wrapper, FormatCtx& ctx)
ROCSOLVER_FMT_CONST
- {
- return formatter<char>::format(rocblas2char_diagonal(wrapper.value),
ctx);
- }
-@@ -85,7 +93,7 @@ template <>
- struct formatter<rocsolver_logvalue<rocblas_side>> : formatter<char>
- {
- template <typename FormatCtx>
-- auto format(rocsolver_logvalue<rocblas_side> wrapper, FormatCtx& ctx)
-+ auto format(rocsolver_logvalue<rocblas_side> wrapper, FormatCtx& ctx)
ROCSOLVER_FMT_CONST
- {
- return formatter<char>::format(rocblas2char_side(wrapper.value), ctx);
- }
-@@ -94,7 +102,7 @@ template <>
- struct formatter<rocsolver_logvalue<rocblas_direct>> : formatter<char>
- {
- template <typename FormatCtx>
-- auto format(rocsolver_logvalue<rocblas_direct> wrapper, FormatCtx& ctx)
-+ auto format(rocsolver_logvalue<rocblas_direct> wrapper, FormatCtx& ctx)
ROCSOLVER_FMT_CONST
- {
- return formatter<char>::format(rocblas2char_direct(wrapper.value),
ctx);
- }
-@@ -104,7 +112,7 @@ template <>
- struct formatter<rocsolver_logvalue<rocblas_storev>> : formatter<char>
- {
- template <typename FormatCtx>
-- auto format(rocsolver_logvalue<rocblas_storev> wrapper, FormatCtx& ctx)
-+ auto format(rocsolver_logvalue<rocblas_storev> wrapper, FormatCtx& ctx)
ROCSOLVER_FMT_CONST
- {
- return formatter<char>::format(rocblas2char_storev(wrapper.value),
ctx);
- }
-@@ -113,7 +121,7 @@ template <>
- struct formatter<rocsolver_logvalue<rocblas_workmode>> : formatter<char>
- {
- template <typename FormatCtx>
-- auto format(rocsolver_logvalue<rocblas_workmode> wrapper, FormatCtx& ctx)
-+ auto format(rocsolver_logvalue<rocblas_workmode> wrapper, FormatCtx& ctx)
ROCSOLVER_FMT_CONST
- {
- return formatter<char>::format(rocblas2char_workmode(wrapper.value),
ctx);
- }
-@@ -122,7 +130,7 @@ template <>
- struct formatter<rocsolver_logvalue<rocblas_svect>> : formatter<char>
- {
- template <typename FormatCtx>
-- auto format(rocsolver_logvalue<rocblas_svect> wrapper, FormatCtx& ctx)
-+ auto format(rocsolver_logvalue<rocblas_svect> wrapper, FormatCtx& ctx)
ROCSOLVER_FMT_CONST
- {
- return formatter<char>::format(rocblas2char_svect(wrapper.value),
ctx);
- }
-@@ -131,7 +139,7 @@ template <>
- struct formatter<rocsolver_logvalue<rocblas_evect>> : formatter<char>
- {
- template <typename FormatCtx>
-- auto format(rocsolver_logvalue<rocblas_evect> wrapper, FormatCtx& ctx)
-+ auto format(rocsolver_logvalue<rocblas_evect> wrapper, FormatCtx& ctx)
ROCSOLVER_FMT_CONST
- {
- return formatter<char>::format(rocblas2char_evect(wrapper.value),
ctx);
- }
-@@ -140,7 +148,7 @@ template <>
- struct formatter<rocsolver_logvalue<rocblas_eform>> : formatter<char>
- {
- template <typename FormatCtx>
-- auto format(rocsolver_logvalue<rocblas_eform> wrapper, FormatCtx& ctx)
-+ auto format(rocsolver_logvalue<rocblas_eform> wrapper, FormatCtx& ctx)
ROCSOLVER_FMT_CONST
- {
- return formatter<char>::format(rocblas2char_eform(wrapper.value),
ctx);
- }
-@@ -149,7 +157,7 @@ template <>
- struct formatter<rocsolver_logvalue<rocblas_datatype>> :
formatter<string_view>
- {
- template <typename FormatCtx>
-- auto format(rocsolver_logvalue<rocblas_datatype> wrapper, FormatCtx& ctx)
-+ auto format(rocsolver_logvalue<rocblas_datatype> wrapper, FormatCtx& ctx)
ROCSOLVER_FMT_CONST
- {
- return
formatter<string_view>::format(rocblas2string_datatype(wrapper.value), ctx);
- }
-@@ -158,7 +166,7 @@ template <>
- struct formatter<rocsolver_logvalue<rocblas_initialization>> :
formatter<string_view>
- {
- template <typename FormatCtx>
-- auto format(rocsolver_logvalue<rocblas_initialization> wrapper,
FormatCtx& ctx)
-+ auto format(rocsolver_logvalue<rocblas_initialization> wrapper,
FormatCtx& ctx) ROCSOLVER_FMT_CONST
- {
- return
formatter<string_view>::format(rocblas2string_initialization(wrapper.value),
ctx);
- }
diff --git a/sci-libs/rocSOLVER/files/rocSOLVER-5.4.2-libfmt9.patch
b/sci-libs/rocSOLVER/files/rocSOLVER-5.4.2-libfmt9.patch
deleted file mode 100644
index 3e0ef897b71e..000000000000
--- a/sci-libs/rocSOLVER/files/rocSOLVER-5.4.2-libfmt9.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-commit bafa8f30b6f83d5f02bb65bb47b2943a0cb3c290
-Author: Cory Bloor <cordell.bl...@amd.com>
-Date: Wed Jan 25 14:52:35 2023 -0700
-
- Fix use of fmt 9.0 and later in logging test (#515)
-
- The implicitly defined formatter that rocsolver was using for
- std::filesystem::path has been removed from fmt 9.0 and later.
-
- This change doesn't actually fix compatibility with the official
- fmt 9.0 or 9.1 releases, because those releases are still
- incompatible with HIP. However, the change is sufficient for using
- rocsolver with fmt@9 from Spack (because the fix has been backported).
-
-diff --git a/clients/gtest/logging_gtest.cpp b/clients/gtest/logging_gtest.cpp
-index e4f594a..da7ae04 100644
---- a/clients/gtest/logging_gtest.cpp
-+++ b/clients/gtest/logging_gtest.cpp
-@@ -1,5 +1,5 @@
- /* ************************************************************************
-- * Copyright (c) 2022 Advanced Micro Devices, Inc.
-+ * Copyright (c) 2022-2023 Advanced Micro Devices, Inc.
- * ************************************************************************ */
-
- #include <cstdlib>
-@@ -49,7 +49,7 @@ protected:
- {
- if(HasFailure() && std::getenv("ROCSOLVER_TEST_DEBUG"))
- fmt::print(stderr, "ROCSOLVER_TEST_DEBUG is set so {} was not
removed.\n",
-- log_filepath);
-+ log_filepath.string());
- else
- EXPECT_TRUE(fs::remove(log_filepath));
- }
diff --git a/sci-libs/rocSOLVER/rocSOLVER-5.1.3-r1.ebuild
b/sci-libs/rocSOLVER/rocSOLVER-5.1.3-r1.ebuild
deleted file mode 100644
index 7af286e20569..000000000000
--- a/sci-libs/rocSOLVER/rocSOLVER-5.1.3-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ROCM_VERSION=${PV}
-
-inherit cmake edo rocm
-
-DESCRIPTION="Implementation of a subset of LAPACK functionality on the ROCm
platform"
-HOMEPAGE="https://github.com/ROCmSoftwarePlatform/rocSOLVER";
-SRC_URI="https://github.com/ROCmSoftwarePlatform/rocSOLVER/archive/rocm-${PV}.tar.gz
-> rocSOLVER-${PV}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="~amd64"
-SLOT="0/$(ver_cut 1-2)"
-
-IUSE="test benchmark"
-REQUIRED_USE="${ROCM_REQUIRED_USE}"
-
-RDEPEND="dev-util/hip
- sci-libs/rocBLAS[${ROCM_USEDEP}]
- dev-libs/libfmt
- benchmark? ( virtual/blas )"
-DEPEND="${RDEPEND}"
-BDEPEND="test? ( dev-cpp/gtest
- >=dev-build/cmake-3.22
- virtual/blas )"
-
-PATCHES=(
- "${FILESDIR}/${PN}-4.2.0-add-stdint-header.patch"
- "${FILESDIR}/${PN}-5.0.2-libfmt8.patch"
-)
-
-RESTRICT="!test? ( test )"
-
-S=${WORKDIR}/${PN}-rocm-${PV}
-
-src_prepare() {
- sed -e "s: PREFIX rocsolver:# PREFIX rocsolver:" -i
library/src/CMakeLists.txt
- sed -e
"s:\$<INSTALL_INTERFACE\:include>:\$<INSTALL_INTERFACE\:include/rocsolver>:" -i
library/src/CMakeLists.txt
- sed -e "s:rocm_install_symlink_subdir( rocsolver
):#rocm_install_symlink_subdir( rocsolver ):" -i library/src/CMakeLists.txt
-
- cmake_src_prepare
-}
-
-src_configure() {
- # avoid sandbox violation
- addpredict /dev/kfd
- addpredict /dev/dri/
-
- local mycmakeargs=(
- -DCMAKE_SKIP_RPATH=On
- -DAMDGPU_TARGETS="$(get_amdgpu_flags)"
- -Wno-dev
- -DCMAKE_INSTALL_INCLUDEDIR="${EPREFIX}/usr/include/rocsolver"
- -DBUILD_CLIENTS_SAMPLES=NO
- -DBUILD_CLIENTS_TESTS=$(usex test ON OFF)
- -DBUILD_CLIENTS_BENCHMARKS=$(usex benchmark ON OFF)
- )
-
- CXX=hipcc cmake_src_configure
-}
-
-src_test() {
- check_amdgpu
- cd "${BUILD_DIR}"/clients/staging || die
- LD_LIBRARY_PATH="${BUILD_DIR}/library/src" edob ./rocsolver-test
-}
-
-src_install() {
- cmake_src_install
-
- if use benchmark; then
- cd "${BUILD_DIR}" || die
- dobin clients/staging/rocsolver-bench
- fi
-}
diff --git a/sci-libs/rocSOLVER/rocSOLVER-5.4.2.ebuild
b/sci-libs/rocSOLVER/rocSOLVER-5.4.2.ebuild
deleted file mode 100644
index 10fb52f40af2..000000000000
--- a/sci-libs/rocSOLVER/rocSOLVER-5.4.2.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ROCM_VERSION=${PV}
-
-inherit cmake edo rocm
-
-DESCRIPTION="Implementation of a subset of LAPACK functionality on the ROCm
platform"
-HOMEPAGE="https://github.com/ROCmSoftwarePlatform/rocSOLVER";
-SRC_URI="https://github.com/ROCmSoftwarePlatform/rocSOLVER/archive/rocm-${PV}.tar.gz
-> rocSOLVER-${PV}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="~amd64"
-SLOT="0/$(ver_cut 1-2)"
-
-IUSE="test benchmark"
-REQUIRED_USE="${ROCM_REQUIRED_USE}"
-
-RDEPEND="dev-util/hip
- sci-libs/rocBLAS[${ROCM_USEDEP}]
- dev-libs/libfmt
- benchmark? ( virtual/blas )"
-DEPEND="${RDEPEND}"
-BDEPEND="test? ( dev-cpp/gtest
- >=dev-build/cmake-3.22
- virtual/blas )"
-
-PATCHES=( "${FILESDIR}"/${PN}-5.4.2-libfmt9.patch )
-
-RESTRICT="!test? ( test )"
-
-S=${WORKDIR}/${PN}-rocm-${PV}
-
-src_configure() {
- # avoid sandbox violation
- addpredict /dev/kfd
- addpredict /dev/dri/
-
- local mycmakeargs=(
- -DCMAKE_SKIP_RPATH=On
- -DAMDGPU_TARGETS="$(get_amdgpu_flags)"
- -Wno-dev
- -DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF
- -DROCM_SYMLINK_LIBS=OFF
- -DBUILD_CLIENTS_SAMPLES=NO
- -DBUILD_CLIENTS_TESTS=$(usex test ON OFF)
- -DBUILD_CLIENTS_BENCHMARKS=$(usex benchmark ON OFF)
- )
-
- CXX=hipcc cmake_src_configure
-}
-
-src_test() {
- check_amdgpu
- cd "${BUILD_DIR}"/clients/staging || die
- LD_LIBRARY_PATH="${BUILD_DIR}/library/src" edob ./rocsolver-test
-}
-
-src_install() {
- cmake_src_install
-
- if use benchmark; then
- cd "${BUILD_DIR}" || die
- dobin clients/staging/rocsolver-bench
- fi
-}
