[gentoo-commits] repo/gentoo:master commit in: sci-ml/caffe2/

["Alfredo Tupone" <tupone@gentoo.org>]

commit:     5884bcb1fc524663d88eb2b1e0448ee7854f74c4
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 20 22:01:31 2025 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Thu Mar 20 22:06:16 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5884bcb1

sci-ml/caffe2: enable mem efficient attention via use

Closes: https://bugs.gentoo.org/947932
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>

 sci-ml/caffe2/caffe2-2.5.1-r8.ebuild | 13 +++++++++++--
 sci-ml/caffe2/caffe2-2.6.0.ebuild    | 13 +++++++++++--
 sci-ml/caffe2/metadata.xml           |  1 +
 3 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/sci-ml/caffe2/caffe2-2.5.1-r8.ebuild b/sci-ml/caffe2/caffe2-2.5.1-r8.ebuild
index 848c743feb57..902bee88e3f5 100644
--- a/sci-ml/caffe2/caffe2-2.5.1-r8.ebuild
+++ b/sci-ml/caffe2/caffe2-2.5.1-r8.ebuild
@@ -20,7 +20,8 @@ S="${WORKDIR}"/${MYP}
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="cuda distributed fbgemm flash gloo mkl mpi nnpack +numpy onednn openblas opencl openmp qnnpack rocm xnnpack"
+IUSE="cuda distributed fbgemm flash gloo memefficient mkl mpi nnpack +numpy
+	onednn openblas opencl openmp qnnpack rocm xnnpack"
 RESTRICT="test"
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
@@ -149,6 +150,14 @@ src_prepare() {
 		c10/CMakeLists.txt \
 		c10/hip/CMakeLists.txt \
 		|| die
+	sed -i \
+		-e 's:pocketfft_hdronly.h:pocketfft/pocketfft_hdronly.h:' \
+		aten/src/ATen/native/mkl/SpectralOps.cpp \
+		die
+	sed -i \
+		-e '/Using pocketfft in directory:/d' \
+		cmake/Dependencies.cmake \
+		|| die
 
 	cmake_src_prepare
 	pushd torch/csrc/jit/serialization || die
@@ -213,7 +222,7 @@ src_configure() {
 		-DUSE_ITT=OFF
 		-DUSE_KINETO=OFF # TODO
 		-DUSE_MAGMA=OFF # TODO: In GURU as sci-libs/magma
-		-DUSE_MEM_EFF_ATTENTION=OFF
+		-DUSE_MEM_EFF_ATTENTION=$(usex memefficient)
 		-DUSE_MKLDNN=$(usex onednn)
 		-DUSE_MPI=$(usex mpi)
 		-DUSE_NCCL=OFF

diff --git a/sci-ml/caffe2/caffe2-2.6.0.ebuild b/sci-ml/caffe2/caffe2-2.6.0.ebuild
index b7d62a0ae814..1cd499d32116 100644
--- a/sci-ml/caffe2/caffe2-2.6.0.ebuild
+++ b/sci-ml/caffe2/caffe2-2.6.0.ebuild
@@ -20,7 +20,8 @@ S="${WORKDIR}"/${MYP}
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="cuda distributed fbgemm flash gloo mkl mpi nnpack +numpy onednn openblas opencl openmp qnnpack rocm xnnpack"
+IUSE="cuda distributed fbgemm flash gloo memefficient mkl mpi nnpack +numpy
+	onednn openblas opencl openmp qnnpack rocm xnnpack"
 RESTRICT="test"
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
@@ -149,6 +150,14 @@ src_prepare() {
 		c10/CMakeLists.txt \
 		c10/hip/CMakeLists.txt \
 		|| die
+	sed -i \
+		-e 's:pocketfft_hdronly.h:pocketfft/pocketfft_hdronly.h:' \
+		aten/src/ATen/native/mkl/SpectralOps.cpp \
+		die
+	sed -i \
+		-e '/Using pocketfft in directory:/d' \
+		cmake/Dependencies.cmake \
+		|| die
 
 	cmake_src_prepare
 	pushd torch/csrc/jit/serialization || die
@@ -213,7 +222,7 @@ src_configure() {
 		-DUSE_ITT=OFF
 		-DUSE_KINETO=OFF # TODO
 		-DUSE_MAGMA=OFF # TODO: In GURU as sci-libs/magma
-		-DUSE_MEM_EFF_ATTENTION=OFF
+		-DUSE_MEM_EFF_ATTENTION=$(usex memefficient)
 		-DUSE_MKLDNN=$(usex onednn)
 		-DUSE_MPI=$(usex mpi)
 		-DUSE_NCCL=OFF

diff --git a/sci-ml/caffe2/metadata.xml b/sci-ml/caffe2/metadata.xml
index 0754850fe24c..2483e58ed39e 100644
--- a/sci-ml/caffe2/metadata.xml
+++ b/sci-ml/caffe2/metadata.xml
@@ -10,6 +10,7 @@
 		<flag name="fbgemm">Use <pkg>sci-ml/FBGEMM</pkg></flag>
 		<flag name="flash">Enable flash attention</flag>
 		<flag name="gloo">Use <pkg>sci-ml/gloo</pkg></flag>
+		<flag name="memefficient">Enable mem efficient attention</flag>
 		<flag name="mkl">Use <pkg>sci-libs/mkl</pkg> for blas, lapack and sparse blas routines</flag>
 		<flag name="nnpack">Use <pkg>sci-ml/NNPACK</pkg></flag>
 		<flag name="numpy">Add support for math operations through numpy</flag>