gentoo auto-resync : 09:01:2024 - 13:01:22

3 files changed, 23 insertions, 16 deletions

diff --git a/sci-libs/caffe2/Manifest b/sci-libs/caffe2/Manifest
index f2f690d1f4c9..15f67c5e3f0e 100644
--- a/sci-libs/caffe2/Manifest
+++ b/sci-libs/caffe2/Manifest
@@ -11,10 +11,11 @@ AUX caffe2-2.1.1-cudaExtra.patch 1336 BLAKE2B f12d29a624f9345452227076108b9ded4c
 AUX caffe2-2.1.1-gentoo.patch 6329 BLAKE2B c002f1605888ac79bed292cf1967eedd4d177193947dbafea8443958e498b371865a8f7548cc7e2c572d7fff69418344286071d64f4742691e943e81b73d811c SHA512 8eb2b2f89de809ff93e0deaa4bd6116f73bed55642904e689ba97e5bf21ba5754935a8d0c1f632b1f262400f0c809398524056f7691f7787c154a5b7f6f1b7b2
 AUX caffe2-2.1.2-fix-openmp-link.patch 483 BLAKE2B dfe9ae0978b71449486d12f769c3c962001c138bc53b0605ed6f2215fe732356da90c5084488bc4d9f54c88aab2a426b8c935543f7ba0890783bb58da30a5cb4 SHA512 a9cee8ae2a8477a21e92bd4ef286af68efd90283593db7ed4641a826b19b4266bcab9c131c93be2b6c2f13d5cd545c766612791cf2e23cff9a731a03f3ad7648
 AUX caffe2-2.1.2-fix-rpath.patch 510 BLAKE2B 6585e8089acc6e7fe69713ad04a64263ab2e9d2d5cf6d3a844dbbc917383e4b7a0688ebdfb3142e3c42108c8c14a6435f48ae4ce3adee8db338286d60ed7b503 SHA512 ede770559b487fff736aded0cf4b077d8308c2b85c5cd139150b04bcb8b72a0d78af6a2b74fbb153b75acff71df0832d8f139231d1c18558f5b5479af348e6a0
+DIST ideep-6f4d653802bd43bc4eda515460df9f90353dbebe.tar.gz 57109 BLAKE2B 698ccc197e27a4812fc9df8d6821f8544e0528d9f925af97b7acf558cd91a5fa6ecb66012dda07e58d18d42c0aebb3f00baf5f947f01c851d6ecb2d9823eca0c SHA512 5310f15d7dfd45fc166d6b14a95ec35aa9b8e5fc3f5a5c5d2ab11666bce45ca5f23087780dccdcc60459d55e3b58fa13e3ea45bc0a51f890c0603660213e97f1
 DIST pytorch-1.13.1.tar.gz 108279745 BLAKE2B 75de03b74dfdaf8d8fb5ea743fcc0c1b0e408a714ad4160c487921220a7b1755e5fa6e587e6bbc8c9f34dd75e096d2e6dd69c80d24821835fff6c833314434d3 SHA512 f16f89d027efade11d057245cad5b69a390e88b458398310ae30de2dbff7c8fd7f1165be7b8da7ea989c81ac3f5a66c5cb9050610e441a97c83fb8aa28c0bd62
 DIST pytorch-2.0.1.tar.gz 111335778 BLAKE2B 7a10cc2b2d5e2422aef7e060a0c3a62ca5c7460c6e0b9becade9b98939501975c74ed5a175a653731f43ca824d2c9bd31f41d1f633c2b139779ab23d5331e9ce SHA512 2309a22b3be3ccdb36d8d9781a59a7bdcc2fdb8d95ada205702ec77862480f0cbb12cd5d6b8cd3114d01a6e33b7743d0fe9de93debf37138ca5c14403cdb0c43
 DIST pytorch-2.1.2.tar.gz 116316469 BLAKE2B c5a55ee264bc3477d3556ba6376b5591117e992e56e0dd0c9ba93d12526e2727f7840f6f1e0730a38223b6492c9556840c4ebf22ffd220e97225c2abff303747 SHA512 a8961d78ad785b13c959a0612563a60e0de17a7c8bb9822ddea9a24072796354d07e81c47b6cc8761b21a6448845b088cf80e1661d9e889b0ed5474d3dc76756
 EBUILD caffe2-1.13.1-r6.ebuild 5244 BLAKE2B d7f5f16e1f1122604a6df64f16c62552fb8b4b0de67bd231036b4835a5a71c58da02f0e1df64f3bd22c2a282a150d7f5a803c87cdf792e3e97ec8f518e055191 SHA512 58b1a09e5e3814d9475d4fe0e46aa837477843e09ed1b0c803c2ac3190e5c819d4216e33e3003652194e90a9f3f35146657eb25f30a4419bf16b2067e5a4b027
 EBUILD caffe2-2.0.1-r5.ebuild 5868 BLAKE2B c17450d01ff68d42188c9da9e9c7a6d6469fe5c8b72c91e4ea4456eb4fe9d08cf30619fbb06f3dae21add641329f3ce8ced24bca93eb05900340639c042a1cdb SHA512 d32fa4c194c51efb76b143f22f783efa7a1415902b03ddea1d3f145d632455ebfe672a1b05b1203f2ba752f3331831455ae631a66bb409f45d6c695c68f39c3b
