gentoo auto-resync : 23:03:2025 - 00:31:41

4 files changed, 74 insertions, 72 deletions

diff --git a/sci-ml/caffe2/Manifest b/sci-ml/caffe2/Manifest
index 97bab7181020..d7864d9f40e1 100644
--- a/sci-ml/caffe2/Manifest
+++ b/sci-ml/caffe2/Manifest
@@ -12,7 +12,7 @@ DIST caffe2-patches-20240809.tar.gz 15242 BLAKE2B 77503c61487e7d85cca5afcab9a6e6
 DIST pytorch-2.4.1.tar.gz 115029469 BLAKE2B c2909ff27d527bc57cba56b780d3b8cd07a043ab045caa6c6b27857a16f9ad10aaab2116b26226b1e46ee08ffb44007965d914464418e4ae14ca48c3f3f383bb SHA512 7e9b4485e242eaf0d648765c6621d73d95e7107b766646a098175436d1ab2e2b864badd0757a3bab6b7c318233f2120bad9ac07b39bb9e357897919580c87631
 DIST pytorch-2.5.1.tar.gz 116091366 BLAKE2B 7838b17562b94ffc7d798031348689db607dd5eae2a3c35be365972e2b52a2c1b12067068d5aca5ab00cf0977d9c2c3c9ae5337d69534c864c732e6256cbeef6 SHA512 a913a466324a65fa3d79c5e9ad4d605fc7976f0134fda2f81aaa3cea29d56926604999b8a238759646d211e63b47bbb446cdffa86ca8defd8159f11e30301289
 DIST pytorch-2.6.0.tar.gz 119594438 BLAKE2B 3152eb341cf42295e147e59625beb9c06608aa4b78f9618c1c0024b10c1c767715d07fe8c4be52d029ac47f808cd0d5e65c9530ec90d951a64b993083b4067ad SHA512 a70da80ff09d226085e18228132cf6bb236ad8cc47eed52375d0d2a615f09dd33849da947270b5670c184eab60cb8e2adf11d801babfbda7aa621400501d07b0
-EBUILD caffe2-2.4.1-r4.ebuild 8492 BLAKE2B e4257c78992a7ac8357680d92e9a4c3b16051cb65fee7f448b21f4e6021fe75ca48b2aea3daac71ecbfde05cac2e483936604c5368441faf8636427f9300ae23 SHA512 d3fe259671860c4e016df511c7f435976e1657edcc8d00604c0ef69938db37c7cc5740af0b1d900078f38411d66adb86d3437480829a7c7f5df0fe3103f28e5f
-EBUILD caffe2-2.5.1-r8.ebuild 8780 BLAKE2B 39ce8543430b3fe5a96891fda0436b39b61cec5bfdb894fc86aee1278a5c7156506b1248feba429f6baedfecf2b136fb8b866985fb16d33846dd28b230a9b8fc SHA512 6a3dd782cd391b44de628e7b81355f4130442645cef8bff967809ebc18d91ed3e1e907ff8eeb74e44d8c7ed03f4f3ccb3eb1b6ccd2fa20e1b48982a916fb0dce
-EBUILD caffe2-2.6.0.ebuild 8803 BLAKE2B a9d8962e14032b2cd2fd0b5cad31fb7ea12e01206bd0712c7df565dea332df37d14f1644c7cb9617f4514324ccecd255a83974214119058505d7ba55e83ce175 SHA512 42a27fd86eb829077a453ae2a30fc5908587928a8d402f73651740258d42c29163a6f9dc6e46eedb75810c4653366e5e214eb9a599bf36943f47ab73cc8de24a
+EBUILD caffe2-2.4.1-r5.ebuild 8551 BLAKE2B 5d43307717b3af3aa199b8b74403b23b2f7ff7f7f867a7344cbb0b15b6b692020b1b7d51d41e1d4d6d76eed9b71b5c0b18eed6f3f397dd19cbcf8a98a39e5659 SHA512 27697d1162ba83b0db5ad8149071607d10234a38d0fc27aa72eca775a404b6590d81ddfc5fd7d7ebfd96c2115949d5a4323f3679406b23c79c3ebaee50b318f2
+EBUILD caffe2-2.5.1-r9.ebuild 8861 BLAKE2B fc222b4f9a6e25a63b98872ded5a2a9a5ac5adcab20541ba1f7ae1e0c4845c4894710f2f659e4e63f7f29e166a262ea560dbc9bdb6b6383a5dc62cb7799cc0fd SHA512 d15c58fbc48d69466432e9fe42529640c6f6a94a2004da88e708abde011001bb04a2f9253b70c26146c0b2b3f2270b864b099f7c2f2a332a8630c14d0c0c40a2
+EBUILD caffe2-2.6.0-r1.ebuild 8884 BLAKE2B 3c87ff2e81d44f7bf103bb6538f660c50c2a3207eca72a5ce8abd8e046b5c5dddc23a486fc670701df11f0f781e410aa050821ebe6a8e7c961e18fcd923abca3 SHA512 44219a05050808cd7de8601438218868ebe1cc657775bcaecaf12777ec0fa0d4b2c24e9eeea11422346f9319e14f18d7665090f1655be4c20cebfe177c0b1318
 MISC metadata.xml 1228 BLAKE2B 29fa99ccc009ae8ac209cf0a85a8c87992d10301837f44478b4fe60445dbf261cf1c3869cc6e173944b9c98608fcf32a379c766bf7e53267c90fd71e51e1f9a0 SHA512 06d89ac1b62bf215d56ac67408f6027849f3a1948f1a40013aa989f9d879eb9aa9156d9c336cc83d2bb3795271c11d39d34919f749d83dbfbf48cc2d6aa8545e
