* [gentoo-commits] repo/gentoo:master commit in: sci-ml/caffe2/
@ 2025-03-15 18:12 Alfredo Tupone
0 siblings, 0 replies; 17+ 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] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-ml/caffe2/
@ 2025-03-20 22:06 Alfredo Tupone
0 siblings, 0 replies; 17+ 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] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-ml/caffe2/
@ 2025-03-21 21:15 Alfredo Tupone
0 siblings, 0 replies; 17+ 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] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-ml/caffe2/
@ 2025-03-21 22:12 Alfredo Tupone
0 siblings, 0 replies; 17+ 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] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-ml/caffe2/
@ 2025-05-05 6:29 Alfredo Tupone
0 siblings, 0 replies; 17+ messages in thread
From: Alfredo Tupone @ 2025-05-05 6:29 UTC (permalink / raw
To: gentoo-commits
commit: d7dc88822df0b4d3902cda0ef46c996245187f3d
Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Mon May 5 06:24:07 2025 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Mon May 5 06:29:30 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7dc8882
sci-ml/caffe2: kineto is needed runtime
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
sci-ml/caffe2/{caffe2-2.7.0.ebuild => caffe2-2.7.0-r1.ebuild} | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/sci-ml/caffe2/caffe2-2.7.0.ebuild b/sci-ml/caffe2/caffe2-2.7.0-r1.ebuild
similarity index 99%
rename from sci-ml/caffe2/caffe2-2.7.0.ebuild
rename to sci-ml/caffe2/caffe2-2.7.0-r1.ebuild
index 1ee026bcf176..2d63dc4b5bb3 100644
--- a/sci-ml/caffe2/caffe2-2.7.0.ebuild
+++ b/sci-ml/caffe2/caffe2-2.7.0-r1.ebuild
@@ -53,9 +53,10 @@ RDEPEND="
dev-libs/protobuf:=
dev-libs/pthreadpool
dev-libs/sleef
- virtual/lapack
sci-ml/foxi
+ ~sci-ml/kineto-0.4.0_p20250214
sci-ml/onnx
+ virtual/lapack
cuda? (
dev-libs/cudnn
>=sci-ml/cudnn-frontend-1.0.3:0/8
@@ -105,7 +106,6 @@ DEPEND="
dev-libs/pocketfft
dev-libs/psimd
sci-ml/FP16
- ~sci-ml/kineto-0.4.0_p20250214
$(python_gen_cond_dep '
dev-python/pybind11[${PYTHON_USEDEP}]
dev-python/pyyaml[${PYTHON_USEDEP}]
@@ -232,7 +232,7 @@ src_configure() {
-DUSE_GLOG=ON
-DUSE_GLOO=$(usex gloo)
-DUSE_ITT=OFF
- -DUSE_KINETO=ON # TODO
+ -DUSE_KINETO=ON
-DUSE_KLEIDIAI=OFF # TODO
-DUSE_MAGMA=OFF # TODO: In GURU as sci-libs/magma
-DUSE_MEM_EFF_ATTENTION=$(usex memefficient)
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-ml/caffe2/
@ 2025-05-17 20:55 Alfredo Tupone
0 siblings, 0 replies; 17+ messages in thread
From: Alfredo Tupone @ 2025-05-17 20:55 UTC (permalink / raw
To: gentoo-commits
commit: be8651d12236d74a00140a355f63dbb470007adb
Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Sat May 17 20:44:41 2025 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Sat May 17 20:45:16 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be8651d1
sci-ml/caffe2: restrict cutlass version to use
Closes: https://bugs.gentoo.org/955683
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
sci-ml/caffe2/caffe2-2.7.0-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-ml/caffe2/caffe2-2.7.0-r1.ebuild b/sci-ml/caffe2/caffe2-2.7.0-r1.ebuild
index 2d63dc4b5bb3..e4485984f80d 100644
--- a/sci-ml/caffe2/caffe2-2.7.0-r1.ebuild
+++ b/sci-ml/caffe2/caffe2-2.7.0-r1.ebuild
@@ -111,7 +111,7 @@ DEPEND="
dev-python/pyyaml[${PYTHON_USEDEP}]
dev-python/typing-extensions[${PYTHON_USEDEP}]
')
- cuda? ( >=dev-libs/cutlass-3.8.0 )
+ cuda? ( ~dev-libs/cutlass-3.8.0 )
onednn? ( sci-ml/ideep )
qnnpack? ( dev-libs/clog )
"
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-ml/caffe2/
@ 2025-05-23 6:53 Alfredo Tupone
0 siblings, 0 replies; 17+ messages in thread
From: Alfredo Tupone @ 2025-05-23 6:53 UTC (permalink / raw
To: gentoo-commits
commit: 883310f11ac13b90635ce2c768437f09bc255c2f
Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Fri May 23 06:49:52 2025 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Fri May 23 06:50:28 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=883310f1
sci-ml/caffe2: add usage of cusparselt
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
sci-ml/caffe2/{caffe2-2.7.0-r1.ebuild => caffe2-2.7.0-r2.ebuild} | 4 +++-
sci-ml/caffe2/metadata.xml | 1 +
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/sci-ml/caffe2/caffe2-2.7.0-r1.ebuild b/sci-ml/caffe2/caffe2-2.7.0-r2.ebuild
similarity index 98%
rename from sci-ml/caffe2/caffe2-2.7.0-r1.ebuild
rename to sci-ml/caffe2/caffe2-2.7.0-r2.ebuild
index e4485984f80d..f9d324654e49 100644
--- a/sci-ml/caffe2/caffe2-2.7.0-r1.ebuild
+++ b/sci-ml/caffe2/caffe2-2.7.0-r2.ebuild
@@ -27,7 +27,7 @@ S="${WORKDIR}"/${MYP}
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~arm64"
-IUSE="cuda distributed fbgemm flash gloo memefficient mkl mpi nnpack +numpy
+IUSE="cuda cusparselt distributed fbgemm flash gloo memefficient mkl mpi nnpack +numpy
onednn openblas opencl openmp qnnpack rocm xnnpack"
RESTRICT="test"
REQUIRED_USE="
@@ -61,6 +61,7 @@ RDEPEND="
dev-libs/cudnn
>=sci-ml/cudnn-frontend-1.0.3:0/8
dev-util/nvidia-cuda-toolkit:=[profiler]
+ cusparselt? ( dev-libs/cusparselt )
)
fbgemm? ( sci-ml/FBGEMM )
gloo? ( sci-ml/gloo[cuda?] )
@@ -284,6 +285,7 @@ src_configure() {
-DTORCH_CUDA_ARCH_LIST="${TORCH_CUDA_ARCH_LIST:-3.5 7.0}"
-DUSE_NCCL=OFF # TODO: NVIDIA Collective Communication Library
-DCMAKE_CUDA_FLAGS="$(cuda_gccdir -f | tr -d \")"
+ -DUSE_CUSPARSELT=$(usex cusparselt)
)
elif use rocm; then
export PYTORCH_ROCM_ARCH="$(get_amdgpu_flags)"
diff --git a/sci-ml/caffe2/metadata.xml b/sci-ml/caffe2/metadata.xml
index 2483e58ed39e..961dd624f404 100644
--- a/sci-ml/caffe2/metadata.xml
+++ b/sci-ml/caffe2/metadata.xml
@@ -6,6 +6,7 @@
<name>Tupone Alfredo</name>
</maintainer>
<use>
+ <flag name="cusparselt">Use the CUDA Sparse Matrix Multiplication</flag>
<flag name="distributed">Support distributed applications</flag>
<flag name="fbgemm">Use <pkg>sci-ml/FBGEMM</pkg></flag>
<flag name="flash">Enable flash attention</flag>
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-ml/caffe2/
@ 2025-06-14 20:43 Alfredo Tupone
0 siblings, 0 replies; 17+ messages in thread
From: Alfredo Tupone @ 2025-06-14 20:43 UTC (permalink / raw
To: gentoo-commits
commit: 54d2f997ce7d3d5e5f27e42d2e836345846c0486
Author: Sv. Lockal <lockalsash <AT> gmail <DOT> com>
AuthorDate: Sat Jun 14 14:05:41 2025 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Sat Jun 14 20:00:09 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54d2f997
sci-ml/caffe2-2.7.0[rocm]: fix compilation
There were 2 independent issues:
* incorrect revision for composable-kernel (see https://github.com/pytorch/pytorch/tree/v2.7.0/third_party)
Closes: https://bugs.gentoo.org/955525
Signed-off-by: Sv. Lockal <lockalsash <AT> gmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/42594
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
sci-ml/caffe2/Manifest | 1 +
sci-ml/caffe2/caffe2-2.7.0-r2.ebuild | 7 +++++--
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/sci-ml/caffe2/Manifest b/sci-ml/caffe2/Manifest
index 32f540381bbc..d354f3d2d760 100644
--- a/sci-ml/caffe2/Manifest
+++ b/sci-ml/caffe2/Manifest
@@ -1,5 +1,6 @@
DIST caffe2-patches-20240809.tar.gz 15242 BLAKE2B 77503c61487e7d85cca5afcab9a6e638f9833a70861845638cf1b62bc492d7b6650e6db81d53ebb2f39c6313509250d339f725f04d03ec6dd23dd0cf70843d8c SHA512 74b3b0b6671b655ecac93f7436c4ed7cb0157a83aafbf6afcc0811e11cef341cd8f638db1a111bcbb01e1a6dd4daf3a36b96d7a8ce90f04c2fa091bd6e3a142b
DIST composable_kernel-50ee4267.tar.gz 4194795 BLAKE2B b3c97d98a0c9e4620fdae3d30006edf55cc60ffa7f8518f6acb8d808647bc4de362c2e2b7e974686503fa2c7f359b6981cfbda74e40cc1bad4d351c5d2ff92e1 SHA512 9fc6f5f15556f020414b4567520329ef762209a82411a246c2bc1240a9fed2669f7fcb982cf773e3e9561bf9a2c557dba82b8b469d2e5844e679e2f5ab7c3e17
+DIST composable_kernel-8086bbe3.tar.gz 4418862 BLAKE2B b710e3d4586899443ec01044dad19fd2f992c351e2f65ba526dfcc47cc65c095beaf8ac21a8f71c02a0eb524d364e817b27241a9198884f2bdae9924b51e24e4 SHA512 8410b5a1c864d71f3034ef0d9d1245078856d09cc191faec59856c229bf11d89ae291036d735cb5cec4f1d72e6e9e8f6921833147f9619d30cfab8722d3a9f63
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
diff --git a/sci-ml/caffe2/caffe2-2.7.0-r2.ebuild b/sci-ml/caffe2/caffe2-2.7.0-r2.ebuild
index f9d324654e49..f5098c80fadb 100644
--- a/sci-ml/caffe2/caffe2-2.7.0-r2.ebuild
+++ b/sci-ml/caffe2/caffe2-2.7.0-r2.ebuild
@@ -12,7 +12,7 @@ MYP=${MYPN}-${PV}
# caffe2-2.6.0 depends on future version of composable kernel
# TODO: replace it with RDEPEND in the future
-CK_COMMIT=50ee4267e27b875d149e642f4cebd47be1dc3b57
+CK_COMMIT=8086bbe3a78d931eb96fe12fdc014082e18d18d3
CK_P=composable_kernel-${CK_COMMIT:0:8}
DESCRIPTION="A deep learning framework"
@@ -159,6 +159,9 @@ src_prepare() {
cmake/Dependencies.cmake \
|| die
+ # Noisy warnings from Logging.h
+ sed -i 's/-Wextra-semi//' cmake/public/utils.cmake || die
+
cmake_src_prepare
pushd torch/csrc/jit/serialization || die
flatc --cpp --gen-mutable --scoped-enums mobile_bytecode.fbs || die
@@ -297,7 +300,7 @@ src_configure() {
)
# ROCm libraries produce too much warnings
- append-cxxflags -Wno-deprecated-declarations -Wno-unused-result
+ append-cxxflags -Wno-deprecated-declarations -Wno-unused-result -Wno-unused-value
fi
if use onednn; then
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-ml/caffe2/
@ 2025-06-14 22:42 Sam James
0 siblings, 0 replies; 17+ messages in thread
From: Sam James @ 2025-06-14 22:42 UTC (permalink / raw
To: gentoo-commits
commit: 2ef35d1f11c2e99fb970344160e8c0007a914a30
Author: Sv. Lockal <lockalsash <AT> gmail <DOT> com>
AuthorDate: Fri Jun 13 08:36:49 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jun 14 22:37:12 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ef35d1f
sci-ml/caffe2: remove ROCM_USEDEP due to pkgcore limitation, allow rocm-6.4
Signed-off-by: Sv. Lockal <lockalsash <AT> gmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/42554
Closes: https://github.com/gentoo/gentoo/pull/42554
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-ml/caffe2/caffe2-2.4.1-r7.ebuild | 22 +++++++++++-----------
sci-ml/caffe2/caffe2-2.5.1-r11.ebuild | 22 +++++++++++-----------
sci-ml/caffe2/caffe2-2.7.0-r2.ebuild | 26 +++++++++++++-------------
3 files changed, 35 insertions(+), 35 deletions(-)
diff --git a/sci-ml/caffe2/caffe2-2.4.1-r7.ebuild b/sci-ml/caffe2/caffe2-2.4.1-r7.ebuild
index 9ebbcd75c285..b51bab3da130 100644
--- a/sci-ml/caffe2/caffe2-2.4.1-r7.ebuild
+++ b/sci-ml/caffe2/caffe2-2.4.1-r7.ebuild
@@ -71,17 +71,17 @@ RDEPEND="
)
rocm? (
=dev-util/hip-6.1*
- =dev-libs/rccl-6.1*[${ROCM_USEDEP}]
- =sci-libs/rocThrust-6.1*[${ROCM_USEDEP}]
- =sci-libs/rocPRIM-6.1*[${ROCM_USEDEP}]
- =sci-libs/hipBLAS-6.1*[${ROCM_USEDEP}]
- =sci-libs/hipFFT-6.1*[${ROCM_USEDEP}]
- =sci-libs/hipSPARSE-6.1*[${ROCM_USEDEP}]
- =sci-libs/hipRAND-6.1*[${ROCM_USEDEP}]
- =sci-libs/hipCUB-6.1*[${ROCM_USEDEP}]
- =sci-libs/hipSOLVER-6.1*[${ROCM_USEDEP}]
- =sci-libs/miopen-6.1*[${ROCM_USEDEP}]
- =dev-util/roctracer-6.1*[${ROCM_USEDEP}]
+ =dev-libs/rccl-6.1*
+ =sci-libs/rocThrust-6.1*
+ =sci-libs/rocPRIM-6.1*
+ =sci-libs/hipBLAS-6.1*
+ =sci-libs/hipFFT-6.1*
+ =sci-libs/hipSPARSE-6.1*
+ =sci-libs/hipRAND-6.1*
+ =sci-libs/hipCUB-6.1*
+ =sci-libs/hipSOLVER-6.1*
+ =sci-libs/miopen-6.1*
+ =dev-util/roctracer-6.1*
=sci-libs/hipBLASLt-6.1*
amdgpu_targets_gfx90a? ( =sci-libs/hipBLASLt-6.1*[amdgpu_targets_gfx90a] )
diff --git a/sci-ml/caffe2/caffe2-2.5.1-r11.ebuild b/sci-ml/caffe2/caffe2-2.5.1-r11.ebuild
index 3c540734adb9..972677ae2238 100644
--- a/sci-ml/caffe2/caffe2-2.5.1-r11.ebuild
+++ b/sci-ml/caffe2/caffe2-2.5.1-r11.ebuild
@@ -69,17 +69,17 @@ RDEPEND="
)
rocm? (
=dev-util/hip-6.1*
- =dev-libs/rccl-6.1*[${ROCM_USEDEP}]
- =sci-libs/rocThrust-6.1*[${ROCM_USEDEP}]
- =sci-libs/rocPRIM-6.1*[${ROCM_USEDEP}]
- =sci-libs/hipBLAS-6.1*[${ROCM_USEDEP}]
- =sci-libs/hipFFT-6.1*[${ROCM_USEDEP}]
- =sci-libs/hipSPARSE-6.1*[${ROCM_USEDEP}]
- =sci-libs/hipRAND-6.1*[${ROCM_USEDEP}]
- =sci-libs/hipCUB-6.1*[${ROCM_USEDEP}]
- =sci-libs/hipSOLVER-6.1*[${ROCM_USEDEP}]
- =sci-libs/miopen-6.1*[${ROCM_USEDEP}]
- =dev-util/roctracer-6.1*[${ROCM_USEDEP}]
+ =dev-libs/rccl-6.1*
+ =sci-libs/rocThrust-6.1*
+ =sci-libs/rocPRIM-6.1*
+ =sci-libs/hipBLAS-6.1*
+ =sci-libs/hipFFT-6.1*
+ =sci-libs/hipSPARSE-6.1*
+ =sci-libs/hipRAND-6.1*
+ =sci-libs/hipCUB-6.1*
+ =sci-libs/hipSOLVER-6.1*
+ =sci-libs/miopen-6.1*
+ =dev-util/roctracer-6.1*
=sci-libs/hipBLASLt-6.1*
amdgpu_targets_gfx90a? ( =sci-libs/hipBLASLt-6.1*[amdgpu_targets_gfx90a] )
diff --git a/sci-ml/caffe2/caffe2-2.7.0-r2.ebuild b/sci-ml/caffe2/caffe2-2.7.0-r2.ebuild
index f5098c80fadb..df43feb36474 100644
--- a/sci-ml/caffe2/caffe2-2.7.0-r2.ebuild
+++ b/sci-ml/caffe2/caffe2-2.7.0-r2.ebuild
@@ -77,19 +77,19 @@ RDEPEND="
sci-ml/gemmlowp
)
rocm? (
- >=dev-libs/rccl-6.1 <dev-libs/rccl-6.4
- >=dev-util/hip-6.1 <dev-util/hip-6.4
- >=dev-util/roctracer-6.1 <dev-util/roctracer-6.4
- >=sci-libs/hipBLAS-6.1 <sci-libs/hipBLAS-6.4
- >=sci-libs/hipBLASLt-6.1 <sci-libs/hipBLASLt-6.4
- >=sci-libs/hipCUB-6.1 <sci-libs/hipCUB-6.4
- >=sci-libs/hipFFT-6.1 <sci-libs/hipFFT-6.4
- >=sci-libs/hipRAND-6.1 <sci-libs/hipRAND-6.4
- >=sci-libs/hipSOLVER-6.1 <sci-libs/hipSOLVER-6.4
- >=sci-libs/hipSPARSE-6.1 <sci-libs/hipSPARSE-6.4
- >=sci-libs/miopen-6.1 <sci-libs/miopen-6.4
- >=sci-libs/rocPRIM-6.1 <sci-libs/rocPRIM-6.4
- >=sci-libs/rocThrust-6.1 <sci-libs/rocThrust-6.4
+ >=dev-libs/rccl-6.1 <dev-libs/rccl-6.5
+ >=dev-util/hip-6.1 <dev-util/hip-6.5
+ >=dev-util/roctracer-6.1 <dev-util/roctracer-6.5
+ >=sci-libs/hipBLAS-6.1 <sci-libs/hipBLAS-6.5
+ >=sci-libs/hipBLASLt-6.1 <sci-libs/hipBLASLt-6.5
+ >=sci-libs/hipCUB-6.1 <sci-libs/hipCUB-6.5
+ >=sci-libs/hipFFT-6.1 <sci-libs/hipFFT-6.5
+ >=sci-libs/hipRAND-6.1 <sci-libs/hipRAND-6.5
+ >=sci-libs/hipSOLVER-6.1 <sci-libs/hipSOLVER-6.5
+ >=sci-libs/hipSPARSE-6.1 <sci-libs/hipSPARSE-6.5
+ >=sci-libs/miopen-6.1 <sci-libs/miopen-6.5
+ >=sci-libs/rocPRIM-6.1 <sci-libs/rocPRIM-6.5
+ >=sci-libs/rocThrust-6.1 <sci-libs/rocThrust-6.5
)
distributed? (
sci-ml/tensorpipe[cuda?]
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-ml/caffe2/
@ 2025-06-29 8:25 Alfredo Tupone
0 siblings, 0 replies; 17+ messages in thread
From: Alfredo Tupone @ 2025-06-29 8:25 UTC (permalink / raw
To: gentoo-commits
commit: bc5e3f67234b67c8081855ceddf85daa22a3b937
Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 29 08:23:31 2025 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Sun Jun 29 08:23:54 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc5e3f67
sci-ml/caffe2: update SRC_URI
Closes: https://bugs.gentoo.org/956617
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
sci-ml/caffe2/Manifest | 1 +
sci-ml/caffe2/caffe2-2.7.0-r2.ebuild | 14 +++++++++++++-
2 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/sci-ml/caffe2/Manifest b/sci-ml/caffe2/Manifest
index d354f3d2d760..84648ef05b69 100644
--- a/sci-ml/caffe2/Manifest
+++ b/sci-ml/caffe2/Manifest
@@ -1,6 +1,7 @@
DIST caffe2-patches-20240809.tar.gz 15242 BLAKE2B 77503c61487e7d85cca5afcab9a6e638f9833a70861845638cf1b62bc492d7b6650e6db81d53ebb2f39c6313509250d339f725f04d03ec6dd23dd0cf70843d8c SHA512 74b3b0b6671b655ecac93f7436c4ed7cb0157a83aafbf6afcc0811e11cef341cd8f638db1a111bcbb01e1a6dd4daf3a36b96d7a8ce90f04c2fa091bd6e3a142b
DIST composable_kernel-50ee4267.tar.gz 4194795 BLAKE2B b3c97d98a0c9e4620fdae3d30006edf55cc60ffa7f8518f6acb8d808647bc4de362c2e2b7e974686503fa2c7f359b6981cfbda74e40cc1bad4d351c5d2ff92e1 SHA512 9fc6f5f15556f020414b4567520329ef762209a82411a246c2bc1240a9fed2669f7fcb982cf773e3e9561bf9a2c557dba82b8b469d2e5844e679e2f5ab7c3e17
DIST composable_kernel-8086bbe3.tar.gz 4418862 BLAKE2B b710e3d4586899443ec01044dad19fd2f992c351e2f65ba526dfcc47cc65c095beaf8ac21a8f71c02a0eb524d364e817b27241a9198884f2bdae9924b51e24e4 SHA512 8410b5a1c864d71f3034ef0d9d1245078856d09cc191faec59856c229bf11d89ae291036d735cb5cec4f1d72e6e9e8f6921833147f9619d30cfab8722d3a9f63
+DIST flash-attention-2.7.4.gh.tar.gz 5841323 BLAKE2B 432999d763f2b3d732580ddfea5d3e01370351db0656546259a5e500a07516dd03c98828bfb55855dabe4adc651033b5d97ea4725ca46158b9970f0fbc662710 SHA512 05a4afb09e666f7404d6a3f8b5256e7bed6eba60a6f1bde2b7dbb96d318975f0b458c2521c7a38d88e97b6e4c27f29077cf787849daf82586e33f43a3d9a84b3
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
diff --git a/sci-ml/caffe2/caffe2-2.7.0-r2.ebuild b/sci-ml/caffe2/caffe2-2.7.0-r2.ebuild
index 3e0bdbbb2574..f969e5ff404d 100644
--- a/sci-ml/caffe2/caffe2-2.7.0-r2.ebuild
+++ b/sci-ml/caffe2/caffe2-2.7.0-r2.ebuild
@@ -15,11 +15,22 @@ MYP=${MYPN}-${PV}
CK_COMMIT=8086bbe3a78d931eb96fe12fdc014082e18d18d3
CK_P=composable_kernel-${CK_COMMIT:0:8}
+FLASH_PV=2.7.4
+FLASH_PN=flash-attention
+FLASH_P=${FLASH_PN}-${FLASH_PV}
+
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
- rocm? ( https://github.com/ROCm/composable_kernel/archive/${CK_COMMIT}.tar.gz -> ${CK_P}.tar.gz )
+ rocm? (
+ https://github.com/ROCm/composable_kernel/archive/${CK_COMMIT}.tar.gz
+ -> ${CK_P}.tar.gz
+ )
+ flash? (
+ https://github.com/Dao-AILab/${FLASH_PN}/archive/refs/tags/v${FLASH_PV}.tar.gz
+ -> ${FLASH_P}.gh.tar.gz
+ )
"
S="${WORKDIR}"/${MYP}
@@ -131,6 +142,7 @@ PATCHES=(
)
src_prepare() {
+ use flash && mv "${WORKDIR}"/${FLASH_P}/* third_party/${FLASH_PN}/ || die
filter-lto #bug 862672
# Unbundle fmt
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-ml/caffe2/
@ 2025-07-01 6:19 Alfredo Tupone
0 siblings, 0 replies; 17+ messages in thread
From: Alfredo Tupone @ 2025-07-01 6:19 UTC (permalink / raw
To: gentoo-commits
commit: a9f1d698f53d163439dd88e2427ac266f0f58642
Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 1 06:17:30 2025 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Tue Jul 1 06:18:59 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9f1d698
sci-ml/caffe2: add 2.7.1
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
sci-ml/caffe2/Manifest | 1 +
sci-ml/caffe2/caffe2-2.7.1.ebuild | 366 ++++++++++++++++++++++++++++++++++++++
2 files changed, 367 insertions(+)
diff --git a/sci-ml/caffe2/Manifest b/sci-ml/caffe2/Manifest
index 84648ef05b69..8d81a58682be 100644
--- a/sci-ml/caffe2/Manifest
+++ b/sci-ml/caffe2/Manifest
@@ -6,3 +6,4 @@ DIST pytorch-2.4.1.tar.gz 115029469 BLAKE2B c2909ff27d527bc57cba56b780d3b8cd07a0
DIST pytorch-2.5.1.tar.gz 116091366 BLAKE2B 7838b17562b94ffc7d798031348689db607dd5eae2a3c35be365972e2b52a2c1b12067068d5aca5ab00cf0977d9c2c3c9ae5337d69534c864c732e6256cbeef6 SHA512 a913a466324a65fa3d79c5e9ad4d605fc7976f0134fda2f81aaa3cea29d56926604999b8a238759646d211e63b47bbb446cdffa86ca8defd8159f11e30301289
DIST pytorch-2.6.0.tar.gz 119594438 BLAKE2B 3152eb341cf42295e147e59625beb9c06608aa4b78f9618c1c0024b10c1c767715d07fe8c4be52d029ac47f808cd0d5e65c9530ec90d951a64b993083b4067ad SHA512 a70da80ff09d226085e18228132cf6bb236ad8cc47eed52375d0d2a615f09dd33849da947270b5670c184eab60cb8e2adf11d801babfbda7aa621400501d07b0
DIST pytorch-2.7.0.tar.gz 50197290 BLAKE2B 2a317d1e9b0d8876f1593382246cd9f786eff3c1b8602353c5e0010dc8414720c5de61886361843a0c33268830c784963a89b410b361e1b67636e652f6a6a2eb SHA512 63eb0363ea68d23567f5524ee8b51756d9302bbe1cbefa367335ab5ebe652523dba75fa417ea3e7eedfc67aa4bef1434c8b7e3dfde2152061b91b6e489763a55
+DIST pytorch-2.7.1.tar.gz 50203605 BLAKE2B 3f4b2643d86fe9ff30b2f335353dfe6a8e222bcc12143bc5d09268fb37bfd42f9451620e6e0db225c3c3e7930c999115fdd2ed62b7eae93b0d5e233270c7c760 SHA512 a9fc2252af9031c2cd46dde558c491aea8bc322fb80157a7760f300a44b759d4bfe866f030fbb974b80493057cfff4dd512498f99a100ed6d05bf620258ed37e
diff --git a/sci-ml/caffe2/caffe2-2.7.1.ebuild b/sci-ml/caffe2/caffe2-2.7.1.ebuild
new file mode 100644
index 000000000000..9a8498a37554
--- /dev/null
+++ b/sci-ml/caffe2/caffe2-2.7.1.ebuild
@@ -0,0 +1,366 @@
+# Copyright 2022-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{11..13} )
+ROCM_VERSION=6.1
+inherit python-single-r1 cmake cuda flag-o-matic prefix rocm toolchain-funcs
+
+MYPN=pytorch
+MYP=${MYPN}-${PV}
+
+# caffe2-2.6.0 depends on future version of composable kernel
+# TODO: replace it with RDEPEND in the future
+CK_COMMIT=8086bbe3a78d931eb96fe12fdc014082e18d18d3
+CK_P=composable_kernel-${CK_COMMIT:0:8}
+
+FLASH_PV=2.7.4
+FLASH_PN=flash-attention
+FLASH_P=${FLASH_PN}-${FLASH_PV}
+
+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
+ rocm? (
+ https://github.com/ROCm/composable_kernel/archive/${CK_COMMIT}.tar.gz
+ -> ${CK_P}.tar.gz
+ )
+ flash? (
+ https://github.com/Dao-AILab/${FLASH_PN}/archive/refs/tags/v${FLASH_PV}.tar.gz
+ -> ${FLASH_P}.gh.tar.gz
+ )
+"
+
+S="${WORKDIR}"/${MYP}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="cuda cusparselt distributed fbgemm flash gloo memefficient mkl mpi nnpack +numpy
+ onednn openblas opencl openmp qnnpack rocm xnnpack"
+RESTRICT="test"
+REQUIRED_USE="
+ ${PYTHON_REQUIRED_USE}
+ mpi? ( distributed )
+ gloo? ( distributed )
+ ?? ( cuda rocm )
+ rocm? (
+ || ( ${ROCM_REQUIRED_USE} )
+ !flash
+ )
+"
+
+RDEPEND="
+ ${PYTHON_DEPS}
+ dev-cpp/abseil-cpp:=
+ dev-cpp/gflags:=
+ >=dev-cpp/glog-0.5.0
+ dev-cpp/nlohmann_json
+ dev-cpp/opentelemetry-cpp
+ dev-libs/cpuinfo
+ dev-libs/libfmt:=
+ dev-libs/protobuf:=
+ dev-libs/pthreadpool
+ dev-libs/sleef
+ sci-ml/foxi
+ ~sci-ml/kineto-0.4.0_p20250214
+ sci-ml/onnx
+ virtual/lapack
+ cuda? (
+ dev-libs/cudnn
+ >=sci-ml/cudnn-frontend-1.0.3:0/8
+ dev-util/nvidia-cuda-toolkit:=[profiler]
+ cusparselt? ( dev-libs/cusparselt )
+ )
+ fbgemm? ( sci-ml/FBGEMM )
+ gloo? ( sci-ml/gloo[cuda?] )
+ mpi? ( virtual/mpi )
+ nnpack? ( sci-ml/NNPACK )
+ numpy? ( $(python_gen_cond_dep '
+ dev-python/numpy[${PYTHON_USEDEP}]
+ ') )
+ onednn? ( =sci-ml/oneDNN-3.5* )
+ opencl? ( virtual/opencl )
+ qnnpack? (
+ !sci-libs/QNNPACK
+ sci-ml/gemmlowp
+ )
+ rocm? (
+ >=dev-libs/rccl-6.1 <dev-libs/rccl-6.5
+ >=dev-util/hip-6.1 <dev-util/hip-6.5
+ >=dev-util/roctracer-6.1 <dev-util/roctracer-6.5
+ >=sci-libs/hipBLAS-6.1 <sci-libs/hipBLAS-6.5
+ >=sci-libs/hipBLASLt-6.1 <sci-libs/hipBLASLt-6.5
+ >=sci-libs/hipCUB-6.1 <sci-libs/hipCUB-6.5
+ >=sci-libs/hipFFT-6.1 <sci-libs/hipFFT-6.5
+ >=sci-libs/hipRAND-6.1 <sci-libs/hipRAND-6.5
+ >=sci-libs/hipSOLVER-6.1 <sci-libs/hipSOLVER-6.5
+ >=sci-libs/hipSPARSE-6.1 <sci-libs/hipSPARSE-6.5
+ >=sci-libs/miopen-6.1 <sci-libs/miopen-6.5
+ >=sci-libs/rocPRIM-6.1 <sci-libs/rocPRIM-6.5
+ >=sci-libs/rocThrust-6.1 <sci-libs/rocThrust-6.5
+ )
+ distributed? (
+ sci-ml/tensorpipe[cuda?]
+ dev-cpp/cpp-httplib
+ )
+ xnnpack? ( >=sci-ml/XNNPACK-2024.11 )
+ mkl? ( sci-libs/mkl )
+ openblas? ( sci-libs/openblas )
+"
+
+DEPEND="
+ ${RDEPEND}
+ dev-libs/flatbuffers
+ dev-libs/FXdiv
+ dev-libs/pocketfft
+ dev-libs/psimd
+ sci-ml/FP16
+ $(python_gen_cond_dep '
+ dev-python/pybind11[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ dev-python/typing-extensions[${PYTHON_USEDEP}]
+ ')
+ cuda? ( ~dev-libs/cutlass-3.8.0 )
+ onednn? ( sci-ml/ideep )
+ qnnpack? ( dev-libs/clog )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.5.1-unbundle_fmt.patch
+ "${FILESDIR}"/${PN}-2.5.1-unbundle_kineto.patch
+ "${FILESDIR}"/${PN}-2.5.1-cudnn_include_fix.patch
+ "${FILESDIR}"/${PN}-2.7.0-gentoo.patch
+ "${FILESDIR}"/${PN}-2.4.0-cpp-httplib.patch
+ "${FILESDIR}"/${PN}-2.5.1-glog-0.6.0.patch
+ "${FILESDIR}"/${PN}-2.5.1-newfix-functorch-install.patch
+ "${FILESDIR}"/${PN}-2.6.0-rocm-fix-std-cpp17.patch
+ "${FILESDIR}"/${PN}-2.7.0-cmake.patch
+ "${FILESDIR}"/${PN}-2.7.0-glog-0.7.1.patch
+ "${FILESDIR}"/${PN}-2.7.0-llvm.patch
+)
+
+src_prepare() {
+ if use flash; then
+ mv "${WORKDIR}"/${FLASH_P}/* third_party/${FLASH_PN}/ || die
+ fi
+ filter-lto #bug 862672
+
+ # Unbundle fmt
+ sed -i \
+ -e 's|::fmt-header-only||' \
+ c10/CMakeLists.txt \
+ cmake/Dependencies.cmake \
+ torch/CMakeLists.txt \
+ || die
+
+ # Drop third_party from CMake tree
+ sed -i \
+ -e '/add_subdirectory.*third_party/d' \
+ CMakeLists.txt \
+ cmake/Dependencies.cmake \
+ cmake/ProtoBuf.cmake \
+ aten/src/ATen/CMakeLists.txt \
+ || die
+ # Change libc10* path
+ sed -i \
+ -e "/EXPORT/s|DESTINATION lib)|DESTINATION $(get_libdir))|" \
+ c10/cuda/CMakeLists.txt \
+ c10/CMakeLists.txt \
+ c10/hip/CMakeLists.txt \
+ || die
+ sed -i \
+ -e '/Using pocketfft in directory:/d' \
+ cmake/Dependencies.cmake \
+ || die
+
+ # Noisy warnings from Logging.h
+ sed -i 's/-Wextra-semi//' cmake/public/utils.cmake || die
+
+ cmake_src_prepare
+ pushd torch/csrc/jit/serialization || die
+ flatc --cpp --gen-mutable --scoped-enums mobile_bytecode.fbs || die
+ popd
+
+ # prefixify the hardcoded paths, after all patches are applied
+ hprefixify \
+ aten/CMakeLists.txt \
+ caffe2/CMakeLists.txt \
+ cmake/Metal.cmake \
+ cmake/Modules/*.cmake \
+ cmake/Modules_CUDA_fix/FindCUDNN.cmake \
+ cmake/Modules_CUDA_fix/upstream/FindCUDA/make2cmake.cmake \
+ cmake/Modules_CUDA_fix/upstream/FindPackageHandleStandardArgs.cmake \
+ cmake/public/LoadHIP.cmake \
+ cmake/public/cuda.cmake \
+ cmake/Dependencies.cmake \
+ torch/CMakeLists.txt \
+ CMakeLists.txt
+
+ if use rocm; then
+ sed -e "s:/opt/rocm:/usr:" \
+ -e "s:lib/cmake:$(get_libdir)/cmake:g" \
+ -i cmake/public/LoadHIP.cmake || die
+
+ # TODO: delete, when caffe2 depends on systemwide composable_kernel
+ sed -e "s:third_party/composable_kernel:../composable_kernel-${CK_COMMIT}:g" \
+ -i aten/src/ATen/CMakeLists.txt || die
+
+ if tc-is-clang; then
+ # Systemwide gcc (for absl and at::TensorBase) + hipcc (llvm>=18) need abi-compat=17.
+ # But systemwide clang>=18 + hipcc (>=llvm-18) need opposite!
+ # See also: https://github.com/llvm/llvm-project/issues/102443#issuecomment-2329726287
+ sed '/-fclang-abi-compat=17/d' -i cmake/Dependencies.cmake || die
+ fi
+
+ # Workaround for libc++ issue https://github.com/llvm/llvm-project/issues/100802
+ sed 's/std::memcpy/memcpy/g' -i c10/util/Half.h || die
+
+ ebegin "HIPifying cuda sources"
+ ${EPYTHON} tools/amd_build/build_amd.py || die
+ eend $?
+ fi
+}
+
+src_configure() {
+ if use cuda && [[ -z ${TORCH_CUDA_ARCH_LIST} ]]; then
+ ewarn "WARNING: caffe2 is being built with its default CUDA compute capabilities: 3.5 and 7.0."
+ ewarn "These may not be optimal for your GPU."
+ ewarn ""
+ ewarn "To configure caffe2 with the CUDA compute capability that is optimal for your GPU,"
+ ewarn "set TORCH_CUDA_ARCH_LIST in your make.conf, and re-emerge caffe2."
+ ewarn "For example, to use CUDA capability 7.5 & 3.5, add: TORCH_CUDA_ARCH_LIST=7.5 3.5"
+ ewarn "For a Maxwell model GPU, an example value would be: TORCH_CUDA_ARCH_LIST=Maxwell"
+ ewarn ""
+ ewarn "You can look up your GPU's CUDA compute capability at https://developer.nvidia.com/cuda-gpus"
+ ewarn "or by running /opt/cuda/extras/demo_suite/deviceQuery | grep 'CUDA Capability'"
+ fi
+
+ local mycmakeargs=(
+ -DBUILD_CUSTOM_PROTOBUF=OFF
+ -DLIBSHM_INSTALL_LIB_SUBDIR="${EPREFIX}"/usr/$(get_libdir)
+ -DPython_EXECUTABLE="${PYTHON}"
+ -DTORCH_INSTALL_LIB_DIR="${EPREFIX}"/usr/$(get_libdir)
+ -DUSE_CCACHE=OFF
+ -DUSE_CUDA=$(usex cuda)
+ -DUSE_DISTRIBUTED=$(usex distributed)
+ -DUSE_FAKELOWP=OFF
+ -DUSE_FBGEMM=$(usex fbgemm)
+ -DUSE_FLASH_ATTENTION=$(usex flash)
+ -DUSE_GFLAGS=ON
+ -DUSE_GLOG=ON
+ -DUSE_GLOO=$(usex gloo)
+ -DUSE_ITT=OFF
+ -DUSE_KINETO=ON
+ -DUSE_KLEIDIAI=OFF # TODO
+ -DUSE_MAGMA=OFF # TODO: In GURU as sci-libs/magma
+ -DUSE_MEM_EFF_ATTENTION=$(usex memefficient)
+ -DUSE_MKLDNN=$(usex onednn)
+ -DUSE_MPI=$(usex mpi)
+ -DUSE_NCCL=OFF
+ -DUSE_NNPACK=$(usex nnpack)
+ -DUSE_NUMA=OFF
+ -DUSE_NUMPY=$(usex numpy)
+ -DUSE_OPENCL=$(usex opencl)
+ -DUSE_OPENMP=$(usex openmp)
+ -DUSE_PYTORCH_QNNPACK=$(usex qnnpack)
+ -DUSE_PYTORCH_METAL=OFF
+ -DUSE_ROCM=$(usex rocm)
+ -DUSE_SYSTEM_CPUINFO=ON
+ -DUSE_SYSTEM_EIGEN_INSTALL=ON
+ -DUSE_SYSTEM_FP16=ON
+ -DUSE_SYSTEM_FXDIV=ON
+ -DUSE_SYSTEM_GLOO=ON
+ -DUSE_SYSTEM_NVTX=ON
+ -DUSE_SYSTEM_ONNX=ON
+ -DUSE_SYSTEM_PSIMD=ON
+ -DUSE_SYSTEM_PTHREADPOOL=ON
+ -DUSE_SYSTEM_PYBIND11=ON
+ -DUSE_SYSTEM_SLEEF=ON
+ -DUSE_SYSTEM_XNNPACK=$(usex xnnpack)
+ -DUSE_TENSORPIPE=$(usex distributed)
+ -DUSE_UCC=OFF
+ -DUSE_VALGRIND=OFF
+ -DUSE_XNNPACK=$(usex xnnpack)
+ -DUSE_XPU=OFF
+ -Wno-dev
+ )
+
+ if use mkl; then
+ mycmakeargs+=(-DBLAS=MKL)
+ elif use openblas; then
+ mycmakeargs+=(-DBLAS=OpenBLAS)
+ else
+ mycmakeargs+=(-DBLAS=Generic -DBLAS_LIBRARIES=)
+ fi
+
+ if use cuda; then
+ addpredict "/dev/nvidiactl" # bug 867706
+ addpredict "/dev/char"
+ addpredict "/proc/self/task" # bug 926116
+
+ mycmakeargs+=(
+ -DUSE_CUDNN=ON
+ -DTORCH_CUDA_ARCH_LIST="${TORCH_CUDA_ARCH_LIST:-3.5 7.0}"
+ -DUSE_NCCL=OFF # TODO: NVIDIA Collective Communication Library
+ -DCMAKE_CUDA_FLAGS="$(cuda_gccdir -f | tr -d \")"
+ -DUSE_CUSPARSELT=$(usex cusparselt)
+ )
+ elif use rocm; then
+ export PYTORCH_ROCM_ARCH="$(get_amdgpu_flags)"
+
+ mycmakeargs+=(
+ -DUSE_NCCL=ON
+ -DUSE_SYSTEM_NCCL=ON
+ -DCMAKE_REQUIRE_FIND_PACKAGE_HIP=ON
+ )
+
+ # ROCm libraries produce too much warnings
+ append-cxxflags -Wno-deprecated-declarations -Wno-unused-result -Wno-unused-value
+ fi
+
+ if use onednn; then
+ mycmakeargs+=(
+ -DMKLDNN_FOUND=ON
+ -DMKLDNN_LIBRARIES=dnnl
+ -DMKLDNN_INCLUDE_DIR="${ESYSROOT}/usr/include/oneapi/dnnl"
+ )
+ fi
+
+ cmake_src_configure
+}
+
+src_compile() {
+ PYTORCH_BUILD_VERSION=${PV} \
+ PYTORCH_BUILD_NUMBER=0 \
+ 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
+
+ # Used by pytorch ebuild
+ insinto "/var/lib/${PN}"
+ doins "${BUILD_DIR}"/CMakeCache.txt
+ dostrip -x /var/lib/${PN}/functorch.so
+
+ rm -rf python
+ mkdir -p python/torch || die
+ cp torch/version.py python/torch/ || die
+ python_install
+}
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-ml/caffe2/
@ 2025-07-02 9:03 Alfredo Tupone
0 siblings, 0 replies; 17+ messages in thread
From: Alfredo Tupone @ 2025-07-02 9:03 UTC (permalink / raw
To: gentoo-commits
commit: 39dacf4a61719bf8d19014b94bafd88c6f5b57d5
Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 2 09:02:07 2025 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Wed Jul 2 09:03:11 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39dacf4a
sci-ml/caffe2: update SRC_URI
Bug: https://bugs.gentoo.org/956674
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
sci-ml/caffe2/Manifest | 1 +
sci-ml/caffe2/caffe2-2.7.1.ebuild | 17 +++++++++++++++++
2 files changed, 18 insertions(+)
diff --git a/sci-ml/caffe2/Manifest b/sci-ml/caffe2/Manifest
index fda2a4a29e01..9510577bc397 100644
--- a/sci-ml/caffe2/Manifest
+++ b/sci-ml/caffe2/Manifest
@@ -1,3 +1,4 @@
+DIST aotriton-0.9.2b-manylinux_2_28_x86_64-rocm6.3-shared.tar.gz 444786966 BLAKE2B 38ebf7edd1686d137bf70022a50ce2b7c060eb8420fe11e406074d3531e84538f4aeb198f1aafe34abf3f5b1262f3edd6e81d204eb84ec320f8ba8180387313b SHA512 b0d6d25ae4be9272d43bd80fa9d0178b27f5feb1b83bfed50e87c7efedfdd66a18981d0f3fabf8087b1c476d9937eaa80d462dea26502b24702134145bd09394
DIST composable_kernel-50ee4267.tar.gz 4194795 BLAKE2B b3c97d98a0c9e4620fdae3d30006edf55cc60ffa7f8518f6acb8d808647bc4de362c2e2b7e974686503fa2c7f359b6981cfbda74e40cc1bad4d351c5d2ff92e1 SHA512 9fc6f5f15556f020414b4567520329ef762209a82411a246c2bc1240a9fed2669f7fcb982cf773e3e9561bf9a2c557dba82b8b469d2e5844e679e2f5ab7c3e17
DIST composable_kernel-8086bbe3.tar.gz 4418862 BLAKE2B b710e3d4586899443ec01044dad19fd2f992c351e2f65ba526dfcc47cc65c095beaf8ac21a8f71c02a0eb524d364e817b27241a9198884f2bdae9924b51e24e4 SHA512 8410b5a1c864d71f3034ef0d9d1245078856d09cc191faec59856c229bf11d89ae291036d735cb5cec4f1d72e6e9e8f6921833147f9619d30cfab8722d3a9f63
DIST flash-attention-2.7.4.gh.tar.gz 5841323 BLAKE2B 432999d763f2b3d732580ddfea5d3e01370351db0656546259a5e500a07516dd03c98828bfb55855dabe4adc651033b5d97ea4725ca46158b9970f0fbc662710 SHA512 05a4afb09e666f7404d6a3f8b5256e7bed6eba60a6f1bde2b7dbb96d318975f0b458c2521c7a38d88e97b6e4c27f29077cf787849daf82586e33f43a3d9a84b3
diff --git a/sci-ml/caffe2/caffe2-2.7.1.ebuild b/sci-ml/caffe2/caffe2-2.7.1.ebuild
index 9a8498a37554..9a4c0fbb3f55 100644
--- a/sci-ml/caffe2/caffe2-2.7.1.ebuild
+++ b/sci-ml/caffe2/caffe2-2.7.1.ebuild
@@ -19,6 +19,11 @@ FLASH_PV=2.7.4
FLASH_PN=flash-attention
FLASH_P=${FLASH_PN}-${FLASH_PV}
+AOTRITON_PV=0.9.2b
+AOTRITON_PN=aotriton
+AOTRITON_P=${AOTRITON_PN}-${AOTRITON_PV}
+AOTRITON_tar=${AOTRITON_P}-manylinux_2_28_x86_64-rocm6.3-shared.tar.gz
+
DESCRIPTION="A deep learning framework"
HOMEPAGE="https://pytorch.org/"
SRC_URI="
@@ -26,6 +31,11 @@ SRC_URI="
rocm? (
https://github.com/ROCm/composable_kernel/archive/${CK_COMMIT}.tar.gz
-> ${CK_P}.tar.gz
+ memefficient? (
+ amd64? (
+ https://github.com/ROCm/${AOTRITON_PN}/releases/download/${AOTRITON_PV}/${AOTRITON_tar}
+ )
+ )
)
flash? (
https://github.com/Dao-AILab/${FLASH_PN}/archive/refs/tags/v${FLASH_PV}.tar.gz
@@ -183,6 +193,13 @@ src_prepare() {
pushd torch/csrc/jit/serialization || die
flatc --cpp --gen-mutable --scoped-enums mobile_bytecode.fbs || die
popd
+ if use rocm && use memefficient; then
+ mkdir -p "${BUILD_DIR}"/aotriton_external-prefix/src || die
+ rm -rf "${WORKDIR}"/aotriton
+ if use amd64; then
+ cp "${DISTDIR}"/${AOTRITON_tar} "${BUILD_DIR}"/aotriton_external-prefix/src || die
+ fi
+ fi
# prefixify the hardcoded paths, after all patches are applied
hprefixify \
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-ml/caffe2/
@ 2025-07-02 15:47 Alfredo Tupone
0 siblings, 0 replies; 17+ messages in thread
From: Alfredo Tupone @ 2025-07-02 15:47 UTC (permalink / raw
To: gentoo-commits
commit: feac46a315e1033f0c35b6fa1a5108b8a8ab7e47
Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 2 15:46:29 2025 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Wed Jul 2 15:47:09 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=feac46a3
sci-ml/caffe2: require newer nvidia-cuda-toolkit
Closes: https://bugs.gentoo.org/959386
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
sci-ml/caffe2/{caffe2-2.7.1.ebuild => caffe2-2.7.1-r1.ebuild} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-ml/caffe2/caffe2-2.7.1.ebuild b/sci-ml/caffe2/caffe2-2.7.1-r1.ebuild
similarity index 99%
rename from sci-ml/caffe2/caffe2-2.7.1.ebuild
rename to sci-ml/caffe2/caffe2-2.7.1-r1.ebuild
index 9a4c0fbb3f55..f06f1e769a20 100644
--- a/sci-ml/caffe2/caffe2-2.7.1.ebuild
+++ b/sci-ml/caffe2/caffe2-2.7.1-r1.ebuild
@@ -81,7 +81,7 @@ RDEPEND="
cuda? (
dev-libs/cudnn
>=sci-ml/cudnn-frontend-1.0.3:0/8
- dev-util/nvidia-cuda-toolkit:=[profiler]
+ >=dev-util/nvidia-cuda-toolkit-12.9:=[profiler]
cusparselt? ( dev-libs/cusparselt )
)
fbgemm? ( sci-ml/FBGEMM )
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-ml/caffe2/
@ 2025-07-30 19:47 Alfredo Tupone
0 siblings, 0 replies; 17+ messages in thread
From: Alfredo Tupone @ 2025-07-30 19:47 UTC (permalink / raw
To: gentoo-commits
commit: 247a09f80c08824dcd6724d1d8c8fae79f24f8f0
Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 30 19:46:13 2025 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Wed Jul 30 19:47:26 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=247a09f8
sci-ml/caffe2: use old gloo
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
sci-ml/caffe2/{caffe2-2.5.1-r11.ebuild => caffe2-2.5.1-r12.ebuild} | 2 +-
sci-ml/caffe2/{caffe2-2.6.0-r4.ebuild => caffe2-2.6.0-r5.ebuild} | 2 +-
sci-ml/caffe2/{caffe2-2.7.0-r2.ebuild => caffe2-2.7.0-r3.ebuild} | 2 +-
sci-ml/caffe2/{caffe2-2.7.1-r3.ebuild => caffe2-2.7.1-r4.ebuild} | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/sci-ml/caffe2/caffe2-2.5.1-r11.ebuild b/sci-ml/caffe2/caffe2-2.5.1-r12.ebuild
similarity index 99%
rename from sci-ml/caffe2/caffe2-2.5.1-r11.ebuild
rename to sci-ml/caffe2/caffe2-2.5.1-r12.ebuild
index 972677ae2238..6b5f88a1e12b 100644
--- a/sci-ml/caffe2/caffe2-2.5.1-r11.ebuild
+++ b/sci-ml/caffe2/caffe2-2.5.1-r12.ebuild
@@ -55,7 +55,7 @@ RDEPEND="
dev-util/nvidia-cuda-toolkit:=[profiler]
)
fbgemm? ( sci-ml/FBGEMM )
- gloo? ( sci-ml/gloo[cuda?] )
+ gloo? ( <=sci-ml/gloo-2023.12.03[cuda?] )
mpi? ( virtual/mpi )
nnpack? ( sci-ml/NNPACK )
numpy? ( $(python_gen_cond_dep '
diff --git a/sci-ml/caffe2/caffe2-2.6.0-r4.ebuild b/sci-ml/caffe2/caffe2-2.6.0-r5.ebuild
similarity index 99%
rename from sci-ml/caffe2/caffe2-2.6.0-r4.ebuild
rename to sci-ml/caffe2/caffe2-2.6.0-r5.ebuild
index 545a92c22d37..6ef7e896aee3 100644
--- a/sci-ml/caffe2/caffe2-2.6.0-r4.ebuild
+++ b/sci-ml/caffe2/caffe2-2.6.0-r5.ebuild
@@ -62,7 +62,7 @@ RDEPEND="
dev-util/nvidia-cuda-toolkit:=[profiler]
)
fbgemm? ( sci-ml/FBGEMM )
- gloo? ( sci-ml/gloo[cuda?] )
+ gloo? ( <=sci-ml/gloo-2023.12.03[cuda?] )
mpi? ( virtual/mpi )
nnpack? ( sci-ml/NNPACK )
numpy? ( $(python_gen_cond_dep '
diff --git a/sci-ml/caffe2/caffe2-2.7.0-r2.ebuild b/sci-ml/caffe2/caffe2-2.7.0-r3.ebuild
similarity index 99%
rename from sci-ml/caffe2/caffe2-2.7.0-r2.ebuild
rename to sci-ml/caffe2/caffe2-2.7.0-r3.ebuild
index fffdae3035c6..cf3872ea65f9 100644
--- a/sci-ml/caffe2/caffe2-2.7.0-r2.ebuild
+++ b/sci-ml/caffe2/caffe2-2.7.0-r3.ebuild
@@ -75,7 +75,7 @@ RDEPEND="
cusparselt? ( dev-libs/cusparselt )
)
fbgemm? ( sci-ml/FBGEMM )
- gloo? ( sci-ml/gloo[cuda?] )
+ gloo? ( <=sci-ml/gloo-2023.12.03[cuda?] )
mpi? ( virtual/mpi )
nnpack? ( sci-ml/NNPACK )
numpy? ( $(python_gen_cond_dep '
diff --git a/sci-ml/caffe2/caffe2-2.7.1-r3.ebuild b/sci-ml/caffe2/caffe2-2.7.1-r4.ebuild
similarity index 99%
rename from sci-ml/caffe2/caffe2-2.7.1-r3.ebuild
rename to sci-ml/caffe2/caffe2-2.7.1-r4.ebuild
index c314b266cdc3..510473f823ef 100644
--- a/sci-ml/caffe2/caffe2-2.7.1-r3.ebuild
+++ b/sci-ml/caffe2/caffe2-2.7.1-r4.ebuild
@@ -80,7 +80,7 @@ RDEPEND="
cusparselt? ( dev-libs/cusparselt )
)
fbgemm? ( sci-ml/FBGEMM )
- gloo? ( sci-ml/gloo[cuda?] )
+ gloo? ( <=sci-ml/gloo-2023.12.03[cuda?] )
mpi? ( virtual/mpi )
nnpack? ( sci-ml/NNPACK )
numpy? ( $(python_gen_cond_dep '
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-ml/caffe2/
@ 2025-08-03 7:43 Alfredo Tupone
0 siblings, 0 replies; 17+ messages in thread
From: Alfredo Tupone @ 2025-08-03 7:43 UTC (permalink / raw
To: gentoo-commits
commit: d3de9331add4922ee44a7bbcdb63bff9b6cda012
Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 3 07:42:23 2025 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Sun Aug 3 07:43:15 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3de9331
sci-ml/caffe2: new onnx-1.18.0 is for the incoming caffe2 version
Closes: https://bugs.gentoo.org/961033
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
sci-ml/caffe2/{caffe2-2.7.1-r4.ebuild => caffe2-2.7.1-r5.ebuild} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-ml/caffe2/caffe2-2.7.1-r4.ebuild b/sci-ml/caffe2/caffe2-2.7.1-r5.ebuild
similarity index 99%
rename from sci-ml/caffe2/caffe2-2.7.1-r4.ebuild
rename to sci-ml/caffe2/caffe2-2.7.1-r5.ebuild
index 510473f823ef..795093a146a1 100644
--- a/sci-ml/caffe2/caffe2-2.7.1-r4.ebuild
+++ b/sci-ml/caffe2/caffe2-2.7.1-r5.ebuild
@@ -71,7 +71,7 @@ RDEPEND="
dev-libs/sleef
sci-ml/foxi
~sci-ml/kineto-0.4.0_p20250214
- sci-ml/onnx
+ <sci-ml/onnx-1.18.0
virtual/lapack
cuda? (
dev-libs/cudnn
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-ml/caffe2/
@ 2025-08-17 13:04 Sam James
0 siblings, 0 replies; 17+ messages in thread
From: Sam James @ 2025-08-17 13:04 UTC (permalink / raw
To: gentoo-commits
commit: fc7967c487721f1fff46097ec7bf1089687df476
Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com>
AuthorDate: Sat Aug 16 21:18:00 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Aug 17 13:04:02 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc7967c4
sci-ml/caffe2: update cuda deps to match upstream
https://github.com/pytorch/pytorch/releases/tag/v2.8.0
Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-ml/caffe2/caffe2-2.8.0.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sci-ml/caffe2/caffe2-2.8.0.ebuild b/sci-ml/caffe2/caffe2-2.8.0.ebuild
index 3d1b231f40b4..161235c2c32c 100644
--- a/sci-ml/caffe2/caffe2-2.8.0.ebuild
+++ b/sci-ml/caffe2/caffe2-2.8.0.ebuild
@@ -75,7 +75,7 @@ RDEPEND="
virtual/lapack
cuda? (
dev-libs/cudnn
- >=sci-ml/cudnn-frontend-1.0.3:0/8
+ >=sci-ml/cudnn-frontend-1.12.0:=
>=dev-util/nvidia-cuda-toolkit-12.9:=[profiler]
cusparselt? ( dev-libs/cusparselt )
)
@@ -129,7 +129,7 @@ DEPEND="
dev-python/pyyaml[${PYTHON_USEDEP}]
dev-python/typing-extensions[${PYTHON_USEDEP}]
')
- cuda? ( ~dev-libs/cutlass-3.8.0 )
+ cuda? ( ~dev-libs/cutlass-3.9.2[tools(+)] )
onednn? ( sci-ml/ideep )
qnnpack? ( dev-libs/clog )
"
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-ml/caffe2/
@ 2025-09-02 6:11 Alfredo Tupone
0 siblings, 0 replies; 17+ messages in thread
From: Alfredo Tupone @ 2025-09-02 6:11 UTC (permalink / raw
To: gentoo-commits
commit: ec7a48657665c486a62265b06d2099989604668a
Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 2 06:10:28 2025 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Tue Sep 2 06:10:43 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec7a4865
sci-ml/caffe2: drop 2.6.0-r5
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
sci-ml/caffe2/Manifest | 2 -
sci-ml/caffe2/caffe2-2.6.0-r5.ebuild | 343 -----------------------------------
2 files changed, 345 deletions(-)
diff --git a/sci-ml/caffe2/Manifest b/sci-ml/caffe2/Manifest
index 2e7e0c634bf9..e25dafff34ea 100644
--- a/sci-ml/caffe2/Manifest
+++ b/sci-ml/caffe2/Manifest
@@ -1,6 +1,4 @@
-DIST composable_kernel-50ee4267.tar.gz 4194795 BLAKE2B b3c97d98a0c9e4620fdae3d30006edf55cc60ffa7f8518f6acb8d808647bc4de362c2e2b7e974686503fa2c7f359b6981cfbda74e40cc1bad4d351c5d2ff92e1 SHA512 9fc6f5f15556f020414b4567520329ef762209a82411a246c2bc1240a9fed2669f7fcb982cf773e3e9561bf9a2c557dba82b8b469d2e5844e679e2f5ab7c3e17
DIST composable_kernel-8086bbe3.tar.gz 4418862 BLAKE2B b710e3d4586899443ec01044dad19fd2f992c351e2f65ba526dfcc47cc65c095beaf8ac21a8f71c02a0eb524d364e817b27241a9198884f2bdae9924b51e24e4 SHA512 8410b5a1c864d71f3034ef0d9d1245078856d09cc191faec59856c229bf11d89ae291036d735cb5cec4f1d72e6e9e8f6921833147f9619d30cfab8722d3a9f63
DIST flash-attention-2.7.4.gh.tar.gz 5841323 BLAKE2B 432999d763f2b3d732580ddfea5d3e01370351db0656546259a5e500a07516dd03c98828bfb55855dabe4adc651033b5d97ea4725ca46158b9970f0fbc662710 SHA512 05a4afb09e666f7404d6a3f8b5256e7bed6eba60a6f1bde2b7dbb96d318975f0b458c2521c7a38d88e97b6e4c27f29077cf787849daf82586e33f43a3d9a84b3
-DIST pytorch-2.6.0.tar.gz 119594438 BLAKE2B 3152eb341cf42295e147e59625beb9c06608aa4b78f9618c1c0024b10c1c767715d07fe8c4be52d029ac47f808cd0d5e65c9530ec90d951a64b993083b4067ad SHA512 a70da80ff09d226085e18228132cf6bb236ad8cc47eed52375d0d2a615f09dd33849da947270b5670c184eab60cb8e2adf11d801babfbda7aa621400501d07b0
DIST pytorch-2.7.1.tar.gz 50203605 BLAKE2B 3f4b2643d86fe9ff30b2f335353dfe6a8e222bcc12143bc5d09268fb37bfd42f9451620e6e0db225c3c3e7930c999115fdd2ed62b7eae93b0d5e233270c7c760 SHA512 a9fc2252af9031c2cd46dde558c491aea8bc322fb80157a7760f300a44b759d4bfe866f030fbb974b80493057cfff4dd512498f99a100ed6d05bf620258ed37e
DIST pytorch-2.8.0.tar.gz 56565754 BLAKE2B a8f07513b92f9293f8322508f9fc73a462f89fe51cb1f280af371cee19cbe7e2bf900ba2b3c43fd08ea415566db441a6d6310d77f18477e957641be311a361a5 SHA512 448e9dad4aa10f1793d35e6ffe9f0f69b7719d41e6eccceb687a8d0c148e22d03e4f76170a05308ef9323a7aea41aa74605077ae1d68c6d949f13b3340ebf310
diff --git a/sci-ml/caffe2/caffe2-2.6.0-r5.ebuild b/sci-ml/caffe2/caffe2-2.6.0-r5.ebuild
deleted file mode 100644
index 6ef7e896aee3..000000000000
--- a/sci-ml/caffe2/caffe2-2.6.0-r5.ebuild
+++ /dev/null
@@ -1,343 +0,0 @@
-# Copyright 2022-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..13} )
-ROCM_VERSION=6.1
-inherit python-single-r1 cmake cuda flag-o-matic prefix rocm toolchain-funcs
-
-MYPN=pytorch
-MYP=${MYPN}-${PV}
-
-# caffe2-2.6.0 depends on future version of composable kernel
-# TODO: replace it with RDEPEND in the future
-CK_COMMIT=50ee4267e27b875d149e642f4cebd47be1dc3b57
-CK_P=composable_kernel-${CK_COMMIT:0:8}
-
-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
- rocm? ( https://github.com/ROCm/composable_kernel/archive/${CK_COMMIT}.tar.gz -> ${CK_P}.tar.gz )
-"
-
-S="${WORKDIR}"/${MYP}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-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}
- mpi? ( distributed )
- gloo? ( distributed )
- ?? ( cuda rocm )
- rocm? (
- || ( ${ROCM_REQUIRED_USE} )
- !flash
- )
-"
-
-RDEPEND="
- ${PYTHON_DEPS}
- dev-cpp/abseil-cpp:=
- dev-cpp/gflags:=
- >=dev-cpp/glog-0.5.0
- dev-cpp/nlohmann_json
- dev-cpp/opentelemetry-cpp
- dev-libs/cpuinfo
- dev-libs/libfmt:=
- dev-libs/protobuf:=
- dev-libs/pthreadpool
- dev-libs/sleef
- virtual/lapack
- sci-ml/foxi
- sci-ml/onnx
- cuda? (
- dev-libs/cudnn
- >=sci-ml/cudnn-frontend-1.0.3:0/8
- dev-util/nvidia-cuda-toolkit:=[profiler]
- )
- fbgemm? ( sci-ml/FBGEMM )
- gloo? ( <=sci-ml/gloo-2023.12.03[cuda?] )
- mpi? ( virtual/mpi )
- nnpack? ( sci-ml/NNPACK )
- numpy? ( $(python_gen_cond_dep '
- dev-python/numpy[${PYTHON_USEDEP}]
- ') )
- onednn? ( =sci-ml/oneDNN-3.5* )
- opencl? ( virtual/opencl )
- qnnpack? (
- !sci-libs/QNNPACK
- sci-ml/gemmlowp
- )
- rocm? (
- >=dev-libs/rccl-6.1 <dev-libs/rccl-6.4
- >=dev-util/hip-6.1 <dev-util/hip-6.4
- >=dev-util/roctracer-6.1 <dev-util/roctracer-6.4
- >=sci-libs/hipBLAS-6.1 <sci-libs/hipBLAS-6.4
- >=sci-libs/hipBLASLt-6.1 <sci-libs/hipBLASLt-6.4
- >=sci-libs/hipCUB-6.1 <sci-libs/hipCUB-6.4
- >=sci-libs/hipFFT-6.1 <sci-libs/hipFFT-6.4
- >=sci-libs/hipRAND-6.1 <sci-libs/hipRAND-6.4
- >=sci-libs/hipSOLVER-6.1 <sci-libs/hipSOLVER-6.4
- >=sci-libs/hipSPARSE-6.1 <sci-libs/hipSPARSE-6.4
- >=sci-libs/miopen-6.1 <sci-libs/miopen-6.4
- >=sci-libs/rocPRIM-6.1 <sci-libs/rocPRIM-6.4
- >=sci-libs/rocThrust-6.1 <sci-libs/rocThrust-6.4
- )
- distributed? (
- sci-ml/tensorpipe[cuda?]
- dev-cpp/cpp-httplib
- )
- xnnpack? ( sci-ml/XNNPACK )
- mkl? ( sci-libs/mkl )
- openblas? ( sci-libs/openblas )
-"
-
-DEPEND="
- ${RDEPEND}
- dev-libs/flatbuffers
- dev-libs/FXdiv
- dev-libs/pocketfft
- dev-libs/psimd
- sci-ml/FP16
- sci-ml/kineto
- $(python_gen_cond_dep '
- dev-python/pybind11[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
- dev-python/typing-extensions[${PYTHON_USEDEP}]
- ')
- cuda? ( <=dev-libs/cutlass-3.4.1 )
- onednn? ( sci-ml/ideep )
- qnnpack? ( dev-libs/clog )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.5.1-unbundle_fmt.patch
- "${FILESDIR}"/${PN}-2.5.1-unbundle_kineto.patch
- "${FILESDIR}"/${PN}-2.5.1-cudnn_include_fix.patch
- "${FILESDIR}"/${P}-gentoo.patch
- "${FILESDIR}"/${PN}-2.4.0-cpp-httplib.patch
- "${FILESDIR}"/${PN}-2.5.1-glog-0.6.0.patch
- "${FILESDIR}"/${PN}-2.5.1-newfix-functorch-install.patch
- "${FILESDIR}"/${PN}-2.6.0-rocm-fix-std-cpp17.patch
-)
-
-src_prepare() {
- filter-lto #bug 862672
-
- # Unbundle fmt
- sed -i \
- -e 's|::fmt-header-only||' \
- c10/CMakeLists.txt \
- cmake/Dependencies.cmake \
- torch/CMakeLists.txt \
- || die
-
- # Drop third_party from CMake tree
- sed -i \
- -e '/add_subdirectory.*third_party/d' \
- CMakeLists.txt \
- cmake/Dependencies.cmake \
- cmake/ProtoBuf.cmake \
- aten/src/ATen/CMakeLists.txt \
- || die
- # Change libc10* path
- sed -i \
- -e "/EXPORT/s|DESTINATION lib)|DESTINATION $(get_libdir))|" \
- c10/cuda/CMakeLists.txt \
- c10/CMakeLists.txt \
- c10/hip/CMakeLists.txt \
- || die
- sed -i \
- -e '/Using pocketfft in directory:/d' \
- cmake/Dependencies.cmake \
- || die
-
- cmake_src_prepare
- pushd torch/csrc/jit/serialization || die
- flatc --cpp --gen-mutable --scoped-enums mobile_bytecode.fbs || die
- popd
-
- # prefixify the hardcoded paths, after all patches are applied
- hprefixify \
- aten/CMakeLists.txt \
- caffe2/CMakeLists.txt \
- cmake/Metal.cmake \
- cmake/Modules/*.cmake \
- cmake/Modules_CUDA_fix/FindCUDNN.cmake \
- cmake/Modules_CUDA_fix/upstream/FindCUDA/make2cmake.cmake \
- cmake/Modules_CUDA_fix/upstream/FindPackageHandleStandardArgs.cmake \
- cmake/public/LoadHIP.cmake \
- cmake/public/cuda.cmake \
- cmake/Dependencies.cmake \
- torch/CMakeLists.txt \
- CMakeLists.txt
-
- if use rocm; then
- sed -e "s:/opt/rocm:/usr:" \
- -e "s:lib/cmake:$(get_libdir)/cmake:g" \
- -i cmake/public/LoadHIP.cmake || die
-
- # TODO: delete, when caffe2 depends on systemwide composable_kernel
- sed -e "s:third_party/composable_kernel:../composable_kernel-${CK_COMMIT}:g" \
- -i aten/src/ATen/CMakeLists.txt || die
-
- if tc-is-clang; then
- # Systemwide gcc (for absl and at::TensorBase) + hipcc (llvm>=18) need abi-compat=17.
- # But systemwide clang>=18 + hipcc (>=llvm-18) need opposite!
- # See also: https://github.com/llvm/llvm-project/issues/102443#issuecomment-2329726287
- sed '/-fclang-abi-compat=17/d' -i cmake/Dependencies.cmake || die
- fi
-
- # Workaround for libc++ issue https://github.com/llvm/llvm-project/issues/100802
- sed 's/std::memcpy/memcpy/g' -i c10/util/Half.h || die
-
- ebegin "HIPifying cuda sources"
- ${EPYTHON} tools/amd_build/build_amd.py || die
- eend $?
- fi
-}
-
-src_configure() {
- if use cuda && [[ -z ${TORCH_CUDA_ARCH_LIST} ]]; then
- ewarn "WARNING: caffe2 is being built with its default CUDA compute capabilities: 3.5 and 7.0."
- ewarn "These may not be optimal for your GPU."
- ewarn ""
- ewarn "To configure caffe2 with the CUDA compute capability that is optimal for your GPU,"
- ewarn "set TORCH_CUDA_ARCH_LIST in your make.conf, and re-emerge caffe2."
- ewarn "For example, to use CUDA capability 7.5 & 3.5, add: TORCH_CUDA_ARCH_LIST=7.5 3.5"
- ewarn "For a Maxwell model GPU, an example value would be: TORCH_CUDA_ARCH_LIST=Maxwell"
- ewarn ""
- ewarn "You can look up your GPU's CUDA compute capability at https://developer.nvidia.com/cuda-gpus"
- ewarn "or by running /opt/cuda/extras/demo_suite/deviceQuery | grep 'CUDA Capability'"
- fi
-
- local mycmakeargs=(
- -DBUILD_CUSTOM_PROTOBUF=OFF
- -DLIBSHM_INSTALL_LIB_SUBDIR="${EPREFIX}"/usr/$(get_libdir)
- -DPython_EXECUTABLE="${PYTHON}"
- -DTORCH_INSTALL_LIB_DIR="${EPREFIX}"/usr/$(get_libdir)
- -DUSE_CCACHE=OFF
- -DUSE_CUDA=$(usex cuda)
- -DUSE_DISTRIBUTED=$(usex distributed)
- -DUSE_FAKELOWP=OFF
- -DUSE_FBGEMM=$(usex fbgemm)
- -DUSE_FLASH_ATTENTION=$(usex flash)
- -DUSE_GFLAGS=ON
- -DUSE_GLOG=ON
- -DUSE_GLOO=$(usex gloo)
- -DUSE_ITT=OFF
- -DUSE_KINETO=OFF # TODO
- -DUSE_MAGMA=OFF # TODO: In GURU as sci-libs/magma
- -DUSE_MEM_EFF_ATTENTION=$(usex memefficient)
- -DUSE_MKLDNN=$(usex onednn)
- -DUSE_MPI=$(usex mpi)
- -DUSE_NCCL=OFF
- -DUSE_NNPACK=$(usex nnpack)
- -DUSE_NUMA=OFF
- -DUSE_NUMPY=$(usex numpy)
- -DUSE_OPENCL=$(usex opencl)
- -DUSE_OPENMP=$(usex openmp)
- -DUSE_PYTORCH_QNNPACK=$(usex qnnpack)
- -DUSE_PYTORCH_METAL=OFF
- -DUSE_ROCM=$(usex rocm)
- -DUSE_SYSTEM_CPUINFO=ON
- -DUSE_SYSTEM_EIGEN_INSTALL=ON
- -DUSE_SYSTEM_FP16=ON
- -DUSE_SYSTEM_FXDIV=ON
- -DUSE_SYSTEM_GLOO=ON
- -DUSE_SYSTEM_ONNX=ON
- -DUSE_SYSTEM_PSIMD=ON
- -DUSE_SYSTEM_PSIMD=ON
- -DUSE_SYSTEM_PTHREADPOOL=ON
- -DUSE_SYSTEM_PYBIND11=ON
- -DUSE_SYSTEM_SLEEF=ON
- -DUSE_SYSTEM_XNNPACK=$(usex xnnpack)
- -DUSE_TENSORPIPE=$(usex distributed)
- -DUSE_UCC=OFF
- -DUSE_VALGRIND=OFF
- -DUSE_XNNPACK=$(usex xnnpack)
- -DUSE_XPU=OFF
- -Wno-dev
- )
-
- if use mkl; then
- mycmakeargs+=(-DBLAS=MKL)
- elif use openblas; then
- mycmakeargs+=(-DBLAS=OpenBLAS)
- else
- mycmakeargs+=(-DBLAS=Generic -DBLAS_LIBRARIES=)
- fi
-
- if use cuda; then
- addpredict "/dev/nvidiactl" # bug 867706
- addpredict "/dev/char"
- addpredict "/proc/self/task" # bug 926116
-
- mycmakeargs+=(
- -DUSE_CUDNN=ON
- -DTORCH_CUDA_ARCH_LIST="${TORCH_CUDA_ARCH_LIST:-3.5 7.0}"
- -DUSE_NCCL=OFF # TODO: NVIDIA Collective Communication Library
- -DCMAKE_CUDA_FLAGS="$(cuda_gccdir -f | tr -d \")"
- )
- elif use rocm; then
- export PYTORCH_ROCM_ARCH="$(get_amdgpu_flags)"
-
- mycmakeargs+=(
- -DUSE_NCCL=ON
- -DUSE_SYSTEM_NCCL=ON
- -DCMAKE_REQUIRE_FIND_PACKAGE_HIP=ON
- )
-
- # ROCm libraries produce too much warnings
- append-cxxflags -Wno-deprecated-declarations -Wno-unused-result
- fi
-
- if use onednn; then
- mycmakeargs+=(
- -DMKLDNN_FOUND=ON
- -DMKLDNN_LIBRARIES=dnnl
- -DMKLDNN_INCLUDE_DIR="${ESYSROOT}/usr/include/oneapi/dnnl"
- )
- fi
-
- cmake_src_configure
-}
-
-src_compile() {
- PYTORCH_BUILD_VERSION=${PV} \
- PYTORCH_BUILD_NUMBER=0 \
- 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
-
- # Used by pytorch ebuild
- insinto "/var/lib/${PN}"
- doins "${BUILD_DIR}"/CMakeCache.txt
- dostrip -x /var/lib/${PN}/functorch.so
-
- rm -rf python
- mkdir -p python/torch || die
- cp torch/version.py python/torch/ || die
- python_install
-}
^ permalink raw reply related [flat|nested] 17+ messages in thread
end of thread, other threads:[~2025-09-02 6:11 UTC | newest]
Thread overview: 17+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-03-21 21:15 [gentoo-commits] repo/gentoo:master commit in: sci-ml/caffe2/ Alfredo Tupone
-- strict thread matches above, loose matches on Subject: below --
2025-09-02 6:11 Alfredo Tupone
2025-08-17 13:04 Sam James
2025-08-03 7:43 Alfredo Tupone
2025-07-30 19:47 Alfredo Tupone
2025-07-02 15:47 Alfredo Tupone
2025-07-02 9:03 Alfredo Tupone
2025-07-01 6:19 Alfredo Tupone
2025-06-29 8:25 Alfredo Tupone
2025-06-14 22:42 Sam James
2025-06-14 20:43 Alfredo Tupone
2025-05-23 6:53 Alfredo Tupone
2025-05-17 20:55 Alfredo Tupone
2025-05-05 6:29 Alfredo Tupone
2025-03-21 22:12 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