commit:     2ef35d1f11c2e99fb970344160e8c0007a914a30
Author:     Sv. Lockal <lockalsash <AT> gmail <DOT> com>
AuthorDate: Fri Jun 13 08:36:49 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jun 14 22:37:12 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ef35d1f

sci-ml/caffe2: remove ROCM_USEDEP due to pkgcore limitation, allow rocm-6.4

Signed-off-by: Sv. Lockal <lockalsash <AT> gmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/42554
Closes: https://github.com/gentoo/gentoo/pull/42554
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-ml/caffe2/caffe2-2.4.1-r7.ebuild  | 22 +++++++++++-----------
 sci-ml/caffe2/caffe2-2.5.1-r11.ebuild | 22 +++++++++++-----------
 sci-ml/caffe2/caffe2-2.7.0-r2.ebuild  | 26 +++++++++++++-------------
 3 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/sci-ml/caffe2/caffe2-2.4.1-r7.ebuild 
b/sci-ml/caffe2/caffe2-2.4.1-r7.ebuild
index 9ebbcd75c285..b51bab3da130 100644
--- a/sci-ml/caffe2/caffe2-2.4.1-r7.ebuild
+++ b/sci-ml/caffe2/caffe2-2.4.1-r7.ebuild
@@ -71,17 +71,17 @@ RDEPEND="
        )
        rocm? (
                =dev-util/hip-6.1*
-               =dev-libs/rccl-6.1*[${ROCM_USEDEP}]
-               =sci-libs/rocThrust-6.1*[${ROCM_USEDEP}]
-               =sci-libs/rocPRIM-6.1*[${ROCM_USEDEP}]
-               =sci-libs/hipBLAS-6.1*[${ROCM_USEDEP}]
-               =sci-libs/hipFFT-6.1*[${ROCM_USEDEP}]
-               =sci-libs/hipSPARSE-6.1*[${ROCM_USEDEP}]
-               =sci-libs/hipRAND-6.1*[${ROCM_USEDEP}]
-               =sci-libs/hipCUB-6.1*[${ROCM_USEDEP}]
-               =sci-libs/hipSOLVER-6.1*[${ROCM_USEDEP}]
-               =sci-libs/miopen-6.1*[${ROCM_USEDEP}]
-               =dev-util/roctracer-6.1*[${ROCM_USEDEP}]
+               =dev-libs/rccl-6.1*
+               =sci-libs/rocThrust-6.1*
+               =sci-libs/rocPRIM-6.1*
+               =sci-libs/hipBLAS-6.1*
+               =sci-libs/hipFFT-6.1*
+               =sci-libs/hipSPARSE-6.1*
+               =sci-libs/hipRAND-6.1*
+               =sci-libs/hipCUB-6.1*
+               =sci-libs/hipSOLVER-6.1*
+               =sci-libs/miopen-6.1*
+               =dev-util/roctracer-6.1*
 
                =sci-libs/hipBLASLt-6.1*
                amdgpu_targets_gfx90a? ( 
=sci-libs/hipBLASLt-6.1*[amdgpu_targets_gfx90a] )

diff --git a/sci-ml/caffe2/caffe2-2.5.1-r11.ebuild 
b/sci-ml/caffe2/caffe2-2.5.1-r11.ebuild
index 3c540734adb9..972677ae2238 100644
--- a/sci-ml/caffe2/caffe2-2.5.1-r11.ebuild
+++ b/sci-ml/caffe2/caffe2-2.5.1-r11.ebuild
@@ -69,17 +69,17 @@ RDEPEND="
        )
        rocm? (
                =dev-util/hip-6.1*
-               =dev-libs/rccl-6.1*[${ROCM_USEDEP}]
-               =sci-libs/rocThrust-6.1*[${ROCM_USEDEP}]
-               =sci-libs/rocPRIM-6.1*[${ROCM_USEDEP}]
-               =sci-libs/hipBLAS-6.1*[${ROCM_USEDEP}]
-               =sci-libs/hipFFT-6.1*[${ROCM_USEDEP}]
-               =sci-libs/hipSPARSE-6.1*[${ROCM_USEDEP}]
-               =sci-libs/hipRAND-6.1*[${ROCM_USEDEP}]
-               =sci-libs/hipCUB-6.1*[${ROCM_USEDEP}]
-               =sci-libs/hipSOLVER-6.1*[${ROCM_USEDEP}]
-               =sci-libs/miopen-6.1*[${ROCM_USEDEP}]
-               =dev-util/roctracer-6.1*[${ROCM_USEDEP}]
+               =dev-libs/rccl-6.1*
+               =sci-libs/rocThrust-6.1*
+               =sci-libs/rocPRIM-6.1*
+               =sci-libs/hipBLAS-6.1*
+               =sci-libs/hipFFT-6.1*
+               =sci-libs/hipSPARSE-6.1*
+               =sci-libs/hipRAND-6.1*
+               =sci-libs/hipCUB-6.1*
+               =sci-libs/hipSOLVER-6.1*
+               =sci-libs/miopen-6.1*
+               =dev-util/roctracer-6.1*
 
                =sci-libs/hipBLASLt-6.1*
                amdgpu_targets_gfx90a? ( 
=sci-libs/hipBLASLt-6.1*[amdgpu_targets_gfx90a] )

diff --git a/sci-ml/caffe2/caffe2-2.7.0-r2.ebuild 
b/sci-ml/caffe2/caffe2-2.7.0-r2.ebuild
index f5098c80fadb..df43feb36474 100644
--- a/sci-ml/caffe2/caffe2-2.7.0-r2.ebuild
+++ b/sci-ml/caffe2/caffe2-2.7.0-r2.ebuild
@@ -77,19 +77,19 @@ RDEPEND="
                sci-ml/gemmlowp
        )
        rocm? (
-               >=dev-libs/rccl-6.1      <dev-libs/rccl-6.4
-               >=dev-util/hip-6.1       <dev-util/hip-6.4
-               >=dev-util/roctracer-6.1 <dev-util/roctracer-6.4
-               >=sci-libs/hipBLAS-6.1   <sci-libs/hipBLAS-6.4
-               >=sci-libs/hipBLASLt-6.1 <sci-libs/hipBLASLt-6.4
-               >=sci-libs/hipCUB-6.1    <sci-libs/hipCUB-6.4
-               >=sci-libs/hipFFT-6.1    <sci-libs/hipFFT-6.4
-               >=sci-libs/hipRAND-6.1   <sci-libs/hipRAND-6.4
-               >=sci-libs/hipSOLVER-6.1 <sci-libs/hipSOLVER-6.4
-               >=sci-libs/hipSPARSE-6.1 <sci-libs/hipSPARSE-6.4
-               >=sci-libs/miopen-6.1    <sci-libs/miopen-6.4
-               >=sci-libs/rocPRIM-6.1   <sci-libs/rocPRIM-6.4
-               >=sci-libs/rocThrust-6.1 <sci-libs/rocThrust-6.4
+               >=dev-libs/rccl-6.1      <dev-libs/rccl-6.5
+               >=dev-util/hip-6.1       <dev-util/hip-6.5
+               >=dev-util/roctracer-6.1 <dev-util/roctracer-6.5
+               >=sci-libs/hipBLAS-6.1   <sci-libs/hipBLAS-6.5
+               >=sci-libs/hipBLASLt-6.1 <sci-libs/hipBLASLt-6.5
+               >=sci-libs/hipCUB-6.1    <sci-libs/hipCUB-6.5
+               >=sci-libs/hipFFT-6.1    <sci-libs/hipFFT-6.5
+               >=sci-libs/hipRAND-6.1   <sci-libs/hipRAND-6.5
+               >=sci-libs/hipSOLVER-6.1 <sci-libs/hipSOLVER-6.5
+               >=sci-libs/hipSPARSE-6.1 <sci-libs/hipSPARSE-6.5
+               >=sci-libs/miopen-6.1    <sci-libs/miopen-6.5
+               >=sci-libs/rocPRIM-6.1   <sci-libs/rocPRIM-6.5
+               >=sci-libs/rocThrust-6.1 <sci-libs/rocThrust-6.5
        )
        distributed? (
                sci-ml/tensorpipe[cuda?]

Reply via email to