[gentoo-commits] repo/gentoo:master commit in: sci-libs/rocSOLVER/, sci-libs/rocRAND/, sci-libs/hipCUB/, sci-libs/rocPRIM/, ...

[Benda XU]

commit:     284e771bd39b4709afddcc3dd666f5f8665c3754
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Mon May  2 07:58:23 2022 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Mon May  2 08:24:41 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=284e771b

sci-libs/hipCUB: loosen the dependency on dev-util/hip

sci-libs/hipSPARSE:
sci-libs/rocPRIM:
sci-libs/rocRAND:
sci-libs/rocSOLVER:
sci-libs/rocSPARSE: same

The possibility is pointed out by Cory Bloor:

You can probably build the versions of rocBLAS and rocSOLVER tagged at
rocm-5.1.1 with the HIP stack from ROCm 4.3.1. Just be sure to rebuild
all the {roc,hip}{BLAS,SOLVER} libraries at the new tag, since they
all use private (unstable) APIs provided by rocBLAS.

The sci-libs/* ROCm packages should be aligned with sci-libs/rocBLAS,
while the other dev-*/* ROCm packages should be aligned with
dev-util/hip.

Credit: Cory Bloor
Suggested-by: Yiyang Wu <xgreenlandforwyy <AT> gmail.com>
Closes: https://bugs.gentoo.org/838394
Closes: https://bugs.gentoo.org/841982
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org>

 sci-libs/hipCUB/{hipCUB-4.3.0.ebuild => hipCUB-4.3.0-r1.ebuild}     | 4 ++--
 .../{hipSPARSE-4.3.0-r1.ebuild => hipSPARSE-4.3.0-r2.ebuild}        | 6 +++---
 .../rocPRIM/{rocPRIM-4.3.0-r1.ebuild => rocPRIM-4.3.0-r2.ebuild}    | 4 ++--
 sci-libs/rocRAND/{rocRAND-4.3.0.ebuild => rocRAND-4.3.0-r1.ebuild}  | 4 ++--
 .../rocSOLVER/{rocSOLVER-4.3.0.ebuild => rocSOLVER-4.3.0-r1.ebuild} | 2 +-
 .../{rocSPARSE-4.3.0-r2.ebuild => rocSPARSE-4.3.0-r3.ebuild}        | 2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/sci-libs/hipCUB/hipCUB-4.3.0.ebuild b/sci-libs/hipCUB/hipCUB-4.3.0-r1.ebuild
similarity index 96%
rename from sci-libs/hipCUB/hipCUB-4.3.0.ebuild
rename to sci-libs/hipCUB/hipCUB-4.3.0-r1.ebuild
index 0b57014f6d15..65b61c2352cc 100644
--- a/sci-libs/hipCUB/hipCUB-4.3.0.ebuild
+++ b/sci-libs/hipCUB/hipCUB-4.3.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SLOT="0/$(ver_cut 1-2)"
 IUSE="benchmark test"
 RESTRICT="!test? ( test )"
 
-RDEPEND="dev-util/hip:${SLOT}
+RDEPEND="dev-util/hip
 	sci-libs/rocPRIM:${SLOT}
 	benchmark? ( dev-cpp/benchmark )"
 DEPEND="${RDEPEND}"

diff --git a/sci-libs/hipSPARSE/hipSPARSE-4.3.0-r1.ebuild b/sci-libs/hipSPARSE/hipSPARSE-4.3.0-r2.ebuild
similarity index 98%
rename from sci-libs/hipSPARSE/hipSPARSE-4.3.0-r1.ebuild
rename to sci-libs/hipSPARSE/hipSPARSE-4.3.0-r2.ebuild
index 9acb3016c001..c246c94db511 100644
--- a/sci-libs/hipSPARSE/hipSPARSE-4.3.0-r1.ebuild
+++ b/sci-libs/hipSPARSE/hipSPARSE-4.3.0-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake
+inherit cmake toolchain-funcs
 
 DESCRIPTION="ROCm SPARSE marshalling library"
 HOMEPAGE="https://github.com/ROCmSoftwarePlatform/hipSPARSE"
@@ -38,8 +38,8 @@ IUSE="test"
 
 RESTRICT="!test? ( test )"
 
-RDEPEND="dev-util/rocminfo:${SLOT}
-		dev-util/hip:${SLOT}
+RDEPEND="dev-util/rocminfo
+		dev-util/hip
 		sci-libs/rocSPARSE:${SLOT}"
 DEPEND="${RDEPEND}"
 BDEPEND="dev-util/rocm-cmake