diff --git a/sci-ml/caffe2/caffe2-2.4.1-r4.ebuild b/sci-ml/caffe2/caffe2-2.4.1-r5.ebuild
index 59a3e991b4fd..fef92ded7db4 100644
--- a/sci-ml/caffe2/caffe2-2.4.1-r4.ebuild
+++ b/sci-ml/caffe2/caffe2-2.4.1-r5.ebuild
@@ -3,9 +3,9 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 ROCM_VERSION=6.1
-inherit python-single-r1 cmake cuda flag-o-matic prefix rocm toolchain-funcs
+inherit python-r1 cmake cuda flag-o-matic prefix rocm toolchain-funcs
 
 MYPN=pytorch
 MYP=${MYPN}-${PV}
@@ -100,19 +100,17 @@ RDEPEND="
 DEPEND="
 	${RDEPEND}
 	dev-libs/clog
-	cuda? ( <=dev-libs/cutlass-3.4.1 )
-	onednn? ( sci-ml/ideep )
 	dev-libs/psimd
-	sci-ml/FP16
 	dev-libs/FXdiv
 	dev-libs/pocketfft
 	dev-libs/flatbuffers
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/pybind11[${PYTHON_USEDEP}]
+	dev-python/typing-extensions[${PYTHON_USEDEP}]
+	sci-ml/FP16
 	sci-ml/kineto
-	$(python_gen_cond_dep '
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/pybind11[${PYTHON_USEDEP}]
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	')
+	cuda? ( <=dev-libs/cutlass-3.4.1 )
+	onednn? ( sci-ml/ideep )
 "
 
 PATCHES=(
@@ -277,15 +275,24 @@ src_configure() {
 		)
 	fi
 
+	python_setup
 	cmake_src_configure
 
 	# do not rerun cmake and the build process in src_install
 	sed '/RERUN/,+1d' -i "${BUILD_DIR}"/build.ninja || die
 }
 
+python_install() {
+	python_domodule python/caffe2
+	python_domodule python/torch
+	ln -s ../../../../../include/torch \
+		"${D}$(python_get_sitedir)"/torch/include/torch || die # bug 923269
+}
+
 src_install() {
 	cmake_src_install
 
+	# Used by pytorch ebuild
 	insinto "/var/lib/${PN}"
 	doins "${BUILD_DIR}"/CMakeCache.txt
 
@@ -293,8 +300,5 @@ src_install() {
 	mkdir -p python/torch/include || die
 	mv "${ED}"/usr/lib/python*/site-packages/caffe2 python/ || die
 	cp torch/version.py python/torch/ || die
-	python_domodule python/caffe2
-	python_domodule python/torch
-	ln -s ../../../../../include/torch \
-		"${D}$(python_get_sitedir)"/torch/include/torch || die # bug 923269
+	python_foreach_impl python_install
 }
diff --git a/sci-ml/caffe2/caffe2-2.5.1-r8.ebuild b/sci-ml/caffe2/caffe2-2.5.1-r9.ebuild
index d62de604417b..43cefe46218d 100644
--- a/sci-ml/caffe2/caffe2-2.5.1-r8.ebuild
+++ b/sci-ml/caffe2/caffe2-2.5.1-r9.ebuild
@@ -3,9 +3,9 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 ROCM_VERSION=6.1
-inherit python-single-r1 cmake cuda flag-o-matic prefix rocm toolchain-funcs
+inherit python-r1 cmake cuda flag-o-matic prefix rocm toolchain-funcs
 
 MYPN=pytorch
 MYP=${MYPN}-${PV}
@@ -46,9 +46,9 @@ RDEPEND="
 	dev-libs/protobuf:=
 	dev-libs/pthreadpool
 	dev-libs/sleef
-	virtual/lapack
 	sci-ml/onnx
 	sci-ml/foxi
+	virtual/lapack
 	cuda? (
 		dev-libs/cudnn
 		>=dev-libs/cudnn-frontend-1.0.3:0/8
@@ -98,20 +98,18 @@ RDEPEND="
 
 DEPEND="
 	${RDEPEND}
-	qnnpack? ( dev-libs/clog )
-	cuda? ( <=dev-libs/cutlass-3.4.1 )
-	onednn? ( sci-ml/ideep )
-	dev-libs/psimd
-	sci-ml/FP16
+	dev-libs/flatbuffers
 	dev-libs/FXdiv
 	dev-libs/pocketfft
-	dev-libs/flatbuffers
+	dev-libs/psimd
+	dev-python/pybind11[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/typing-extensions[${PYTHON_USEDEP}]
+	sci-ml/FP16
 	sci-ml/kineto
-	$(python_gen_cond_dep '
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/pybind11[${PYTHON_USEDEP}]
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	')
+	cuda? ( <=dev-libs/cutlass-3.4.1 )
+	onednn? ( sci-ml/ideep )
+	qnnpack? ( dev-libs/clog )
 "
 
 PATCHES=(
@@ -294,6 +292,7 @@ src_configure() {
 		)
 	fi
 
+	python_setup
 	cmake_src_configure
 }
 
@@ -303,6 +302,19 @@ src_compile() {
 	cmake_src_compile
 }
 
+python_install() {
+	python_domodule python/torch
+	mkdir "${D}"$(python_get_sitedir)/torch/bin || die
+	mkdir "${D}"$(python_get_sitedir)/torch/lib || die
+	mkdir "${D}"$(python_get_sitedir)/torch/include || die
+	ln -s ../../../../../include/torch \
+		"${D}$(python_get_sitedir)"/torch/include/torch || die # bug 923269
+	ln -s ../../../../../bin/torch_shm_manager \
+		"${D}"/$(python_get_sitedir)/torch/bin/torch_shm_manager || die
+	ln -s ../../../../../$(get_libdir)/libtorch_global_deps.so \
+		"${D}"/$(python_get_sitedir)/torch/lib/libtorch_global_deps.so || die
+}
+
 src_install() {
 	cmake_src_install
 
@@ -314,18 +326,5 @@ src_install() {
 	rm -rf python
 	mkdir -p python/torch || die
 	cp torch/version.py python/torch/ || die
-	python_domodule python/torch
-
-	mkdir "${D}"$(python_get_sitedir)/torch/bin || die
-	mkdir "${D}"$(python_get_sitedir)/torch/lib || die
-	mkdir "${D}"$(python_get_sitedir)/torch/include || die
-
-	ln -s ../../../../../include/torch \
-		"${D}$(python_get_sitedir)"/torch/include/torch || die # bug 923269
-
-	mv "${ED}"/usr/bin/torch_shm_manager \
-		"${D}"/$(python_get_sitedir)/torch/bin/ || die
-
-	mv "${ED}"/usr/$(get_libdir)/libtorch_global_deps.so \
-		"${D}"/$(python_get_sitedir)/torch/lib/ || die
+	python_foreach_impl python_install
 }
diff --git a/sci-ml/caffe2/caffe2-2.6.0.ebuild b/sci-ml/caffe2/caffe2-2.6.0-r1.ebuild
index 16bd774af57d..f6fef0622eea 100644
--- a/sci-ml/caffe2/caffe2-2.6.0.ebuild
+++ b/sci-ml/caffe2/caffe2-2.6.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{10..13} )
 ROCM_VERSION=6.1
-inherit python-single-r1 cmake cuda flag-o-matic prefix rocm toolchain-funcs
+inherit python-r1 cmake cuda flag-o-matic prefix rocm toolchain-funcs
 
 MYPN=pytorch
 MYP=${MYPN}-${PV}
@@ -47,8 +47,8 @@ RDEPEND="
 	dev-libs/pthreadpool
 	dev-libs/sleef
 	virtual/lapack
-	sci-ml/onnx
 	sci-ml/foxi
+	sci-ml/onnx
 	cuda? (
 		dev-libs/cudnn
 		>=dev-libs/cudnn-frontend-1.0.3:0/8
@@ -98,20 +98,18 @@ RDEPEND="
 
 DEPEND="
 	${RDEPEND}
-	qnnpack? ( dev-libs/clog )
-	cuda? ( <=dev-libs/cutlass-3.4.1 )
-	onednn? ( sci-ml/ideep )
-	dev-libs/psimd
-	sci-ml/FP16
+	dev-libs/flatbuffers
 	dev-libs/FXdiv
 	dev-libs/pocketfft
-	dev-libs/flatbuffers
+	dev-libs/psimd
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/pybind11[${PYTHON_USEDEP}]
+	dev-python/typing-extensions[${PYTHON_USEDEP}]
+	sci-ml/FP16
 	sci-ml/kineto
-	$(python_gen_cond_dep '
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/pybind11[${PYTHON_USEDEP}]
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	')
+	cuda? ( <=dev-libs/cutlass-3.4.1 )
+	onednn? ( sci-ml/ideep )
+	qnnpack? ( dev-libs/clog )
 "
 
 PATCHES=(
@@ -294,6 +292,7 @@ src_configure() {
 		)
 	fi
 
+	python_setup
 	cmake_src_configure
 }
 
@@ -303,6 +302,19 @@ src_compile() {
 	cmake_src_compile
 }
 
+python_install() {
+	python_domodule python/torch
+	mkdir "${D}"$(python_get_sitedir)/torch/bin || die
+	mkdir "${D}"$(python_get_sitedir)/torch/lib || die
+	mkdir "${D}"$(python_get_sitedir)/torch/include || die
+	ln -s ../../../../../include/torch \
+		"${D}$(python_get_sitedir)"/torch/include/torch || die # bug 923269
+	ln -s ../../../../../bin/torch_shm_manager \
+		"${D}"/$(python_get_sitedir)/torch/bin/torch_shm_manager || die
+	ln -s ../../../../../$(get_libdir)/libtorch_global_deps.so \
+		"${D}"/$(python_get_sitedir)/torch/lib/libtorch_global_deps.so || die
+}
+
 src_install() {
 	cmake_src_install
 
@@ -314,18 +326,5 @@ src_install() {
 	rm -rf python
 	mkdir -p python/torch || die
 	cp torch/version.py python/torch/ || die
-	python_domodule python/torch
-
-	mkdir "${D}"$(python_get_sitedir)/torch/bin || die
-	mkdir "${D}"$(python_get_sitedir)/torch/lib || die
-	mkdir "${D}"$(python_get_sitedir)/torch/include || die
-
-	ln -s ../../../../../include/torch \
-		"${D}$(python_get_sitedir)"/torch/include/torch || die # bug 923269
-
-	mv "${ED}"/usr/bin/torch_shm_manager \
-		"${D}"/$(python_get_sitedir)/torch/bin/ || die
-
-	mv "${ED}"/usr/$(get_libdir)/libtorch_global_deps.so \
-		"${D}"/$(python_get_sitedir)/torch/lib/ || die
+	python_foreach_impl python_install
 }