-EBUILD caffe2-2.1.2-r1.ebuild 6303 BLAKE2B 74901eccd81f93664f2bf04cf565684533b2302289c404e054d673ffa74bd9c9e27b860596909f0e151ce0f031b7ecad895822add0adb2e0595110127ad621f4 SHA512 dda0ee5e67ccd63677239076141644a66466070f3cfe5d011ffa9197903d80926d68227634808bbfbd107e98f82880f332085a9028e7c4bca5e782cbbeeafb91
-MISC metadata.xml 1158 BLAKE2B f1a95314a6d013d6cd2209dc73daa571ff82510bb4ccbd7b74d888d5ceb7ea4c6531dd11d9b5c582282fb3d47cd018b32b008d9e6edfa29069985edc548382af SHA512 9a500343117e1fc9306505e9a3ec241199553baa226cf5025f641e13a811a7b09f5a77c388231d6ab89c02d9c87d1c5a01b6aa71a586e854f73a92b3261ad341
+EBUILD caffe2-2.1.2-r2.ebuild 6518 BLAKE2B 3fbec11ae6a77c276a02547bd04fa530a3f76980ec49d07cf2016e5dcced8e77863c7c69239b875effff968b83a1d0065fe5762d32cafd48f96cc9103b03ba2f SHA512 a34aacbcc24a291c5f2b8f43a0fdfc64eebeccaa5a18bd06b7358dea6646ec80051a0b7a4140536f02225bdea70400887dcdadf65574ea7d2f4b4fa09cb7e442
+MISC metadata.xml 1198 BLAKE2B 4c4ffc2aa40606135ca55c397bef655c026a9b11f86b77e5dc3de4fb48f6a193aa117e0e0f1f18063f18e33bda8d6b586864224a4a2e21ddb011d02920e4e42b SHA512 440b9fe26f36334ca4d533c76911d73fc41fc05fc7b4fae2c072ef02b8da8e9fc308920797275cf0de19c38a47c0a50270111c034ab3bf6c3b6dda7719c02dca
diff --git a/sci-libs/caffe2/caffe2-2.1.2-r1.ebuild b/sci-libs/caffe2/caffe2-2.1.2-r2.ebuild
index 56ae2472b0fb..35989b1e2e70 100644
--- a/sci-libs/caffe2/caffe2-2.1.2-r1.ebuild
+++ b/sci-libs/caffe2/caffe2-2.1.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -8,16 +8,18 @@ inherit python-single-r1 cmake cuda flag-o-matic prefix
 
 MYPN=pytorch
 MYP=${MYPN}-${PV}
+IDEEP_VERSION="6f4d653802bd43bc4eda515460df9f90353dbebe"
 
 DESCRIPTION="A deep learning framework"
 HOMEPAGE="https://pytorch.org/"