diff --git a/sci-libs/rocPRIM/rocPRIM-4.3.0-r1.ebuild b/sci-libs/rocPRIM/rocPRIM-4.3.0-r2.ebuild
similarity index 96%
rename from sci-libs/rocPRIM/rocPRIM-4.3.0-r1.ebuild
rename to sci-libs/rocPRIM/rocPRIM-4.3.0-r2.ebuild
index 0e7bba7b2a7c..eba4e1317b94 100644
--- a/sci-libs/rocPRIM/rocPRIM-4.3.0-r1.ebuild
+++ b/sci-libs/rocPRIM/rocPRIM-4.3.0-r2.ebuild
@@ -14,9 +14,9 @@ KEYWORDS="~amd64"
 SLOT="0/$(ver_cut 1-2)"
 IUSE="benchmark test"
 
-RDEPEND="dev-util/hip:${SLOT}
+RDEPEND="dev-util/hip
 	benchmark? ( dev-cpp/benchmark )"
-BDEPEND="dev-util/rocm-cmake:${SLOT}
+BDEPEND="dev-util/rocm-cmake
 	>=dev-util/cmake-3.22
 	test? ( dev-cpp/gtest )"
 DEPEND="${RDEPEND}"

diff --git a/sci-libs/rocRAND/rocRAND-4.3.0.ebuild b/sci-libs/rocRAND/rocRAND-4.3.0-r1.ebuild
similarity index 96%
rename from sci-libs/rocRAND/rocRAND-4.3.0.ebuild
rename to sci-libs/rocRAND/rocRAND-4.3.0-r1.ebuild
index 926f784a0249..074ee2912a97 100644
--- a/sci-libs/rocRAND/rocRAND-4.3.0.ebuild
+++ b/sci-libs/rocRAND/rocRAND-4.3.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SLOT="0/$(ver_cut 1-2)"
 IUSE="benchmark test"
 RESTRICT="!test? ( test )"
 
-RDEPEND="dev-util/hip:${SLOT}"
+RDEPEND="dev-util/hip"
 DEPEND="${RDEPEND}
 >=dev-util/rocm-cmake-${PV}"
 BDEPEND="test? ( dev-cpp/gtest )"

diff --git a/sci-libs/rocSOLVER/rocSOLVER-4.3.0.ebuild b/sci-libs/rocSOLVER/rocSOLVER-4.3.0-r1.ebuild
similarity index 98%
rename from sci-libs/rocSOLVER/rocSOLVER-4.3.0.ebuild
rename to sci-libs/rocSOLVER/rocSOLVER-4.3.0-r1.ebuild
index c017b7ad31a0..6287d7b096d5 100644
--- a/sci-libs/rocSOLVER/rocSOLVER-4.3.0.ebuild
+++ b/sci-libs/rocSOLVER/rocSOLVER-4.3.0-r1.ebuild
@@ -15,7 +15,7 @@ SLOT="0/$(ver_cut 1-2)"
 
 IUSE="test benchmark"
 
-RDEPEND="dev-util/hip:${SLOT}
+RDEPEND="dev-util/hip
 	sci-libs/rocBLAS:${SLOT}
 	benchmark? ( virtual/blas )"
 DEPEND="${RDEPEND}"

diff --git a/sci-libs/rocSPARSE/rocSPARSE-4.3.0-r2.ebuild b/sci-libs/rocSPARSE/rocSPARSE-4.3.0-r3.ebuild
similarity index 99%
rename from sci-libs/rocSPARSE/rocSPARSE-4.3.0-r2.ebuild
rename to sci-libs/rocSPARSE/rocSPARSE-4.3.0-r3.ebuild
index 208d02f6cc3d..f32d34643e14 100644
--- a/sci-libs/rocSPARSE/rocSPARSE-4.3.0-r2.ebuild
+++ b/sci-libs/rocSPARSE/rocSPARSE-4.3.0-r3.ebuild
@@ -43,7 +43,7 @@ KEYWORDS="~amd64"
 IUSE="benchmark test"
 SLOT="0/$(ver_cut 1-2)"
 
-RDEPEND="dev-util/hip:${SLOT}
+RDEPEND="dev-util/hip
 	sci-libs/rocPRIM:${SLOT}"
 DEPEND="${RDEPEND}"
 BDEPEND="test? (