gentoo auto-resync : 29:07:2023 - 04:38:40

4 files changed, 109 insertions, 4 deletions

diff --git a/sci-libs/rocSOLVER/Manifest b/sci-libs/rocSOLVER/Manifest
index 588d5f089c78..37b286436a72 100644
--- a/sci-libs/rocSOLVER/Manifest
+++ b/sci-libs/rocSOLVER/Manifest
@@ -1,5 +1,8 @@
 AUX rocSOLVER-4.2.0-add-stdint-header.patch 475 BLAKE2B 268a1813d4e26dbaaa2360d0a187ce2a1448da075ae5f98a4a829c979411ab7e0c06f150ddcb445c9b295268a1e9f1770adbe7e68a1c3f84edde3c3477a57610 SHA512 ede56f9579e655ddd098ca9006612537f8ed61dc585274afe6b2b0bdee875431b62e0c6da6bc01e2cabeeb5244a91bb1e00b442bb549c075a286eefd8d9edc09
 AUX rocSOLVER-5.0.2-libfmt8.patch 7493 BLAKE2B 0327f78dd94f0102a5c4aabf13cab2ec6adaec3efee82acdb24d223b56a58bece34b505b9fdb2964ffa6f3f574730c2e74110e12e198fe26bc682ea294038749 SHA512 124dd445e188475777e3dee017f7380675594717b1e58458397780dc5c32ee8221935234954554510bd169af10a3bdb4fef0674bf93030081c5c12c1f3061a13
+AUX rocSOLVER-5.4.2-libfmt9.patch 1478 BLAKE2B a5f3774483c38bb059873509d326d46a5ec4b476578a76045e44d4826c4f2401edd5b2e0c0d9c20d906ba4efaf539bf1aad42183b1eafcaf28aa60a16f76efc1 SHA512 061286d3f328958c7d5ffc8a54322c5e2cb9d08b71f51ac4e76bcc06804624ac8181bba6c328da58e5f6c4410fbe778db43633bbfcac1afe2f5c49d9d238fac7
 DIST rocSOLVER-5.1.3.tar.gz 545627 BLAKE2B 2cca24a1310efba7f8c66d1614fb50704221ebc8aa50d6aba11083baf9a7427575642fd28218ce80f8a7b83d3406348c2dd18373fb32e533509d01d37cf06927 SHA512 38e7a4ed6b67e83960ad3416d1008f82f895d19dc85427cd6f9c76f00b1ce18f78a4dd73d1ab53ffe81588890cd5545315029e903e2e09b85d6cfb854d405753
-EBUILD rocSOLVER-5.1.3.ebuild 1950 BLAKE2B 0c2142709be8d8db1e3d0a3c080aeaf5f1feed16bcfdbf24dcecd3787b0364c6fa5cbd8c15d502e867bccfd7d892d16a17b4e91de1a06efee4fc86f15e0470fb SHA512 bb7b3a3894b236f7b8d49001477b83d32a4d8da69ef51fb408451ab98a5f59bf6788e0aff07f00ab2891d88d5baedce4af93f9c372d7e9bd2265dd3163e81eb5
+DIST rocSOLVER-5.4.2.tar.gz 674866 BLAKE2B 0628353d567da92e3f7c3a11e19859329f3ea916184d554ee9c7172084ee4698c93408f397f493331d4dc47d833c56ead41bb4445081ba9ac73809ca0478770c SHA512 b3a60c65a18c3864568e1e0b1524850eb1b322f6005cf8a2763c9b457e43e03c8ce74be1d13f3cc3adef1f6ac979f54fb903831f4a60447a9a915a40dcbe5ff6
+EBUILD rocSOLVER-5.1.3-r1.ebuild 1938 BLAKE2B 05ea30e478142505bf8eb663a142400c7ecdfbc5b0264419de95611729db25813d94f11024ec38c65ab6b21e42a77d44dde278cc92c6b22592b5cfe83ad9f004 SHA512 74eec8c4f41149317fc78c14346281dd45dd0644f1c4928ae649a2a29303bcd4d4716a64fec3e8e71a33a6d2ac5e21b41fc854cf0c3b7bed3abfa15bb3b45a0d
+EBUILD rocSOLVER-5.4.2.ebuild 1536 BLAKE2B 73c1d562c0978c24a59bebcd30437fb1e10c4c4867710d22a297dbc59a4e88e2ab0539d13575759bcbd88278360918814d575231e56784437edb90917ba2d4b8 SHA512 fb580d76b3b99b82a423d3279a69ded1909b08c6bbb4c64c32c61bfb930538b8d18880338ce3b50ab3f426e8aca91331ae4a2a22d417b06398d5a45e13e7e12b
 MISC metadata.xml 662 BLAKE2B 6dc116ac630fbd30c5f6c18d716bcd12bc994bfa0b2aea4eacf65e31507c24bb1eeed55942ee8e0b5bed8e361d28950d433c13136771673308dbf96906e270c9 SHA512 cc5cc6401303169dd423234615b748b38a58191b058befe0f40e8b8996fe50b3554b99a14f2f63c3596227aab43558f23c64ddce88172157366cc78d4aeefb56
diff --git a/sci-libs/rocSOLVER/files/rocSOLVER-5.4.2-libfmt9.patch b/sci-libs/rocSOLVER/files/rocSOLVER-5.4.2-libfmt9.patch
new file mode 100644
index 000000000000..3e0ef897b71e
--- /dev/null
+++ b/sci-libs/rocSOLVER/files/rocSOLVER-5.4.2-libfmt9.patch
@@ -0,0 +1,34 @@
+commit bafa8f30b6f83d5f02bb65bb47b2943a0cb3c290
+Author: Cory Bloor <Cordell.Bloor@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.ebuild b/sci-libs/rocSOLVER/rocSOLVER-5.1.3-r1.ebuild
index e2db9aba2a19..11cedfb8deff 100644
--- a/sci-libs/rocSOLVER/rocSOLVER-5.1.3.ebuild
+++ b/sci-libs/rocSOLVER/rocSOLVER-5.1.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -19,8 +19,8 @@ IUSE="test benchmark"
 REQUIRED_USE="${ROCM_REQUIRED_USE}"
 
 RDEPEND="dev-util/hip
-	sci-libs/rocBLAS:${SLOT}[${ROCM_USEDEP}]
-	=dev-libs/libfmt-8*
+	sci-libs/rocBLAS[${ROCM_USEDEP}]
+	dev-libs/libfmt
 	benchmark? ( virtual/blas )"
 DEPEND="${RDEPEND}"
 BDEPEND="test? ( dev-cpp/gtest
diff --git a/sci-libs/rocSOLVER/rocSOLVER-5.4.2.ebuild b/sci-libs/rocSOLVER/rocSOLVER-5.4.2.ebuild
new file mode 100644
index 000000000000..8088b8523a68
--- /dev/null
+++ b/sci-libs/rocSOLVER/rocSOLVER-5.4.2.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2023 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-util/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
+}