* [gentoo-commits] repo/gentoo:master commit in: sci-ml/caffe2/
@ 2025-03-15 18:12 Alfredo Tupone
0 siblings, 0 replies; 4+ messages in thread
From: Alfredo Tupone @ 2025-03-15 18:12 UTC (permalink / raw
To: gentoo-commits
commit: dbb4b741b8e8d2e1216a5d3784636f08b3aefa17
Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 15 18:05:32 2025 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Sat Mar 15 18:05:32 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dbb4b741
sci-ml/caffe2: depends on libfmt subslot
Closes: https://bugs.gentoo.org/950700
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
sci-ml/caffe2/caffe2-2.4.1-r4.ebuild | 2 +-
sci-ml/caffe2/caffe2-2.5.1-r8.ebuild | 2 +-
sci-ml/caffe2/caffe2-2.6.0.ebuild | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/sci-ml/caffe2/caffe2-2.4.1-r4.ebuild b/sci-ml/caffe2/caffe2-2.4.1-r4.ebuild
index 2321cda498ba..9fb7f21f1712 100644
--- a/sci-ml/caffe2/caffe2-2.4.1-r4.ebuild
+++ b/sci-ml/caffe2/caffe2-2.4.1-r4.ebuild
@@ -41,7 +41,7 @@ RDEPEND="
dev-cpp/gflags:=
>=dev-cpp/glog-0.5.0
dev-libs/cpuinfo
- dev-libs/libfmt
+ dev-libs/libfmt:=
dev-cpp/opentelemetry-cpp
dev-libs/protobuf:=
dev-libs/pthreadpool
diff --git a/sci-ml/caffe2/caffe2-2.5.1-r8.ebuild b/sci-ml/caffe2/caffe2-2.5.1-r8.ebuild
index 0fb183f35ead..848c743feb57 100644
--- a/sci-ml/caffe2/caffe2-2.5.1-r8.ebuild
+++ b/sci-ml/caffe2/caffe2-2.5.1-r8.ebuild
@@ -41,7 +41,7 @@ RDEPEND="
dev-cpp/nlohmann_json
dev-cpp/opentelemetry-cpp
dev-libs/cpuinfo
- dev-libs/libfmt
+ dev-libs/libfmt:=
dev-libs/protobuf:=
dev-libs/pthreadpool
dev-libs/sleef
diff --git a/sci-ml/caffe2/caffe2-2.6.0.ebuild b/sci-ml/caffe2/caffe2-2.6.0.ebuild
index d89acd555fe3..b7d62a0ae814 100644
--- a/sci-ml/caffe2/caffe2-2.6.0.ebuild
+++ b/sci-ml/caffe2/caffe2-2.6.0.ebuild
@@ -41,7 +41,7 @@ RDEPEND="
dev-cpp/nlohmann_json
dev-cpp/opentelemetry-cpp
dev-libs/cpuinfo
- dev-libs/libfmt
+ dev-libs/libfmt:=
dev-libs/protobuf:=
dev-libs/pthreadpool
dev-libs/sleef
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-ml/caffe2/
@ 2025-03-20 22:06 Alfredo Tupone
0 siblings, 0 replies; 4+ messages in thread
From: Alfredo Tupone @ 2025-03-20 22:06 UTC (permalink / raw
To: gentoo-commits
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>
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-ml/caffe2/
@ 2025-03-21 21:15 Alfredo Tupone
0 siblings, 0 replies; 4+ messages in thread
From: Alfredo Tupone @ 2025-03-21 21:15 UTC (permalink / raw
To: gentoo-commits
commit: 7a3e9f0f6c2bf2a8acd2b1c70b8b62dd0dc7cb6b
Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 21 21:11:29 2025 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Fri Mar 21 21:12:09 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a3e9f0f
sci-ml/caffe2: wrong pocketfft path
Closes: https://bugs.gentoo.org/951726
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
sci-ml/caffe2/caffe2-2.5.1-r8.ebuild | 4 ----
sci-ml/caffe2/caffe2-2.6.0.ebuild | 4 ----
2 files changed, 8 deletions(-)
diff --git a/sci-ml/caffe2/caffe2-2.5.1-r8.ebuild b/sci-ml/caffe2/caffe2-2.5.1-r8.ebuild
index 9857781b5a3c..f32531970143 100644
--- a/sci-ml/caffe2/caffe2-2.5.1-r8.ebuild
+++ b/sci-ml/caffe2/caffe2-2.5.1-r8.ebuild
@@ -150,10 +150,6 @@ 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 \
diff --git a/sci-ml/caffe2/caffe2-2.6.0.ebuild b/sci-ml/caffe2/caffe2-2.6.0.ebuild
index b498940fb51d..d47ee444f2d2 100644
--- a/sci-ml/caffe2/caffe2-2.6.0.ebuild
+++ b/sci-ml/caffe2/caffe2-2.6.0.ebuild
@@ -150,10 +150,6 @@ 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 \
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-ml/caffe2/
@ 2025-03-21 22:12 Alfredo Tupone
0 siblings, 0 replies; 4+ messages in thread
From: Alfredo Tupone @ 2025-03-21 22:12 UTC (permalink / raw
To: gentoo-commits
commit: 2cb3eedf9f08e841e4623c3636429a232135a9f5
Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 21 22:08:14 2025 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Fri Mar 21 22:12:37 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2cb3eedf
sci-ml/caffe2: fix prefix
Closes: https://bugs.gentoo.org/948897
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
sci-ml/caffe2/caffe2-2.5.1-r8.ebuild | 4 ++--
sci-ml/caffe2/caffe2-2.6.0.ebuild | 4 ++--
2 files changed, 4 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 f32531970143..d62de604417b 100644
--- a/sci-ml/caffe2/caffe2-2.5.1-r8.ebuild
+++ b/sci-ml/caffe2/caffe2-2.5.1-r8.ebuild
@@ -323,9 +323,9 @@ src_install() {
ln -s ../../../../../include/torch \
"${D}$(python_get_sitedir)"/torch/include/torch || die # bug 923269
- mv "${D}"/usr/bin/torch_shm_manager \
+ mv "${ED}"/usr/bin/torch_shm_manager \
"${D}"/$(python_get_sitedir)/torch/bin/ || die
- mv "${D}"/usr/$(get_libdir)/libtorch_global_deps.so \
+ mv "${ED}"/usr/$(get_libdir)/libtorch_global_deps.so \
"${D}"/$(python_get_sitedir)/torch/lib/ || die
}
diff --git a/sci-ml/caffe2/caffe2-2.6.0.ebuild b/sci-ml/caffe2/caffe2-2.6.0.ebuild
index d47ee444f2d2..16bd774af57d 100644
--- a/sci-ml/caffe2/caffe2-2.6.0.ebuild
+++ b/sci-ml/caffe2/caffe2-2.6.0.ebuild
@@ -323,9 +323,9 @@ src_install() {
ln -s ../../../../../include/torch \
"${D}$(python_get_sitedir)"/torch/include/torch || die # bug 923269
- mv "${D}"/usr/bin/torch_shm_manager \
+ mv "${ED}"/usr/bin/torch_shm_manager \
"${D}"/$(python_get_sitedir)/torch/bin/ || die
- mv "${D}"/usr/$(get_libdir)/libtorch_global_deps.so \
+ mv "${ED}"/usr/$(get_libdir)/libtorch_global_deps.so \
"${D}"/$(python_get_sitedir)/torch/lib/ || die
}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2025-03-21 22:12 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-03-21 22:12 [gentoo-commits] repo/gentoo:master commit in: sci-ml/caffe2/ Alfredo Tupone
-- strict thread matches above, loose matches on Subject: below --
2025-03-21 21:15 Alfredo Tupone
2025-03-20 22:06 Alfredo Tupone
2025-03-15 18:12 Alfredo Tupone
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox