commit: 4b0401733060190f551ad0a852977b6a90f3296a
Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 11 21:37:44 2025 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Tue Nov 11 21:37:44 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b040173
sci-ml/caffe2: fix deps and ExcessiveLineLength
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
.../{caffe2-2.9.0-r1.ebuild => caffe2-2.9.0-r2.ebuild} | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/sci-ml/caffe2/caffe2-2.9.0-r1.ebuild
b/sci-ml/caffe2/caffe2-2.9.0-r2.ebuild
similarity index 98%
rename from sci-ml/caffe2/caffe2-2.9.0-r1.ebuild
rename to sci-ml/caffe2/caffe2-2.9.0-r2.ebuild
index a893705147d9..9a73c7863326 100644
--- a/sci-ml/caffe2/caffe2-2.9.0-r1.ebuild
+++ b/sci-ml/caffe2/caffe2-2.9.0-r2.ebuild
@@ -65,9 +65,9 @@ RDEPEND="
dev-cpp/abseil-cpp:=
dev-cpp/gflags:=
>=dev-cpp/glog-0.5.0:=
- dev-cpp/nlohmann_json
dev-libs/cpuinfo
dev-libs/libfmt:=
+ dev-cpp/opentelemetry-cpp
dev-libs/protobuf:=
dev-libs/sleef
~sci-ml/kineto-0.4.0_p20250617
@@ -88,7 +88,7 @@ RDEPEND="
)
numpy? ( $(python_gen_cond_dep '
dev-python/numpy[${PYTHON_USEDEP}]
- ') )
+ ') )
onednn? ( =sci-ml/oneDNN-3.5* )
opencl? ( virtual/opencl )
qnnpack? (
@@ -100,7 +100,7 @@ RDEPEND="
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:0/6.3 sci-libs/hipBLAS:0/6.4
sci-libs/hipBLAS:0/7.0[rocsolver] sci-libs/hipBLAS:0/7.1[rocsolver] )
+ >=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:=
@@ -127,7 +127,7 @@ RDEPEND="
DEPEND="
${RDEPEND}
- dev-cpp/opentelemetry-cpp
+ dev-cpp/nlohmann_json
dev-libs/flatbuffers
dev-libs/FXdiv
dev-libs/pocketfft
@@ -165,6 +165,11 @@ PATCHES=(
"${FILESDIR}"/${P}-rocm-distributed-link.patch
)
+pkg_setup() {
+ python-single-r1_pkg_setup
+ use cuda && cuda_pkg_setup
+}
+
src_prepare() {
if use cuda && ( use flash || use memefficient ); then
mv "${WORKDIR}"/${FLASH_P}/* third_party/${FLASH_PN}/ || die
