commit: d124f8f132176c03de943de1df956170a8f51b38 Author: Sv. Lockal <lockalsash <AT> gmail <DOT> com> AuthorDate: Sun Mar 15 16:39:41 2026 +0000 Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org> CommitDate: Sun Mar 15 18:27:58 2026 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d124f8f1
sci-ml/caffe2: allow rocm 7.2 libraries and add explicit hipsparselt Closes: https://bugs.gentoo.org/970959 Signed-off-by: Sv. Lockal <lockalsash <AT> gmail.com> Part-of: https://github.com/gentoo/gentoo/pull/45941 Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org> ...e2-2.10.0-r4.ebuild => caffe2-2.10.0-r5.ebuild} | 37 ++++++++++++---------- sci-ml/caffe2/metadata.xml | 2 +- 2 files changed, 21 insertions(+), 18 deletions(-) diff --git a/sci-ml/caffe2/caffe2-2.10.0-r4.ebuild b/sci-ml/caffe2/caffe2-2.10.0-r5.ebuild similarity index 91% rename from sci-ml/caffe2/caffe2-2.10.0-r4.ebuild rename to sci-ml/caffe2/caffe2-2.10.0-r5.ebuild index 4a698b85dbf3..2a9a4121be01 100644 --- a/sci-ml/caffe2/caffe2-2.10.0-r4.ebuild +++ b/sci-ml/caffe2/caffe2-2.10.0-r5.ebuild @@ -55,6 +55,7 @@ REQUIRED_USE=" rocm? ( || ( ${ROCM_REQUIRED_USE} ) ) + cusparselt? ( || ( cuda rocm ) ) flash? ( || ( cuda rocm ) ) memefficient? ( || ( cuda rocm ) ) nccl? ( rocm ) @@ -98,21 +99,22 @@ RDEPEND=" dev-libs/pthreadpool ) rocm? ( - nccl? ( >=dev-libs/rccl-6.3:= <dev-libs/rccl-7.2:= ) - >=dev-util/hip-6.3:= <dev-util/hip-7.2:= - >=dev-util/roctracer-6.3:= <dev-util/roctracer-7.2:= - >=sci-libs/hipBLAS-6.3:= <sci-libs/hipBLAS-7.2:=[rocsolver(+)] - >=sci-libs/hipBLASLt-6.3:= <sci-libs/hipBLASLt-7.2:= - >=sci-libs/hipFFT-6.3:= <sci-libs/hipFFT-7.2:= - >=sci-libs/hipRAND-6.3:= <sci-libs/hipRAND-7.2:= - >=sci-libs/hipSOLVER-6.3:= <sci-libs/hipSOLVER-7.2:= - >=sci-libs/hipSPARSE-6.3:= <sci-libs/hipSPARSE-7.2:= - >=sci-libs/miopen-6.3:= <sci-libs/miopen-7.2:= - >=sci-libs/rocBLAS-6.3:= <sci-libs/rocBLAS-7.2:= - >=sci-libs/rocRAND-6.3:= <sci-libs/rocRAND-7.2:= - >=sci-libs/rocSOLVER-6.3:= <sci-libs/rocSOLVER-7.2:= + nccl? ( >=dev-libs/rccl-6.3:= <dev-libs/rccl-7.3:= ) + >=dev-util/hip-6.3:= <dev-util/hip-7.3:= + >=dev-util/roctracer-6.3:= <dev-util/roctracer-7.3:= + >=sci-libs/hipBLAS-6.3:= <sci-libs/hipBLAS-7.3:=[rocsolver(+)] + >=sci-libs/hipBLASLt-6.3:= <sci-libs/hipBLASLt-7.3:= + >=sci-libs/hipFFT-6.3:= <sci-libs/hipFFT-7.3:= + >=sci-libs/hipRAND-6.3:= <sci-libs/hipRAND-7.3:= + >=sci-libs/hipSOLVER-6.3:= <sci-libs/hipSOLVER-7.3:= + >=sci-libs/hipSPARSE-6.3:= <sci-libs/hipSPARSE-7.3:= + >=sci-libs/miopen-6.3:= <sci-libs/miopen-7.3:= + >=sci-libs/rocBLAS-6.3:= <sci-libs/rocBLAS-7.3:= + >=sci-libs/rocRAND-6.3:= <sci-libs/rocRAND-7.3:= + >=sci-libs/rocSOLVER-6.3:= <sci-libs/rocSOLVER-7.3:= memefficient? ( =sci-libs/aotriton-bin-0.11*:= ) - distributed? ( >=dev-util/rocm-smi-6.3:= <dev-util/rocm-smi-7.2:= ) + distributed? ( >=dev-util/rocm-smi-6.3:= <dev-util/rocm-smi-7.3:= ) + cusparselt? ( >=sci-libs/hipsparselt-6.3:= <sci-libs/hipsparselt-7.3:= ) ) distributed? ( !rocm? ( sci-ml/tensorpipe[cuda?] ) @@ -142,9 +144,9 @@ DEPEND=" cuda? ( >=dev-libs/cutlass-3.9.2[tools(+)] ) onednn? ( sci-ml/ideep ) rocm? ( - >=sci-libs/hipCUB-6.3:= <sci-libs/hipCUB-7.2:= - >=sci-libs/rocPRIM-6.3:= <sci-libs/rocPRIM-7.2:= - >=sci-libs/rocThrust-6.3:= <sci-libs/rocThrust-7.2:= + >=sci-libs/hipCUB-6.3:= <sci-libs/hipCUB-7.3:= + >=sci-libs/rocPRIM-6.3:= <sci-libs/rocPRIM-7.3:= + >=sci-libs/rocThrust-6.3:= <sci-libs/rocThrust-7.3:= ) qnnpack? ( dev-libs/clog ) " @@ -364,6 +366,7 @@ src_configure() { -DUSE_NCCL=$(usex nccl) -DUSE_SYSTEM_NCCL=ON -DCMAKE_REQUIRE_FIND_PACKAGE_HIP=ON + -DCMAKE_DISABLE_FIND_PACKAGE_hipsparselt=$(usex !cusparselt) # disable automagic -DUSE_ROCM_CK_SDPA=OFF # requires flash + aiter, works only on gfx90a/gfx942/gfx950 ) diff --git a/sci-ml/caffe2/metadata.xml b/sci-ml/caffe2/metadata.xml index 519739396a46..12cc30bacd16 100644 --- a/sci-ml/caffe2/metadata.xml +++ b/sci-ml/caffe2/metadata.xml @@ -6,7 +6,7 @@ <name>Tupone Alfredo</name> </maintainer> <use> - <flag name="cusparselt">Use the CUDA Sparse Matrix Multiplication</flag> + <flag name="cusparselt">Use the CUDA/HIP Sparse Matrix Multiplication</flag> <flag name="distributed">Support distributed applications</flag> <flag name="fbgemm">Use <pkg>sci-ml/FBGEMM</pkg></flag> <flag name="flash">Enable flash attention</flag>