-SRC_URI="https://github.com/pytorch/${MYPN}/archive/refs/tags/v${PV}.tar.gz
-	-> ${MYP}.tar.gz"
+SRC_URI="https://github.com/pytorch/${MYPN}/archive/refs/tags/v${PV}.tar.gz -> ${MYP}.tar.gz
+onednn? ( https://github.com/intel/ideep/archive/${IDEEP_VERSION}.tar.gz -> ideep-${IDEEP_VERSION}.tar.gz )
+"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="cuda distributed fbgemm ffmpeg gloo mkl mpi nnpack +numpy opencl opencv openmp qnnpack tensorpipe xnnpack"
+IUSE="cuda distributed fbgemm ffmpeg gloo mkl mpi nnpack +numpy onednn opencl opencv openmp qnnpack tensorpipe xnnpack"
 RESTRICT="test"
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
@@ -55,6 +57,7 @@ RDEPEND="
 	numpy? ( $(python_gen_cond_dep '
 		dev-python/numpy[${PYTHON_USEDEP}]
 		') )
+	onednn? ( dev-libs/oneDNN )
 	opencl? ( virtual/opencl )
 	opencv? ( media-libs/opencv:= )
 	qnnpack? ( sci-libs/QNNPACK )
@@ -151,12 +154,11 @@ src_configure() {
 		-DUSE_KINETO=OFF # TODO
 		-DUSE_LEVELDB=OFF
 		-DUSE_MAGMA=OFF # TODO: In GURU as sci-libs/magma
-		-DUSE_MKLDNN=OFF
+		-DUSE_MKLDNN=$(usex onednn)
 		-DUSE_NCCL=OFF # TODO: NVIDIA Collective Communication Library
 		-DUSE_NNPACK=$(usex nnpack)
 		-DUSE_QNNPACK=$(usex qnnpack)
 		-DUSE_XNNPACK=$(usex xnnpack)
-		-DUSE_SYSTEM_XNNPACK=$(usex xnnpack)
 		-DUSE_TENSORPIPE=$(usex tensorpipe)
 		-DUSE_PYTORCH_QNNPACK=OFF
 		-DUSE_NUMPY=$(usex numpy)
@@ -164,19 +166,12 @@ src_configure() {
 		-DUSE_OPENCV=$(usex opencv)
 		-DUSE_OPENMP=$(usex openmp)
 		-DUSE_ROCM=OFF # TODO
-		-DUSE_SYSTEM_CPUINFO=ON
-		-DUSE_SYSTEM_PYBIND11=ON
 		-DUSE_UCC=OFF
 		-DUSE_VALGRIND=OFF
 		-DPYBIND11_PYTHON_VERSION="${EPYTHON#python}"
 		-DPYTHON_EXECUTABLE="${PYTHON}"
 		-DUSE_ITT=OFF
-		-DUSE_SYSTEM_PTHREADPOOL=ON
-		-DUSE_SYSTEM_FXDIV=ON
-		-DUSE_SYSTEM_FP16=ON
-		-DUSE_SYSTEM_GLOO=ON
-		-DUSE_SYSTEM_ONNX=ON
-		-DUSE_SYSTEM_SLEEF=ON
+		-DUSE_SYSTEM_LIBS=ON
 		-DUSE_METAL=OFF
 
 		-Wno-dev
@@ -198,6 +193,16 @@ src_configure() {
 			-DCMAKE_CUDA_FLAGS="$(cuda_gccdir -f | tr -d \")"
 		)
 	fi
+
+	if use onednn; then
+		mycmakeargs+=(
+			-DUSE_MKLDNN=ON
+			-DMKLDNN_FOUND=ON
+			-DMKLDNN_LIBRARIES=dnnl
+			-DMKLDNN_INCLUDE_DIR="${ESYSROOT}/usr/include/oneapi/dnnl;${WORKDIR}/ideep-${IDEEP_VERSION}/include"
+		)
+	fi
+
 	cmake_src_configure
 }
 
diff --git a/sci-libs/caffe2/metadata.xml b/sci-libs/caffe2/metadata.xml
index eac4c942a88d..e69bb62ba592 100644
--- a/sci-libs/caffe2/metadata.xml
+++ b/sci-libs/caffe2/metadata.xml
@@ -16,6 +16,7 @@
 		<flag name="gloo">Use sci-libs/gloo</flag>
 		<flag name="nnpack">Use NNPACK</flag>
 		<flag name="numpy">Add support for math operations through numpy</flag>
+		<flag name="onednn">Use oneDNN</flag>
 		<flag name="opencv">Add support for image processing operators</flag>
 		<flag name="openmp">Use OpenMP for parallel code</flag>
 		<flag name="qnnpack">Use QNNPACK</flag>