[gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
commit: e5dff3ee293c89d0b8b4d38b9273e350286a3eb9
Author: Alfredo Tupone gentoo org>
AuthorDate: Fri Jun 7 08:30:21 2024 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Fri Jun 7 08:31:12 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5dff3ee
sci-libs/caffe2: fix patching
Closes: https://bugs.gentoo.org/933713
Signed-off-by: Alfredo Tupone gentoo.org>
sci-libs/caffe2/caffe2-2.3.1.ebuild | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/sci-libs/caffe2/caffe2-2.3.1.ebuild
b/sci-libs/caffe2/caffe2-2.3.1.ebuild
index c01e904d8eb0..53c270458dd2 100644
--- a/sci-libs/caffe2/caffe2-2.3.1.ebuild
+++ b/sci-libs/caffe2/caffe2-2.3.1.ebuild
@@ -105,12 +105,12 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.13.0-install-dirs.patch
"${FILESDIR}"/${PN}-1.12.0-glog-0.6.0.patch
"${FILESDIR}"/${PN}-1.13.1-tensorpipe.patch
- "${FILESDIR}"/${P}-cudnn_include_fix.patch
+ "${FILESDIR}"/${PN}-2.3.0-cudnn_include_fix.patch
"${FILESDIR}"/${PN}-2.1.2-fix-rpath.patch
"${FILESDIR}"/${PN}-2.1.2-fix-openmp-link.patch
- "${FILESDIR}"/${P}-rocm-fix-std-cpp17.patch
+ "${FILESDIR}"/${PN}-2.3.0-rocm-fix-std-cpp17.patch
"${FILESDIR}"/${PN}-2.2.2-musl.patch
- "${FILESDIR}"/${P}-CMakeFix.patch
+ "${FILESDIR}"/${PN}-2.3.0-CMakeFix.patch
)
src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
commit: 2fa3ad65f0c827f1a91ed2557d91fd938362581f
Author: Alfredo Tupone gentoo org>
AuthorDate: Thu Jun 6 19:06:05 2024 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Thu Jun 6 19:07:00 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2fa3ad65
sci-libs/caffe2: add 2.3.1
Signed-off-by: Alfredo Tupone gentoo.org>
sci-libs/caffe2/Manifest| 1 +
sci-libs/caffe2/caffe2-2.3.1.ebuild | 274
2 files changed, 275 insertions(+)
diff --git a/sci-libs/caffe2/Manifest b/sci-libs/caffe2/Manifest
index d70fba8fc67b..246ab4d21a1a 100644
--- a/sci-libs/caffe2/Manifest
+++ b/sci-libs/caffe2/Manifest
@@ -1,2 +1,3 @@
DIST pytorch-2.2.2.tar.gz 116367503 BLAKE2B
0be22f2ec4b9aac6f5e976664cae01facf07929a32565cd57d7cc5b2d9888e9ae71ca301853752fe8f31d174d04c9974eb9ed2f3d452360a50ccf024f200726a
SHA512
7990e0f9484038c3458c0bda2c863bf2b19e56edab81fc5938c6e0f08b17558287f853bb67350e8cca8f42bec0f1d4ba0e94e50a145db8da44bdd4bd703d91d0
DIST pytorch-2.3.0.tar.gz 117029829 BLAKE2B
8f9c0d71ee0a9219b495eddccdcc65107f7ad537c43c68100b229f3d27b0e6c01ccb1659c7fffc356a48d80f2adc0a10361305dc8f1df20446de837d380f89f6
SHA512
67f7e9a096c3ffb952206ebf9105bedebb68c24ad82456083adf1d1d210437fcaa9dd52b68484cfc97d408c9eebc9541c76868c34a7c9982494dc3f424cfb07c
+DIST pytorch-2.3.1.tar.gz 117035696 BLAKE2B
d419d7fa1342f1fb317ffce09ec9dc1447414627cc83d36578fe60f68c283c620b2b4d49f414cd206d537b90b16432a06cd1941662720db05d5e2b6c493325f5
SHA512
e1bcae44f9939fc7ccb1360a9b1970d92426f25e5de73e36964df3dd15ad5d8d9f5bd2f9a7dda6b8f64e2bba3674005bd869f542489cc442ad0125a02676f587
diff --git a/sci-libs/caffe2/caffe2-2.3.1.ebuild
b/sci-libs/caffe2/caffe2-2.3.1.ebuild
new file mode 100644
index ..c01e904d8eb0
--- /dev/null
+++ b/sci-libs/caffe2/caffe2-2.3.1.ebuild
@@ -0,0 +1,274 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+ROCM_VERSION=5.7
+inherit python-single-r1 cmake cuda flag-o-matic prefix rocm
+
+MYPN=pytorch
+MYP=${MYPN}-${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"
+
+S="${WORKDIR}"/${MYP}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="cuda distributed fbgemm ffmpeg flash gloo mkl mpi nnpack +numpy onednn
openblas opencl opencv openmp qnnpack rocm xnnpack"
+RESTRICT="test"
+REQUIRED_USE="
+ ${PYTHON_REQUIRED_USE}
+ ffmpeg? ( opencv )
+ mpi? ( distributed )
+ gloo? ( distributed )
+ ?? ( cuda rocm )
+ rocm? (
+ || ( ${ROCM_REQUIRED_USE} )
+ !flash
+ )
+"
+
+# CUDA 12 not supported yet: https://github.com/pytorch/pytorch/issues/91122
+RDEPEND="
+ ${PYTHON_DEPS}
+ dev-cpp/gflags:=
+ >=dev-cpp/glog-0.5.0
+ dev-libs/cpuinfo
+ dev-libs/libfmt
+ dev-libs/protobuf:=
+ dev-libs/pthreadpool
+ dev-libs/sleef
+ virtual/lapack
+ sci-libs/onnx
+ sci-libs/foxi
+ cuda? (
+ dev-libs/cudnn
+ >=dev-libs/cudnn-frontend-1.0.3:0/8
+ =dev-libs/FBGEMM-2023.12.01 )
+ ffmpeg? ( media-video/ffmpeg:= )
+ gloo? ( sci-libs/gloo[cuda?] )
+ mpi? ( virtual/mpi )
+ nnpack? ( sci-libs/NNPACK )
+ 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 )
+ rocm? (
+ >=dev-util/hip-5.7
+ >=dev-libs/rccl-5.7[${ROCM_USEDEP}]
+ >=sci-libs/rocThrust-5.7[${ROCM_USEDEP}]
+ >=sci-libs/rocPRIM-5.7[${ROCM_USEDEP}]
+ >=sci-libs/hipBLAS-5.7[${ROCM_USEDEP}]
+ >=sci-libs/hipFFT-5.7[${ROCM_USEDEP}]
+ >=sci-libs/hipSPARSE-5.7[${ROCM_USEDEP}]
+ >=sci-libs/hipRAND-5.7[${ROCM_USEDEP}]
+ >=sci-libs/hipCUB-5.7[${ROCM_USEDEP}]
+ >=sci-libs/hipSOLVER-5.7[${ROCM_USEDEP}]
+ >=sci-libs/miopen-5.7[${ROCM_USEDEP}]
+ >=dev-util/roctracer-5.7[${ROCM_USEDEP}]
+ )
+ distributed? ( sci-libs/tensorpipe[cuda?] )
+ xnnpack? ( >=sci-libs/XNNPACK-2022.12.22 )
+ mkl? ( sci-libs/mkl )
+ openblas? ( sci-libs/openblas )
+"
+DEPEND="
+ ${RDEPEND}
+ cuda? ( >=dev-libs/cutlass-3.4.1 )
+ onednn? ( sci-libs/ideep )
+ dev-libs/psimd
+ dev-libs/FP16
+ dev-libs/FXdiv
+ dev-libs/pocketfft
+ dev-libs/flatbuffers
+ >=sci-libs/kineto-0.4.0_p20231031
+ $(python_gen_cond_dep '
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ dev-python/pybind11[${PYTHON_USEDEP}]
+
[gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/, sci-libs/caffe2/files/
commit: b9b308ff9ae9f292fb81531b4cfff1569c4a2193
Author: Alfredo Tupone gentoo org>
AuthorDate: Sun May 26 15:16:29 2024 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Sun May 26 15:18:13 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9b308ff
sci-libs/caffe2: drop 2.1.2-r7
Signed-off-by: Alfredo Tupone gentoo.org>
sci-libs/caffe2/Manifest | 1 -
sci-libs/caffe2/caffe2-2.1.2-r7.ebuild | 283 -
sci-libs/caffe2/files/caffe2-2.1.1-cudaExtra.patch | 28 --
sci-libs/caffe2/files/caffe2-2.1.1-gentoo.patch| 188 --
sci-libs/caffe2/metadata.xml | 1 -
5 files changed, 501 deletions(-)
diff --git a/sci-libs/caffe2/Manifest b/sci-libs/caffe2/Manifest
index f1df96691729..d70fba8fc67b 100644
--- a/sci-libs/caffe2/Manifest
+++ b/sci-libs/caffe2/Manifest
@@ -1,3 +1,2 @@
-DIST pytorch-2.1.2.tar.gz 116316469 BLAKE2B
c5a55ee264bc3477d3556ba6376b5591117e992e56e0dd0c9ba93d12526e2727f7840f6f1e0730a38223b6492c9556840c4ebf22ffd220e97225c2abff303747
SHA512
a8961d78ad785b13c959a0612563a60e0de17a7c8bb9822ddea9a24072796354d07e81c47b6cc8761b21a6448845b088cf80e1661d9e889b0ed5474d3dc76756
DIST pytorch-2.2.2.tar.gz 116367503 BLAKE2B
0be22f2ec4b9aac6f5e976664cae01facf07929a32565cd57d7cc5b2d9888e9ae71ca301853752fe8f31d174d04c9974eb9ed2f3d452360a50ccf024f200726a
SHA512
7990e0f9484038c3458c0bda2c863bf2b19e56edab81fc5938c6e0f08b17558287f853bb67350e8cca8f42bec0f1d4ba0e94e50a145db8da44bdd4bd703d91d0
DIST pytorch-2.3.0.tar.gz 117029829 BLAKE2B
8f9c0d71ee0a9219b495eddccdcc65107f7ad537c43c68100b229f3d27b0e6c01ccb1659c7fffc356a48d80f2adc0a10361305dc8f1df20446de837d380f89f6
SHA512
67f7e9a096c3ffb952206ebf9105bedebb68c24ad82456083adf1d1d210437fcaa9dd52b68484cfc97d408c9eebc9541c76868c34a7c9982494dc3f424cfb07c
diff --git a/sci-libs/caffe2/caffe2-2.1.2-r7.ebuild
b/sci-libs/caffe2/caffe2-2.1.2-r7.ebuild
deleted file mode 100644
index 8198f516b251..
--- a/sci-libs/caffe2/caffe2-2.1.2-r7.ebuild
+++ /dev/null
@@ -1,283 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-ROCM_VERSION=5.7
-inherit python-single-r1 cmake cuda flag-o-matic prefix rocm
-
-MYPN=pytorch
-MYP=${MYPN}-${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"
-
-S="${WORKDIR}"/${MYP}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="cuda distributed fbgemm ffmpeg gloo mkl mpi nnpack +numpy onednn
openblas opencl opencv openmp qnnpack rocm tensorpipe xnnpack"
-RESTRICT="test"
-REQUIRED_USE="
- ${PYTHON_REQUIRED_USE}
- ffmpeg? ( opencv )
- mpi? ( distributed )
- tensorpipe? ( distributed )
- distributed? ( tensorpipe )
- gloo? ( distributed )
- ?? ( cuda rocm )
- rocm? ( || ( ${ROCM_REQUIRED_USE} ) )
-"
-
-# CUDA 12 not supported yet: https://github.com/pytorch/pytorch/issues/91122
-RDEPEND="
- ${PYTHON_DEPS}
- dev-cpp/gflags:=
- >=dev-cpp/glog-0.5.0
- dev-libs/cpuinfo
- dev-libs/libfmt
- dev-libs/protobuf:=
- dev-libs/pthreadpool
- dev-libs/sleef
- virtual/lapack
- >=sci-libs/onnx-1.12.0
- =dev-libs/cudnn-frontend-0.9.2:0/8
- =dev-libs/FBGEMM-2023.11.02 )
- ffmpeg? ( media-video/ffmpeg:= )
- gloo? ( sci-libs/gloo[cuda?] )
- mpi? ( virtual/mpi )
- nnpack? ( sci-libs/NNPACK )
- 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 )
- rocm? (
- >=dev-util/hip-5.7
- >=dev-libs/rccl-5.7[${ROCM_USEDEP}]
- >=sci-libs/rocThrust-5.7[${ROCM_USEDEP}]
- >=sci-libs/rocPRIM-5.7[${ROCM_USEDEP}]
- >=sci-libs/hipBLAS-5.7[${ROCM_USEDEP}]
- >=sci-libs/hipFFT-5.7[${ROCM_USEDEP}]
- >=sci-libs/hipSPARSE-5.7[${ROCM_USEDEP}]
- >=sci-libs/hipRAND-5.7[${ROCM_USEDEP}]
- >=sci-libs/hipCUB-5.7[${ROCM_USEDEP}]
- >=sci-libs/hipSOLVER-5.7[${ROCM_USEDEP}]
- >=sci-libs/miopen-5.7[${ROCM_USEDEP}]
- >=dev-util/roctracer-5.7[${ROCM_USEDEP}]
- )
- tensorpipe? ( sci-libs/tensorpipe[cuda?] )
- xnnpack? ( >=sci-libs/XNNPACK-2022.12.22 )
- mkl? ( sci-libs/mkl )
- openblas? ( sci-libs/openblas )
-"
-DEPEND="
- ${RDEPEND}
- cuda? ( >=dev-libs/cutlass-3.1.0 )
- onednn? ( sci-libs/ideep )
- dev-libs/psimd
- dev-libs/FP16
- dev-libs/FXdiv
- dev-libs/pocketfft
- dev-libs/flatbuffers
-
[gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
commit: 27e4c06d52a66978ec41a325468bdd3b756236ba
Author: Alfredo Tupone gentoo org>
AuthorDate: Thu May 9 18:44:58 2024 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Thu May 9 18:45:45 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27e4c06d
sci-libs/caffe2: filtering FLASH ATTENTION by USE flash
Bug: https://bugs.gentoo.org/931046
Signed-off-by: Alfredo Tupone gentoo.org>
.../caffe2/{caffe2-2.3.0-r2.ebuild => caffe2-2.3.0-r3.ebuild} | 8 ++--
sci-libs/caffe2/metadata.xml | 1 +
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/sci-libs/caffe2/caffe2-2.3.0-r2.ebuild
b/sci-libs/caffe2/caffe2-2.3.0-r3.ebuild
similarity index 97%
rename from sci-libs/caffe2/caffe2-2.3.0-r2.ebuild
rename to sci-libs/caffe2/caffe2-2.3.0-r3.ebuild
index 41630a00aa19..c01e904d8eb0 100644
--- a/sci-libs/caffe2/caffe2-2.3.0-r2.ebuild
+++ b/sci-libs/caffe2/caffe2-2.3.0-r3.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}"/${MYP}
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64"
-IUSE="cuda distributed fbgemm ffmpeg gloo mkl mpi nnpack +numpy onednn
openblas opencl opencv openmp qnnpack rocm xnnpack"
+IUSE="cuda distributed fbgemm ffmpeg flash gloo mkl mpi nnpack +numpy onednn
openblas opencl opencv openmp qnnpack rocm xnnpack"
RESTRICT="test"
REQUIRED_USE="
${PYTHON_REQUIRED_USE}
@@ -28,7 +28,10 @@ REQUIRED_USE="
mpi? ( distributed )
gloo? ( distributed )
?? ( cuda rocm )
- rocm? ( || ( ${ROCM_REQUIRED_USE} ) )
+ rocm? (
+ || ( ${ROCM_REQUIRED_USE} )
+ !flash
+ )
"
# CUDA 12 not supported yet: https://github.com/pytorch/pytorch/issues/91122
@@ -172,6 +175,7 @@ src_configure() {
-DUSE_FAKELOWP=OFF
-DUSE_FBGEMM=$(usex fbgemm)
-DUSE_FFMPEG=$(usex ffmpeg)
+ -DUSE_FLASH_ATTENTION=$(usex flash)
-DUSE_GFLAGS=ON
-DUSE_GLOG=ON
-DUSE_GLOO=$(usex gloo)
diff --git a/sci-libs/caffe2/metadata.xml b/sci-libs/caffe2/metadata.xml
index ed1f9fa58993..43aee37ffc47 100644
--- a/sci-libs/caffe2/metadata.xml
+++ b/sci-libs/caffe2/metadata.xml
@@ -9,6 +9,7 @@
Support distributed applications
Use FBGEMM
Add support for video processing
operators
+ Enable flash attention
Use sci-libs/gloo
Use sci-libs/mkl for blas, lapack
and sparse blas routines
Use NNPACK
[gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
commit: 964b3b6e7907dae9b06570354dda1302affc9bdb
Author: Alfredo Tupone gentoo org>
AuthorDate: Tue May 7 20:47:28 2024 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Tue May 7 20:48:07 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=964b3b6e
sci-libs/caffe2: add typing_extensions deps
Closes: https://bugs.gentoo.org/931333
Signed-off-by: Alfredo Tupone gentoo.org>
sci-libs/caffe2/{caffe2-2.3.0-r1.ebuild => caffe2-2.3.0-r2.ebuild} | 1 +
1 file changed, 1 insertion(+)
diff --git a/sci-libs/caffe2/caffe2-2.3.0-r1.ebuild
b/sci-libs/caffe2/caffe2-2.3.0-r2.ebuild
similarity index 99%
rename from sci-libs/caffe2/caffe2-2.3.0-r1.ebuild
rename to sci-libs/caffe2/caffe2-2.3.0-r2.ebuild
index 749359d26e11..41630a00aa19 100644
--- a/sci-libs/caffe2/caffe2-2.3.0-r1.ebuild
+++ b/sci-libs/caffe2/caffe2-2.3.0-r2.ebuild
@@ -93,6 +93,7 @@ DEPEND="
$(python_gen_cond_dep '
dev-python/pyyaml[${PYTHON_USEDEP}]
dev-python/pybind11[${PYTHON_USEDEP}]
+ dev-python/typing-extensions[${PYTHON_USEDEP}]
')
"
[gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
commit: 7016eada548b591cdeacaaf50aeca219128835b0
Author: Alfredo Tupone gentoo org>
AuthorDate: Tue May 7 06:04:38 2024 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Tue May 7 06:05:21 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7016eada
sci-libs/caffe2: fix musl build
Closes: https://bugs.gentoo.org/930641
Signed-off-by: Alfredo Tupone gentoo.org>
sci-libs/caffe2/caffe2-2.2.2-r1.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/sci-libs/caffe2/caffe2-2.2.2-r1.ebuild
b/sci-libs/caffe2/caffe2-2.2.2-r1.ebuild
index 60112b1a722e..cd3d8757daa6 100644
--- a/sci-libs/caffe2/caffe2-2.2.2-r1.ebuild
+++ b/sci-libs/caffe2/caffe2-2.2.2-r1.ebuild
@@ -106,6 +106,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-2.1.2-fix-rpath.patch
"${FILESDIR}"/${PN}-2.1.2-fix-openmp-link.patch
"${FILESDIR}"/${PN}-2.1.2-rocm-fix-std-cpp17.patch
+ "${FILESDIR}"/${P}-musl.patch
)
src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
commit: f8c60f22b1b7f11fc2913496a8e82d7ec8910be9
Author: Alfredo Tupone gentoo org>
AuthorDate: Sun May 5 14:14:15 2024 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Sun May 5 14:14:59 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8c60f22
sci-libs/caffe2: remove onnx version limits
Signed-off-by: Alfredo Tupone gentoo.org>
sci-libs/caffe2/{caffe2-2.2.2.ebuild => caffe2-2.2.2-r1.ebuild} | 3 +--
sci-libs/caffe2/{caffe2-2.3.0.ebuild => caffe2-2.3.0-r1.ebuild} | 5 ++---
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/sci-libs/caffe2/caffe2-2.2.2.ebuild
b/sci-libs/caffe2/caffe2-2.2.2-r1.ebuild
similarity index 99%
rename from sci-libs/caffe2/caffe2-2.2.2.ebuild
rename to sci-libs/caffe2/caffe2-2.2.2-r1.ebuild
index 2af11a75be5e..60112b1a722e 100644
--- a/sci-libs/caffe2/caffe2-2.2.2.ebuild
+++ b/sci-libs/caffe2/caffe2-2.2.2-r1.ebuild
@@ -42,8 +42,7 @@ RDEPEND="
dev-libs/pthreadpool
dev-libs/sleef
virtual/lapack
- >=sci-libs/onnx-1.12.0
-
[gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/, sci-libs/caffe2/files/
commit: b49728b8d6e97c06ec2cbd9d5026f41a147e935e
Author: Alfredo Tupone gentoo org>
AuthorDate: Tue Apr 30 17:17:20 2024 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Tue Apr 30 17:17:20 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b49728b8
sci-libs/caffe2: add 2.3.0
Signed-off-by: Alfredo Tupone gentoo.org>
sci-libs/caffe2/Manifest | 1 +
sci-libs/caffe2/caffe2-2.3.0.ebuild| 270 +
sci-libs/caffe2/files/caffe2-2.2.2-musl.patch | 13 +
sci-libs/caffe2/files/caffe2-2.3.0-CMakeFix.patch | 11 +
.../files/caffe2-2.3.0-cudnn_include_fix.patch | 11 +
.../files/caffe2-2.3.0-rocm-fix-std-cpp17.patch| 68 ++
6 files changed, 374 insertions(+)
diff --git a/sci-libs/caffe2/Manifest b/sci-libs/caffe2/Manifest
index b72973ca6f63..f1df96691729 100644
--- a/sci-libs/caffe2/Manifest
+++ b/sci-libs/caffe2/Manifest
@@ -1,2 +1,3 @@
DIST pytorch-2.1.2.tar.gz 116316469 BLAKE2B
c5a55ee264bc3477d3556ba6376b5591117e992e56e0dd0c9ba93d12526e2727f7840f6f1e0730a38223b6492c9556840c4ebf22ffd220e97225c2abff303747
SHA512
a8961d78ad785b13c959a0612563a60e0de17a7c8bb9822ddea9a24072796354d07e81c47b6cc8761b21a6448845b088cf80e1661d9e889b0ed5474d3dc76756
DIST pytorch-2.2.2.tar.gz 116367503 BLAKE2B
0be22f2ec4b9aac6f5e976664cae01facf07929a32565cd57d7cc5b2d9888e9ae71ca301853752fe8f31d174d04c9974eb9ed2f3d452360a50ccf024f200726a
SHA512
7990e0f9484038c3458c0bda2c863bf2b19e56edab81fc5938c6e0f08b17558287f853bb67350e8cca8f42bec0f1d4ba0e94e50a145db8da44bdd4bd703d91d0
+DIST pytorch-2.3.0.tar.gz 117029829 BLAKE2B
8f9c0d71ee0a9219b495eddccdcc65107f7ad537c43c68100b229f3d27b0e6c01ccb1659c7fffc356a48d80f2adc0a10361305dc8f1df20446de837d380f89f6
SHA512
67f7e9a096c3ffb952206ebf9105bedebb68c24ad82456083adf1d1d210437fcaa9dd52b68484cfc97d408c9eebc9541c76868c34a7c9982494dc3f424cfb07c
diff --git a/sci-libs/caffe2/caffe2-2.3.0.ebuild
b/sci-libs/caffe2/caffe2-2.3.0.ebuild
new file mode 100644
index ..c69c5e8fdb58
--- /dev/null
+++ b/sci-libs/caffe2/caffe2-2.3.0.ebuild
@@ -0,0 +1,270 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+ROCM_VERSION=5.7
+inherit python-single-r1 cmake cuda flag-o-matic prefix rocm
+
+MYPN=pytorch
+MYP=${MYPN}-${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"
+
+S="${WORKDIR}"/${MYP}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="cuda distributed fbgemm ffmpeg gloo mkl mpi nnpack +numpy onednn
openblas opencl opencv openmp qnnpack rocm xnnpack"
+RESTRICT="test"
+REQUIRED_USE="
+ ${PYTHON_REQUIRED_USE}
+ ffmpeg? ( opencv )
+ mpi? ( distributed )
+ gloo? ( distributed )
+ ?? ( cuda rocm )
+ rocm? ( || ( ${ROCM_REQUIRED_USE} ) )
+"
+
+# CUDA 12 not supported yet: https://github.com/pytorch/pytorch/issues/91122
+RDEPEND="
+ ${PYTHON_DEPS}
+ dev-cpp/gflags:=
+ >=dev-cpp/glog-0.5.0
+ dev-libs/cpuinfo
+ dev-libs/libfmt
+ dev-libs/protobuf:=
+ dev-libs/pthreadpool
+ dev-libs/sleef
+ virtual/lapack
+ >=sci-libs/onnx-1.12.0
+ =dev-libs/cudnn-frontend-1.0.3:0/8
+ =dev-libs/FBGEMM-2023.12.01 )
+ ffmpeg? ( media-video/ffmpeg:= )
+ gloo? ( sci-libs/gloo[cuda?] )
+ mpi? ( virtual/mpi )
+ nnpack? ( sci-libs/NNPACK )
+ 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 )
+ rocm? (
+ >=dev-util/hip-5.7
+ >=dev-libs/rccl-5.7[${ROCM_USEDEP}]
+ >=sci-libs/rocThrust-5.7[${ROCM_USEDEP}]
+ >=sci-libs/rocPRIM-5.7[${ROCM_USEDEP}]
+ >=sci-libs/hipBLAS-5.7[${ROCM_USEDEP}]
+ >=sci-libs/hipFFT-5.7[${ROCM_USEDEP}]
+ >=sci-libs/hipSPARSE-5.7[${ROCM_USEDEP}]
+ >=sci-libs/hipRAND-5.7[${ROCM_USEDEP}]
+ >=sci-libs/hipCUB-5.7[${ROCM_USEDEP}]
+ >=sci-libs/hipSOLVER-5.7[${ROCM_USEDEP}]
+ >=sci-libs/miopen-5.7[${ROCM_USEDEP}]
+ >=dev-util/roctracer-5.7[${ROCM_USEDEP}]
+ )
+ distributed? ( sci-libs/tensorpipe[cuda?] )
+ xnnpack? ( >=sci-libs/XNNPACK-2022.12.22 )
+ mkl? ( sci-libs/mkl )
+ openblas? ( sci-libs/openblas )
+"
+DEPEND="
+ ${RDEPEND}
+ cuda? ( >=dev-libs/cutlass-3.4.1 )
+ onednn? ( sci-libs/ideep )
+ dev-libs/psimd
+ dev-libs/FP16
+ dev-libs/FXdiv
+ dev-libs/pocketfft
+ dev-libs/flatbuffers
+ >=sci-libs/kineto-0.4.0_p20231031
+ $(python_gen_cond_dep '
+
[gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
commit: b1d9422115a0e88c478bf837a0758a9fb4dc703a
Author: Alfredo Tupone gentoo org>
AuthorDate: Sat Apr 20 19:21:38 2024 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Sat Apr 20 19:30:11 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1d94221
sci-libs/caffe2: VariableOrderWrong
Signed-off-by: Alfredo Tupone gentoo.org>
sci-libs/caffe2/caffe2-2.1.2-r7.ebuild | 4 ++--
sci-libs/caffe2/caffe2-2.2.2.ebuild| 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/sci-libs/caffe2/caffe2-2.1.2-r7.ebuild
b/sci-libs/caffe2/caffe2-2.1.2-r7.ebuild
index 9fa0ecb0aa74..8198f516b251 100644
--- a/sci-libs/caffe2/caffe2-2.1.2-r7.ebuild
+++ b/sci-libs/caffe2/caffe2-2.1.2-r7.ebuild
@@ -15,6 +15,8 @@ HOMEPAGE="https://pytorch.org/;
SRC_URI="https://github.com/pytorch/${MYPN}/archive/refs/tags/v${PV}.tar.gz
-> ${MYP}.tar.gz"
+S="${WORKDIR}"/${MYP}
+
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64"
@@ -110,8 +112,6 @@ PATCHES=(
"${FILESDIR}"/${PN}-2.1.2-rocm-fix-std-cpp17.patch
)
-S="${WORKDIR}"/${MYP}
-
src_prepare() {
filter-lto #bug 862672
sed -i \
diff --git a/sci-libs/caffe2/caffe2-2.2.2.ebuild
b/sci-libs/caffe2/caffe2-2.2.2.ebuild
index fc0b264a9f32..2af11a75be5e 100644
--- a/sci-libs/caffe2/caffe2-2.2.2.ebuild
+++ b/sci-libs/caffe2/caffe2-2.2.2.ebuild
@@ -15,6 +15,8 @@ HOMEPAGE="https://pytorch.org/;
SRC_URI="https://github.com/pytorch/${MYPN}/archive/refs/tags/v${PV}.tar.gz
-> ${MYP}.tar.gz"
+S="${WORKDIR}"/${MYP}
+
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64"
@@ -107,8 +109,6 @@ PATCHES=(
"${FILESDIR}"/${PN}-2.1.2-rocm-fix-std-cpp17.patch
)
-S="${WORKDIR}"/${MYP}
-
src_prepare() {
filter-lto #bug 862672
sed -i \
[gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
commit: 0396599c81e3c642c58fdfee91772c126d9f7060
Author: Alfredo Tupone gentoo org>
AuthorDate: Thu Apr 4 16:27:46 2024 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Thu Apr 4 16:27:59 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0396599c
sci-libs/caffe2: disable py3.9
Signed-off-by: Alfredo Tupone gentoo.org>
sci-libs/caffe2/caffe2-2.1.2-r7.ebuild | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/sci-libs/caffe2/caffe2-2.1.2-r7.ebuild
b/sci-libs/caffe2/caffe2-2.1.2-r7.ebuild
index f57406145c6a..9fa0ecb0aa74 100644
--- a/sci-libs/caffe2/caffe2-2.1.2-r7.ebuild
+++ b/sci-libs/caffe2/caffe2-2.1.2-r7.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{9..12} )
+PYTHON_COMPAT=( python3_{10..12} )
ROCM_VERSION=5.7
inherit python-single-r1 cmake cuda flag-o-matic prefix rocm
@@ -48,7 +48,7 @@ RDEPEND="
cuda? (
=dev-libs/cudnn-8*
>=dev-libs/cudnn-frontend-0.9.2:0/8
- dev-util/nvidia-cuda-toolkit:=[profiler]
+ =dev-libs/FBGEMM-2023.11.02 )
ffmpeg? ( media-video/ffmpeg:= )
@@ -97,8 +97,6 @@ DEPEND="
')
"
-S="${WORKDIR}"/${MYP}
-
PATCHES=(
"${FILESDIR}"/${PN}-2.1.1-gentoo.patch
"${FILESDIR}"/${PN}-1.13.0-install-dirs.patch
@@ -112,6 +110,8 @@ PATCHES=(
"${FILESDIR}"/${PN}-2.1.2-rocm-fix-std-cpp17.patch
)
+S="${WORKDIR}"/${MYP}
+
src_prepare() {
filter-lto #bug 862672
sed -i \
[gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
commit: 9bf81971012ea4d397d135669e9e17e7db9aa33c
Author: Alfredo Tupone gentoo org>
AuthorDate: Thu Apr 4 09:22:11 2024 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Thu Apr 4 09:22:51 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9bf81971
sci-libs/caffe2: drop 2.2.1-r1
Signed-off-by: Alfredo Tupone gentoo.org>
sci-libs/caffe2/Manifest | 1 -
sci-libs/caffe2/caffe2-2.2.1-r1.ebuild | 269 -
2 files changed, 270 deletions(-)
diff --git a/sci-libs/caffe2/Manifest b/sci-libs/caffe2/Manifest
index e51168eba07c..b72973ca6f63 100644
--- a/sci-libs/caffe2/Manifest
+++ b/sci-libs/caffe2/Manifest
@@ -1,3 +1,2 @@
DIST pytorch-2.1.2.tar.gz 116316469 BLAKE2B
c5a55ee264bc3477d3556ba6376b5591117e992e56e0dd0c9ba93d12526e2727f7840f6f1e0730a38223b6492c9556840c4ebf22ffd220e97225c2abff303747
SHA512
a8961d78ad785b13c959a0612563a60e0de17a7c8bb9822ddea9a24072796354d07e81c47b6cc8761b21a6448845b088cf80e1661d9e889b0ed5474d3dc76756
-DIST pytorch-2.2.1.tar.gz 116370903 BLAKE2B
7d08e80f91bad76fba1751c30a34bebfe7145058b7758c0d47112702263a80666f70687a8860744725c6aa995e854f766a5bfa4644c23e5635e7e08c8d63a6e9
SHA512
f19ebcf59d183c3348946ba7cfcab2bc4ca93785863b8edc39dba5772083a7b0425ccb4f92a8df4dc0d18246c75e8ff812993161467fbf9dc48d7fb28a1e26f1
DIST pytorch-2.2.2.tar.gz 116367503 BLAKE2B
0be22f2ec4b9aac6f5e976664cae01facf07929a32565cd57d7cc5b2d9888e9ae71ca301853752fe8f31d174d04c9974eb9ed2f3d452360a50ccf024f200726a
SHA512
7990e0f9484038c3458c0bda2c863bf2b19e56edab81fc5938c6e0f08b17558287f853bb67350e8cca8f42bec0f1d4ba0e94e50a145db8da44bdd4bd703d91d0
diff --git a/sci-libs/caffe2/caffe2-2.2.1-r1.ebuild
b/sci-libs/caffe2/caffe2-2.2.1-r1.ebuild
deleted file mode 100644
index 4788dca7bf6a..
--- a/sci-libs/caffe2/caffe2-2.2.1-r1.ebuild
+++ /dev/null
@@ -1,269 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-ROCM_VERSION=5.7
-inherit python-single-r1 cmake cuda flag-o-matic prefix rocm
-
-MYPN=pytorch
-MYP=${MYPN}-${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"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="cuda distributed fbgemm ffmpeg gloo mkl mpi nnpack +numpy onednn
openblas opencl opencv openmp qnnpack rocm xnnpack"
-RESTRICT="test"
-REQUIRED_USE="
- ${PYTHON_REQUIRED_USE}
- ffmpeg? ( opencv )
- mpi? ( distributed )
- gloo? ( distributed )
- ?? ( cuda rocm )
- rocm? ( || ( ${ROCM_REQUIRED_USE} ) )
-"
-
-# CUDA 12 not supported yet: https://github.com/pytorch/pytorch/issues/91122
-RDEPEND="
- ${PYTHON_DEPS}
- dev-cpp/gflags:=
- >=dev-cpp/glog-0.5.0
- dev-libs/cpuinfo
- dev-libs/libfmt
- dev-libs/protobuf:=
- dev-libs/pthreadpool
- dev-libs/sleef
- virtual/lapack
- >=sci-libs/onnx-1.12.0
- =dev-libs/cudnn-frontend-0.9.2:0/8
- dev-util/nvidia-cuda-toolkit:=[profiler]
- )
- fbgemm? ( >=dev-libs/FBGEMM-2023.12.01 )
- ffmpeg? ( media-video/ffmpeg:= )
- gloo? ( sci-libs/gloo[cuda?] )
- mpi? ( virtual/mpi )
- nnpack? ( sci-libs/NNPACK )
- 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 )
- rocm? (
- >=dev-util/hip-5.7
- >=dev-libs/rccl-5.7[${ROCM_USEDEP}]
- >=sci-libs/rocThrust-5.7[${ROCM_USEDEP}]
- >=sci-libs/rocPRIM-5.7[${ROCM_USEDEP}]
- >=sci-libs/hipBLAS-5.7[${ROCM_USEDEP}]
- >=sci-libs/hipFFT-5.7[${ROCM_USEDEP}]
- >=sci-libs/hipSPARSE-5.7[${ROCM_USEDEP}]
- >=sci-libs/hipRAND-5.7[${ROCM_USEDEP}]
- >=sci-libs/hipCUB-5.7[${ROCM_USEDEP}]
- >=sci-libs/hipSOLVER-5.7[${ROCM_USEDEP}]
- >=sci-libs/miopen-5.7[${ROCM_USEDEP}]
- >=dev-util/roctracer-5.7[${ROCM_USEDEP}]
- )
- distributed? ( sci-libs/tensorpipe[cuda?] )
- xnnpack? ( >=sci-libs/XNNPACK-2022.12.22 )
- mkl? ( sci-libs/mkl )
- openblas? ( sci-libs/openblas )
-"
-DEPEND="
- ${RDEPEND}
- cuda? ( >=dev-libs/cutlass-3.1.0 )
- onednn? ( sci-libs/ideep )
- dev-libs/psimd
- dev-libs/FP16
- dev-libs/FXdiv
- dev-libs/pocketfft
- dev-libs/flatbuffers
- >=sci-libs/kineto-0.4.0_p20231031
- $(python_gen_cond_dep '
- dev-python/pyyaml[${PYTHON_USEDEP}]
- dev-python/pybind11[${PYTHON_USEDEP}]
- ')
-"
-
-S="${WORKDIR}"/${MYP}
-
-PATCHES=(
- "${FILESDIR}"/${P}-gentoo.patch
-
[gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
commit: e74afa2c5f42fbc0ff31574a7796c7ee39727e9f
Author: Alfredo Tupone gentoo org>
AuthorDate: Thu Apr 4 09:19:35 2024 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Thu Apr 4 09:20:03 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e74afa2c
sci-libs/caffe2: add 2.2.2
Closes: https://bugs.gentoo.org/928339
Signed-off-by: Alfredo Tupone gentoo.org>
sci-libs/caffe2/Manifest| 1 +
sci-libs/caffe2/caffe2-2.2.2.ebuild | 269
2 files changed, 270 insertions(+)
diff --git a/sci-libs/caffe2/Manifest b/sci-libs/caffe2/Manifest
index 09e1f64fbe4c..e51168eba07c 100644
--- a/sci-libs/caffe2/Manifest
+++ b/sci-libs/caffe2/Manifest
@@ -1,2 +1,3 @@
DIST pytorch-2.1.2.tar.gz 116316469 BLAKE2B
c5a55ee264bc3477d3556ba6376b5591117e992e56e0dd0c9ba93d12526e2727f7840f6f1e0730a38223b6492c9556840c4ebf22ffd220e97225c2abff303747
SHA512
a8961d78ad785b13c959a0612563a60e0de17a7c8bb9822ddea9a24072796354d07e81c47b6cc8761b21a6448845b088cf80e1661d9e889b0ed5474d3dc76756
DIST pytorch-2.2.1.tar.gz 116370903 BLAKE2B
7d08e80f91bad76fba1751c30a34bebfe7145058b7758c0d47112702263a80666f70687a8860744725c6aa995e854f766a5bfa4644c23e5635e7e08c8d63a6e9
SHA512
f19ebcf59d183c3348946ba7cfcab2bc4ca93785863b8edc39dba5772083a7b0425ccb4f92a8df4dc0d18246c75e8ff812993161467fbf9dc48d7fb28a1e26f1
+DIST pytorch-2.2.2.tar.gz 116367503 BLAKE2B
0be22f2ec4b9aac6f5e976664cae01facf07929a32565cd57d7cc5b2d9888e9ae71ca301853752fe8f31d174d04c9974eb9ed2f3d452360a50ccf024f200726a
SHA512
7990e0f9484038c3458c0bda2c863bf2b19e56edab81fc5938c6e0f08b17558287f853bb67350e8cca8f42bec0f1d4ba0e94e50a145db8da44bdd4bd703d91d0
diff --git a/sci-libs/caffe2/caffe2-2.2.2.ebuild
b/sci-libs/caffe2/caffe2-2.2.2.ebuild
new file mode 100644
index ..fc0b264a9f32
--- /dev/null
+++ b/sci-libs/caffe2/caffe2-2.2.2.ebuild
@@ -0,0 +1,269 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+ROCM_VERSION=5.7
+inherit python-single-r1 cmake cuda flag-o-matic prefix rocm
+
+MYPN=pytorch
+MYP=${MYPN}-${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"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="cuda distributed fbgemm ffmpeg gloo mkl mpi nnpack +numpy onednn
openblas opencl opencv openmp qnnpack rocm xnnpack"
+RESTRICT="test"
+REQUIRED_USE="
+ ${PYTHON_REQUIRED_USE}
+ ffmpeg? ( opencv )
+ mpi? ( distributed )
+ gloo? ( distributed )
+ ?? ( cuda rocm )
+ rocm? ( || ( ${ROCM_REQUIRED_USE} ) )
+"
+
+# CUDA 12 not supported yet: https://github.com/pytorch/pytorch/issues/91122
+RDEPEND="
+ ${PYTHON_DEPS}
+ dev-cpp/gflags:=
+ >=dev-cpp/glog-0.5.0
+ dev-libs/cpuinfo
+ dev-libs/libfmt
+ dev-libs/protobuf:=
+ dev-libs/pthreadpool
+ dev-libs/sleef
+ virtual/lapack
+ >=sci-libs/onnx-1.12.0
+ =dev-libs/cudnn-frontend-0.9.2:0/8
+ =dev-libs/FBGEMM-2023.12.01 )
+ ffmpeg? ( media-video/ffmpeg:= )
+ gloo? ( sci-libs/gloo[cuda?] )
+ mpi? ( virtual/mpi )
+ nnpack? ( sci-libs/NNPACK )
+ 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 )
+ rocm? (
+ >=dev-util/hip-5.7
+ >=dev-libs/rccl-5.7[${ROCM_USEDEP}]
+ >=sci-libs/rocThrust-5.7[${ROCM_USEDEP}]
+ >=sci-libs/rocPRIM-5.7[${ROCM_USEDEP}]
+ >=sci-libs/hipBLAS-5.7[${ROCM_USEDEP}]
+ >=sci-libs/hipFFT-5.7[${ROCM_USEDEP}]
+ >=sci-libs/hipSPARSE-5.7[${ROCM_USEDEP}]
+ >=sci-libs/hipRAND-5.7[${ROCM_USEDEP}]
+ >=sci-libs/hipCUB-5.7[${ROCM_USEDEP}]
+ >=sci-libs/hipSOLVER-5.7[${ROCM_USEDEP}]
+ >=sci-libs/miopen-5.7[${ROCM_USEDEP}]
+ >=dev-util/roctracer-5.7[${ROCM_USEDEP}]
+ )
+ distributed? ( sci-libs/tensorpipe[cuda?] )
+ xnnpack? ( >=sci-libs/XNNPACK-2022.12.22 )
+ mkl? ( sci-libs/mkl )
+ openblas? ( sci-libs/openblas )
+"
+DEPEND="
+ ${RDEPEND}
+ cuda? ( >=dev-libs/cutlass-3.1.0 )
+ onednn? ( sci-libs/ideep )
+ dev-libs/psimd
+ dev-libs/FP16
+ dev-libs/FXdiv
+ dev-libs/pocketfft
+ dev-libs/flatbuffers
+ >=sci-libs/kineto-0.4.0_p20231031
+ $(python_gen_cond_dep '
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ dev-python/pybind11[${PYTHON_USEDEP}]
+ ')
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.2.1-gentoo.patch
+ "${FILESDIR}"/${PN}-1.13.0-install-dirs.patch
+
[gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
commit: 0cb2f08e6e3fa80ebfa391a0ae95976d2c4f745c
Author: Alfredo Tupone gentoo org>
AuthorDate: Sat Mar 30 19:38:22 2024 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Sat Mar 30 19:39:50 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0cb2f08e
sci-libs/caffe2: disable py3.9
Signed-off-by: Alfredo Tupone gentoo.org>
sci-libs/caffe2/caffe2-2.2.1-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-libs/caffe2/caffe2-2.2.1-r1.ebuild
b/sci-libs/caffe2/caffe2-2.2.1-r1.ebuild
index 9070f758d18b..4788dca7bf6a 100644
--- a/sci-libs/caffe2/caffe2-2.2.1-r1.ebuild
+++ b/sci-libs/caffe2/caffe2-2.2.1-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{9..12} )
+PYTHON_COMPAT=( python3_{10..12} )
ROCM_VERSION=5.7
inherit python-single-r1 cmake cuda flag-o-matic prefix rocm
[gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
commit: 07e13e6234fcd1c25b5b54a70de4ecaae294b669
Author: Alfredo Tupone gentoo org>
AuthorDate: Sat Mar 30 19:35:22 2024 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Sat Mar 30 19:35:53 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07e13e62
sci-libs/caffe2: addpredict /proc/self/task
Closes: https://bugs.gentoo.org/926116
Signed-off-by: Alfredo Tupone gentoo.org>
sci-libs/caffe2/caffe2-2.2.1-r1.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/sci-libs/caffe2/caffe2-2.2.1-r1.ebuild
b/sci-libs/caffe2/caffe2-2.2.1-r1.ebuild
index 80dc2b500a0f..9070f758d18b 100644
--- a/sci-libs/caffe2/caffe2-2.2.1-r1.ebuild
+++ b/sci-libs/caffe2/caffe2-2.2.1-r1.ebuild
@@ -220,6 +220,7 @@ src_configure() {
if use cuda; then
addpredict "/dev/nvidiactl" # bug 867706
addpredict "/dev/char"
+ addpredict "/proc/self/task" # bug 926116
mycmakeargs+=(
-DUSE_CUDNN=ON
[gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/, sci-libs/caffe2/files/
commit: 1d5ccecbb03d065f91980bce649a4981e2e6cc42
Author: Alfredo Tupone gentoo org>
AuthorDate: Fri Mar 22 20:47:29 2024 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Fri Mar 22 20:47:29 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d5ccecb
sci-libs/caffe2: drop 1.13.1-r6, 2.0.1-r5
Signed-off-by: Alfredo Tupone gentoo.org>
sci-libs/caffe2/Manifest | 2 -
sci-libs/caffe2/caffe2-1.13.1-r6.ebuild| 194 -
sci-libs/caffe2/caffe2-2.0.1-r5.ebuild | 211 --
sci-libs/caffe2/files/caffe2-1.12.0-clang.patch| 42
sci-libs/caffe2/files/caffe2-1.13.0-gentoo.patch | 239 -
sci-libs/caffe2/files/caffe2-2.0.0-gentoo.patch| 204 --
sci-libs/caffe2/files/caffe2-2.0.1-cudaExtra.patch | 28 ---
7 files changed, 920 deletions(-)
diff --git a/sci-libs/caffe2/Manifest b/sci-libs/caffe2/Manifest
index 2a63d8018442..09e1f64fbe4c 100644
--- a/sci-libs/caffe2/Manifest
+++ b/sci-libs/caffe2/Manifest
@@ -1,4 +1,2 @@
-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
DIST pytorch-2.2.1.tar.gz 116370903 BLAKE2B
7d08e80f91bad76fba1751c30a34bebfe7145058b7758c0d47112702263a80666f70687a8860744725c6aa995e854f766a5bfa4644c23e5635e7e08c8d63a6e9
SHA512
f19ebcf59d183c3348946ba7cfcab2bc4ca93785863b8edc39dba5772083a7b0425ccb4f92a8df4dc0d18246c75e8ff812993161467fbf9dc48d7fb28a1e26f1
diff --git a/sci-libs/caffe2/caffe2-1.13.1-r6.ebuild
b/sci-libs/caffe2/caffe2-1.13.1-r6.ebuild
deleted file mode 100644
index 1a1184178b12..
--- a/sci-libs/caffe2/caffe2-1.13.1-r6.ebuild
+++ /dev/null
@@ -1,194 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit python-single-r1 cmake cuda flag-o-matic
-
-MYPN=pytorch
-MYP=${MYPN}-${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"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="cuda distributed fbgemm ffmpeg gloo mpi nnpack +numpy opencl opencv
openmp qnnpack tensorpipe xnnpack"
-RESTRICT="test"
-REQUIRED_USE="
- ${PYTHON_REQUIRED_USE}
- ffmpeg? ( opencv )
- mpi? ( distributed )
- tensorpipe? ( distributed )
- gloo? ( distributed )
-" # ?? ( cuda rocm )
-
-# CUDA 12 not supported yet: https://github.com/pytorch/pytorch/issues/91122
-RDEPEND="
- ${PYTHON_DEPS}
- dev-cpp/gflags:=
- >=dev-cpp/glog-0.5.0
- dev-libs/cpuinfo
- dev-libs/libfmt
- dev-libs/protobuf:=
- dev-libs/pthreadpool
- dev-libs/sleef
- sci-libs/lapack
- >=sci-libs/onnx-1.12.0
- 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
- -DBUILD_SHARED_LIBS=ON
-
- -DUSE_CCACHE=OFF
- -DUSE_CUDA=$(usex cuda)
- -DUSE_CUDNN=$(usex cuda)
- -DUSE_FAST_NVCC=$(usex cuda)
- -DTORCH_CUDA_ARCH_LIST="${TORCH_CUDA_ARCH_LIST:-3.5 7.0}"
- -DUSE_DISTRIBUTED=$(usex distributed)
- -DUSE_MPI=$(usex mpi)
- -DUSE_FAKELOWP=OFF
- -DUSE_FBGEMM=$(usex fbgemm)
- -DUSE_FFMPEG=$(usex ffmpeg)
- -DUSE_GFLAGS=ON
- -DUSE_GLOG=ON
- -DUSE_GLOO=$(usex gloo)
- -DUSE_KINETO=OFF # TODO
- -DUSE_LEVELDB=OFF
- -DUSE_MAGMA=OFF # TODO: In GURU as sci-libs/magma
- -DUSE_MKLDNN=OFF
- -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)
-
[gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/files/, sci-libs/caffe2/
commit: a5bd494c9be931e7bdcf88f75f37d9f4d8594864
Author: Sv. Lockal gmail com>
AuthorDate: Mon Mar 11 16:37:02 2024 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Mon Mar 11 19:27:48 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5bd494c
sci-libs/caffe2: add USE=rocm flag for AMDGPU support for 2.1.2 and 2.2.1
Closes: https://bugs.gentoo.org/905286
Signed-off-by: Sv. Lockal gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/35713
Signed-off-by: Alfredo Tupone gentoo.org>
...ffe2-2.1.2-r6.ebuild => caffe2-2.1.2-r7.ebuild} | 61 +++
...{caffe2-2.2.1.ebuild => caffe2-2.2.1-r1.ebuild} | 54 ++---
.../files/caffe2-2.1.2-rocm-fix-std-cpp17.patch| 68 ++
sci-libs/caffe2/metadata.xml | 1 +
4 files changed, 166 insertions(+), 18 deletions(-)
diff --git a/sci-libs/caffe2/caffe2-2.1.2-r6.ebuild
b/sci-libs/caffe2/caffe2-2.1.2-r7.ebuild
similarity index 79%
rename from sci-libs/caffe2/caffe2-2.1.2-r6.ebuild
rename to sci-libs/caffe2/caffe2-2.1.2-r7.ebuild
index 969c36754c5c..f57406145c6a 100644
--- a/sci-libs/caffe2/caffe2-2.1.2-r6.ebuild
+++ b/sci-libs/caffe2/caffe2-2.1.2-r7.ebuild
@@ -4,7 +4,8 @@
EAPI=8
PYTHON_COMPAT=( python3_{9..12} )
-inherit python-single-r1 cmake cuda flag-o-matic prefix
+ROCM_VERSION=5.7
+inherit python-single-r1 cmake cuda flag-o-matic prefix rocm
MYPN=pytorch
MYP=${MYPN}-${PV}
@@ -17,7 +18,7 @@
SRC_URI="https://github.com/pytorch/${MYPN}/archive/refs/tags/v${PV}.tar.gz
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64"
-IUSE="cuda distributed fbgemm ffmpeg gloo mkl mpi nnpack +numpy onednn
openblas opencl opencv openmp qnnpack tensorpipe xnnpack"
+IUSE="cuda distributed fbgemm ffmpeg gloo mkl mpi nnpack +numpy onednn
openblas opencl opencv openmp qnnpack rocm tensorpipe xnnpack"
RESTRICT="test"
REQUIRED_USE="
${PYTHON_REQUIRED_USE}
@@ -26,7 +27,9 @@ REQUIRED_USE="
tensorpipe? ( distributed )
distributed? ( tensorpipe )
gloo? ( distributed )
-" # ?? ( cuda rocm )
+ ?? ( cuda rocm )
+ rocm? ( || ( ${ROCM_REQUIRED_USE} ) )
+"
# CUDA 12 not supported yet: https://github.com/pytorch/pytorch/issues/91122
RDEPEND="
@@ -59,6 +62,20 @@ RDEPEND="
opencl? ( virtual/opencl )
opencv? ( media-libs/opencv:= )
qnnpack? ( sci-libs/QNNPACK )
+ rocm? (
+ >=dev-util/hip-5.7
+ >=dev-libs/rccl-5.7[${ROCM_USEDEP}]
+ >=sci-libs/rocThrust-5.7[${ROCM_USEDEP}]
+ >=sci-libs/rocPRIM-5.7[${ROCM_USEDEP}]
+ >=sci-libs/hipBLAS-5.7[${ROCM_USEDEP}]
+ >=sci-libs/hipFFT-5.7[${ROCM_USEDEP}]
+ >=sci-libs/hipSPARSE-5.7[${ROCM_USEDEP}]
+ >=sci-libs/hipRAND-5.7[${ROCM_USEDEP}]
+ >=sci-libs/hipCUB-5.7[${ROCM_USEDEP}]
+ >=sci-libs/hipSOLVER-5.7[${ROCM_USEDEP}]
+ >=sci-libs/miopen-5.7[${ROCM_USEDEP}]
+ >=dev-util/roctracer-5.7[${ROCM_USEDEP}]
+ )
tensorpipe? ( sci-libs/tensorpipe[cuda?] )
xnnpack? ( >=sci-libs/XNNPACK-2022.12.22 )
mkl? ( sci-libs/mkl )
@@ -92,6 +109,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-2.1.1-cudaExtra.patch
"${FILESDIR}"/${PN}-2.1.2-fix-rpath.patch
"${FILESDIR}"/${PN}-2.1.2-fix-openmp-link.patch
+ "${FILESDIR}"/${PN}-2.1.2-rocm-fix-std-cpp17.patch
)
src_prepare() {
@@ -118,6 +136,18 @@ src_prepare() {
cmake/Dependencies.cmake \
torch/CMakeLists.txt \
CMakeLists.txt
+
+ if use rocm; then
+ sed -e "s:ROCM_PATH /opt/rocm:ROCM_PATH /usr:" \
+ -e "s:HIP_PATH \${ROCM_PATH}/hip:HIP_PATH /usr:" \
+ -e
"s:\${HIP_PATH}/cmake:/usr/$(get_libdir)/cmake/hip:g" \
+ -e "s/HIP 1.0/HIP 1.0 REQUIRED/" \
+ -i cmake/public/LoadHIP.cmake || die
+
+ ebegin "HIPifying cuda sources"
+ ${EPYTHON} tools/amd_build/build_amd.py || die
+ eend $?
+ fi
}
src_configure() {
@@ -140,9 +170,6 @@ src_configure() {
-DUSE_CCACHE=OFF
-DUSE_CUDA=$(usex cuda)
- -DUSE_CUDNN=$(usex cuda)
- -DTORCH_CUDA_ARCH_LIST="${TORCH_CUDA_ARCH_LIST:-3.5 7.0}"
- -DBUILD_NVFUSER=$(usex cuda)
-DUSE_DISTRIBUTED=$(usex distributed)
-DUSE_MPI=$(usex mpi)
-DUSE_FAKELOWP=OFF
@@ -155,7 +182,6 @@ src_configure() {
-DUSE_LEVELDB=OFF
-DUSE_MAGMA=OFF # TODO: In GURU as sci-libs/magma
-DUSE_MKLDNN=$(usex onednn)
- -DUSE_NCCL=OFF # TODO: NVIDIA Collective Communication Library
-DUSE_NNPACK=$(usex nnpack)
-DUSE_QNNPACK=$(usex qnnpack)
-DUSE_XNNPACK=$(usex xnnpack)
@@ -166,7 +192,7 @@ src_configure() {
[gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
commit: 04e14cabcf1361cd6f71cc29eb5787f697cf1b85 Author: Sv. Lockal gmail com> AuthorDate: Mon Mar 11 16:34:59 2024 + Commit: Alfredo Tupone gentoo org> CommitDate: Mon Mar 11 19:27:44 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04e14cab sci-libs/caffe2: fix compilation with USE=fbgemm Closes: https://bugs.gentoo.org/926773 Signed-off-by: Sv. Lockal gmail.com> Signed-off-by: Alfredo Tupone gentoo.org> sci-libs/caffe2/caffe2-2.2.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sci-libs/caffe2/caffe2-2.2.1.ebuild b/sci-libs/caffe2/caffe2-2.2.1.ebuild index 68328fb71624..6f96107154b7 100644 --- a/sci-libs/caffe2/caffe2-2.2.1.ebuild +++ b/sci-libs/caffe2/caffe2-2.2.1.ebuild @@ -45,7 +45,7 @@ RDEPEND=" >=dev-libs/cudnn-frontend-0.9.2:0/8 dev-util/nvidia-cuda-toolkit:=[profiler] ) - fbgemm? ( >=dev-libs/FBGEMM-2023.11.02 ) + fbgemm? ( >=dev-libs/FBGEMM-2023.12.01 ) ffmpeg? ( media-video/ffmpeg:= ) gloo? ( sci-libs/gloo[cuda?] ) mpi? ( virtual/mpi )
[gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/files/, sci-libs/caffe2/
commit: 087c7302f2f874abf503fad2c0eaf04fde04cb40
Author: Alfredo Tupone gentoo org>
AuthorDate: Fri Mar 8 18:40:10 2024 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Fri Mar 8 18:45:29 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=087c7302
sci-libs/caffe2: add 2.2.1
Signed-off-by: Alfredo Tupone gentoo.org>
sci-libs/caffe2/Manifest| 1 +
sci-libs/caffe2/caffe2-2.2.1.ebuild | 230
sci-libs/caffe2/files/caffe2-2.2.1-gentoo.patch | 195
3 files changed, 426 insertions(+)
diff --git a/sci-libs/caffe2/Manifest b/sci-libs/caffe2/Manifest
index a05e285f98e0..2a63d8018442 100644
--- a/sci-libs/caffe2/Manifest
+++ b/sci-libs/caffe2/Manifest
@@ -1,3 +1,4 @@
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
+DIST pytorch-2.2.1.tar.gz 116370903 BLAKE2B
7d08e80f91bad76fba1751c30a34bebfe7145058b7758c0d47112702263a80666f70687a8860744725c6aa995e854f766a5bfa4644c23e5635e7e08c8d63a6e9
SHA512
f19ebcf59d183c3348946ba7cfcab2bc4ca93785863b8edc39dba5772083a7b0425ccb4f92a8df4dc0d18246c75e8ff812993161467fbf9dc48d7fb28a1e26f1
diff --git a/sci-libs/caffe2/caffe2-2.2.1.ebuild
b/sci-libs/caffe2/caffe2-2.2.1.ebuild
new file mode 100644
index ..68328fb71624
--- /dev/null
+++ b/sci-libs/caffe2/caffe2-2.2.1.ebuild
@@ -0,0 +1,230 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..12} )
+inherit python-single-r1 cmake cuda flag-o-matic prefix
+
+MYPN=pytorch
+MYP=${MYPN}-${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"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="cuda distributed fbgemm ffmpeg gloo mkl mpi nnpack +numpy onednn
openblas opencl opencv openmp qnnpack xnnpack"
+RESTRICT="test"
+REQUIRED_USE="
+ ${PYTHON_REQUIRED_USE}
+ ffmpeg? ( opencv )
+ mpi? ( distributed )
+ gloo? ( distributed )
+" # ?? ( cuda rocm )
+
+# CUDA 12 not supported yet: https://github.com/pytorch/pytorch/issues/91122
+RDEPEND="
+ ${PYTHON_DEPS}
+ dev-cpp/gflags:=
+ >=dev-cpp/glog-0.5.0
+ dev-libs/cpuinfo
+ dev-libs/libfmt
+ dev-libs/protobuf:=
+ dev-libs/pthreadpool
+ dev-libs/sleef
+ virtual/lapack
+ >=sci-libs/onnx-1.12.0
+ =dev-libs/cudnn-frontend-0.9.2:0/8
+ dev-util/nvidia-cuda-toolkit:=[profiler]
+ )
+ fbgemm? ( >=dev-libs/FBGEMM-2023.11.02 )
+ ffmpeg? ( media-video/ffmpeg:= )
+ gloo? ( sci-libs/gloo[cuda?] )
+ mpi? ( virtual/mpi )
+ nnpack? ( sci-libs/NNPACK )
+ 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 )
+ distributed? ( sci-libs/tensorpipe[cuda?] )
+ xnnpack? ( >=sci-libs/XNNPACK-2022.12.22 )
+ mkl? ( sci-libs/mkl )
+ openblas? ( sci-libs/openblas )
+"
+DEPEND="
+ ${RDEPEND}
+ cuda? ( >=dev-libs/cutlass-3.1.0 )
+ onednn? ( sci-libs/ideep )
+ dev-libs/psimd
+ dev-libs/FP16
+ dev-libs/FXdiv
+ dev-libs/pocketfft
+ dev-libs/flatbuffers
+ >=sci-libs/kineto-0.4.0_p20231031
+ $(python_gen_cond_dep '
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ dev-python/pybind11[${PYTHON_USEDEP}]
+ ')
+"
+
+S="${WORKDIR}"/${MYP}
+
+PATCHES=(
+ "${FILESDIR}"/${P}-gentoo.patch
+ "${FILESDIR}"/${PN}-1.13.0-install-dirs.patch
+ "${FILESDIR}"/${PN}-1.12.0-glog-0.6.0.patch
+ "${FILESDIR}"/${PN}-1.13.1-tensorpipe.patch
+ "${FILESDIR}"/${PN}-2.0.0-gcc13.patch
+ "${FILESDIR}"/${PN}-2.0.0-cudnn_include_fix.patch
+ "${FILESDIR}"/${PN}-2.1.2-fix-rpath.patch
+ "${FILESDIR}"/${PN}-2.1.2-fix-openmp-link.patch
[gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
commit: 134e80e0686c911283cc4156f72bb4e932ec0647
Author: Alfredo Tupone gentoo org>
AuthorDate: Fri Mar 8 07:26:02 2024 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Fri Mar 8 07:26:41 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=134e80e0
sci-libs/caffe2: remove test file from correct location
Closes: https://bugs.gentoo.org/926304
Signed-off-by: Alfredo Tupone gentoo.org>
sci-libs/caffe2/caffe2-2.1.2-r6.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-libs/caffe2/caffe2-2.1.2-r6.ebuild
b/sci-libs/caffe2/caffe2-2.1.2-r6.ebuild
index a8d3fb624cf2..969c36754c5c 100644
--- a/sci-libs/caffe2/caffe2-2.1.2-r6.ebuild
+++ b/sci-libs/caffe2/caffe2-2.1.2-r6.ebuild
@@ -237,6 +237,6 @@ src_install() {
if use cuda; then
python_domodule python/nvfuser
fi
- rm -rf "${ED}"/var/tmp
+ rm -rf "${ED}${WORKDIR}"
find "${ED}" -empty -delete
}
[gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
commit: d70014d3d47300e21900a29db4ccc95d7bea55cc
Author: Alfredo Tupone gentoo org>
AuthorDate: Fri Mar 1 18:54:05 2024 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Fri Mar 1 18:54:05 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d70014d3
sci-libs/caffe2: depends on ideep
Signed-off-by: Alfredo Tupone gentoo.org>
sci-libs/caffe2/Manifest | 1 -
.../caffe2/{caffe2-2.1.2-r5.ebuild => caffe2-2.1.2-r6.ebuild}| 9 -
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/sci-libs/caffe2/Manifest b/sci-libs/caffe2/Manifest
index 55f23c0f7c92..a05e285f98e0 100644
--- a/sci-libs/caffe2/Manifest
+++ b/sci-libs/caffe2/Manifest
@@ -1,4 +1,3 @@
-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
diff --git a/sci-libs/caffe2/caffe2-2.1.2-r5.ebuild
b/sci-libs/caffe2/caffe2-2.1.2-r6.ebuild
similarity index 95%
rename from sci-libs/caffe2/caffe2-2.1.2-r5.ebuild
rename to sci-libs/caffe2/caffe2-2.1.2-r6.ebuild
index 91444530fe84..a8d3fb624cf2 100644
--- a/sci-libs/caffe2/caffe2-2.1.2-r5.ebuild
+++ b/sci-libs/caffe2/caffe2-2.1.2-r6.ebuild
@@ -8,13 +8,11 @@ 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
-onednn? ( https://github.com/intel/ideep/archive/${IDEEP_VERSION}.tar.gz ->
ideep-${IDEEP_VERSION}.tar.gz )
-"
+SRC_URI="https://github.com/pytorch/${MYPN}/archive/refs/tags/v${PV}.tar.gz
+ -> ${MYP}.tar.gz"
LICENSE="BSD"
SLOT="0"
@@ -69,6 +67,7 @@ RDEPEND="
DEPEND="
${RDEPEND}
cuda? ( >=dev-libs/cutlass-3.1.0 )
+ onednn? ( sci-libs/ideep )
dev-libs/psimd
dev-libs/FP16
dev-libs/FXdiv
@@ -210,7 +209,7 @@ src_configure() {
-DUSE_MKLDNN=ON
-DMKLDNN_FOUND=ON
-DMKLDNN_LIBRARIES=dnnl
-
-DMKLDNN_INCLUDE_DIR="${ESYSROOT}/usr/include/oneapi/dnnl;${WORKDIR}/ideep-${IDEEP_VERSION}/include"
+
-DMKLDNN_INCLUDE_DIR="${ESYSROOT}/usr/include/oneapi/dnnl"
)
fi
[gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
commit: 09078aa1cb41455efd84c528b1671ae8de9074ba
Author: Alfredo Tupone gentoo org>
AuthorDate: Sat Feb 24 21:56:04 2024 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Sat Feb 24 21:56:40 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09078aa1
sci-libs/caffe2: rm install on /var/tmp
Signed-off-by: Alfredo Tupone gentoo.org>
sci-libs/caffe2/{caffe2-2.1.2-r4.ebuild => caffe2-2.1.2-r5.ebuild} | 1 +
1 file changed, 1 insertion(+)
diff --git a/sci-libs/caffe2/caffe2-2.1.2-r4.ebuild
b/sci-libs/caffe2/caffe2-2.1.2-r5.ebuild
similarity index 99%
rename from sci-libs/caffe2/caffe2-2.1.2-r4.ebuild
rename to sci-libs/caffe2/caffe2-2.1.2-r5.ebuild
index e4d9ad2932f3..91444530fe84 100644
--- a/sci-libs/caffe2/caffe2-2.1.2-r4.ebuild
+++ b/sci-libs/caffe2/caffe2-2.1.2-r5.ebuild
@@ -238,5 +238,6 @@ src_install() {
if use cuda; then
python_domodule python/nvfuser
fi
+ rm -rf "${ED}"/var/tmp
find "${ED}" -empty -delete
}
[gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
commit: 49f65bf6621d8661f608fe3765a90417f53e23fd
Author: Alfredo Tupone gentoo org>
AuthorDate: Sat Feb 17 22:20:47 2024 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Sat Feb 17 22:21:35 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49f65bf6
sci-libs/caffe2: allow use of openblas
Closes: https://bugs.gentoo.org/923455
Signed-off-by: Alfredo Tupone gentoo.org>
sci-libs/caffe2/{caffe2-2.1.2-r3.ebuild => caffe2-2.1.2-r4.ebuild} | 5 -
sci-libs/caffe2/metadata.xml | 3 ++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/sci-libs/caffe2/caffe2-2.1.2-r3.ebuild
b/sci-libs/caffe2/caffe2-2.1.2-r4.ebuild
similarity index 97%
rename from sci-libs/caffe2/caffe2-2.1.2-r3.ebuild
rename to sci-libs/caffe2/caffe2-2.1.2-r4.ebuild
index 9b7554309dbc..e4d9ad2932f3 100644
--- a/sci-libs/caffe2/caffe2-2.1.2-r3.ebuild
+++ b/sci-libs/caffe2/caffe2-2.1.2-r4.ebuild
@@ -19,7 +19,7 @@ onednn? (
https://github.com/intel/ideep/archive/${IDEEP_VERSION}.tar.gz -> idee
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64"
-IUSE="cuda distributed fbgemm ffmpeg gloo mkl mpi nnpack +numpy onednn opencl
opencv openmp qnnpack tensorpipe xnnpack"
+IUSE="cuda distributed fbgemm ffmpeg gloo mkl mpi nnpack +numpy onednn
openblas opencl opencv openmp qnnpack tensorpipe xnnpack"
RESTRICT="test"
REQUIRED_USE="
${PYTHON_REQUIRED_USE}
@@ -64,6 +64,7 @@ RDEPEND="
tensorpipe? ( sci-libs/tensorpipe[cuda?] )
xnnpack? ( >=sci-libs/XNNPACK-2022.12.22 )
mkl? ( sci-libs/mkl )
+ openblas? ( sci-libs/openblas )
"
DEPEND="
${RDEPEND}
@@ -189,6 +190,8 @@ src_configure() {
if use mkl; then
mycmakeargs+=(-DBLAS=MKL)
+ elif use openblas; then
+ mycmakeargs+=(-DBLAS=OpenBLAS)
else
mycmakeargs+=(-DBLAS=Generic -DBLAS_LIBRARIES=)
fi
diff --git a/sci-libs/caffe2/metadata.xml b/sci-libs/caffe2/metadata.xml
index 64d212edd735..3fe84b0977fc 100644
--- a/sci-libs/caffe2/metadata.xml
+++ b/sci-libs/caffe2/metadata.xml
@@ -10,15 +10,16 @@
Use FBGEMM
Add support for video processing
operators
Use sci-libs/gloo
+ Use sci-libs/mkl for blas, lapack
and sparse blas routines
Use NNPACK
Add support for math operations through
numpy
Use oneDNN
+ Use sci-libs/openblas for blas
routines
Add support for image processing
operators
Use OpenMP for parallel code
Use QNNPACK
Use tensorpipe
Use XNNPACK
- Use sci-libs/mkl for blas, lapack
and sparse blas routines
pytorch/pytorch
[gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
commit: 1f6128143a5f8bb3dd26c112a1269099d7cde9c9
Author: Sv. Lockal gmail com>
AuthorDate: Mon Jan 29 14:57:18 2024 +
Commit: Michał Górny gentoo org>
CommitDate: Sat Feb 3 07:22:34 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f612814
sci-libs/caffe2: do not move torch headers; symlink them
This allows to use provided CMake configuration to build other projects
(like intel-extension-for-pytorch).
Closes: https://bugs.gentoo.org/923269
Signed-off-by: Sv. Lockal gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/35073
Signed-off-by: Michał Górny gentoo.org>
sci-libs/caffe2/{caffe2-2.1.2-r2.ebuild => caffe2-2.1.2-r3.ebuild} | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/sci-libs/caffe2/caffe2-2.1.2-r2.ebuild
b/sci-libs/caffe2/caffe2-2.1.2-r3.ebuild
similarity index 98%
rename from sci-libs/caffe2/caffe2-2.1.2-r2.ebuild
rename to sci-libs/caffe2/caffe2-2.1.2-r3.ebuild
index f45e501e8567..9b7554309dbc 100644
--- a/sci-libs/caffe2/caffe2-2.1.2-r2.ebuild
+++ b/sci-libs/caffe2/caffe2-2.1.2-r3.ebuild
@@ -223,16 +223,15 @@ src_install() {
rm -rf python
mkdir -p python/torch/include || die
mv "${ED}"/usr/lib/python*/site-packages/caffe2 python/ || die
- mv "${ED}"/usr/include/torch python/torch/include || die
if use cuda; then
mv "${ED}${S}"/nvfuser python/nvfuser || die
mv "${ED}"/usr/$(get_libdir)/nvfuser.so python/nvfuser/_C.so ||
die
fi
- rm -rf "${ED}${S}"/test
- rm -rf "${ED}${S}"/third_party
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
if use cuda; then
python_domodule python/nvfuser
fi
[gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
commit: 443b1fd0d0d3a51e6f9720d1778017f85cf1e277 Author: Jonas Stein gentoo org> AuthorDate: Sun Jan 28 22:52:13 2024 + Commit: Jonas Stein gentoo org> CommitDate: Sun Jan 28 22:52:55 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=443b1fd0 sci-libs/caffe2: update maintainers Bug: https://bugs.gentoo.org/747400 Signed-off-by: Jonas Stein gentoo.org> sci-libs/caffe2/metadata.xml | 4 1 file changed, 4 deletions(-) diff --git a/sci-libs/caffe2/metadata.xml b/sci-libs/caffe2/metadata.xml index e69bb62ba592..64d212edd735 100644 --- a/sci-libs/caffe2/metadata.xml +++ b/sci-libs/caffe2/metadata.xml @@ -5,10 +5,6 @@ tup...@gentoo.org Tupone Alfredo - - tel...@posteo.de - James Beddek - Support distributed applications Use FBGEMM
[gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
commit: ba658e30c1e7f2c095391e06d2a77501253dcea2
Author: Alfredo Tupone gentoo org>
AuthorDate: Wed Jan 10 21:14:14 2024 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Wed Jan 10 21:14:55 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba658e30
sci-libs/caffe2: fix XNNPACK configure
Closes: https://bugs.gentoo.org/921672
Signed-off-by: Alfredo Tupone gentoo.org>
sci-libs/caffe2/caffe2-2.1.2-r2.ebuild | 10 +-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/sci-libs/caffe2/caffe2-2.1.2-r2.ebuild
b/sci-libs/caffe2/caffe2-2.1.2-r2.ebuild
index 35989b1e2e70..f45e501e8567 100644
--- a/sci-libs/caffe2/caffe2-2.1.2-r2.ebuild
+++ b/sci-libs/caffe2/caffe2-2.1.2-r2.ebuild
@@ -159,6 +159,7 @@ src_configure() {
-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)
@@ -166,12 +167,19 @@ 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_LIBS=ON
+ -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_METAL=OFF
-Wno-dev
[gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
commit: 6726d34ce3203d8f0e693ef749836a527929d52b
Author: Sv. Lockal gmail com>
AuthorDate: Mon Jan 8 21:09:04 2024 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Tue Jan 9 07:15:31 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6726d34c
sci-libs/caffe2: add support of onednn
Signed-off-by: Sv. Lockal gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/34714
Signed-off-by: Alfredo Tupone gentoo.org>
sci-libs/caffe2/Manifest | 1 +
...ffe2-2.1.2-r1.ebuild => caffe2-2.1.2-r2.ebuild} | 33 +-
sci-libs/caffe2/metadata.xml | 1 +
3 files changed, 21 insertions(+), 14 deletions(-)
diff --git a/sci-libs/caffe2/Manifest b/sci-libs/caffe2/Manifest
index a05e285f98e0..55f23c0f7c92 100644
--- a/sci-libs/caffe2/Manifest
+++ b/sci-libs/caffe2/Manifest
@@ -1,3 +1,4 @@
+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
diff --git a/sci-libs/caffe2/caffe2-2.1.2-r1.ebuild
b/sci-libs/caffe2/caffe2-2.1.2-r2.ebuild
similarity index 90%
rename from sci-libs/caffe2/caffe2-2.1.2-r1.ebuild
rename to 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}"
[gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
commit: dff61040dd6fbe0cd0c5635ade0e62c5faa52716
Author: Alfredo Tupone gentoo org>
AuthorDate: Wed Jan 3 18:23:02 2024 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Wed Jan 3 18:23:19 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dff61040
sci-libs/caffe2: drop 2.0.0-r5, 2.1.1-r6
Signed-off-by: Alfredo Tupone gentoo.org>
sci-libs/caffe2/Manifest | 2 -
sci-libs/caffe2/caffe2-2.0.0-r5.ebuild | 198 -
sci-libs/caffe2/caffe2-2.1.1-r6.ebuild | 220 -
3 files changed, 420 deletions(-)
diff --git a/sci-libs/caffe2/Manifest b/sci-libs/caffe2/Manifest
index 2fc8f8663e91..a05e285f98e0 100644
--- a/sci-libs/caffe2/Manifest
+++ b/sci-libs/caffe2/Manifest
@@ -1,5 +1,3 @@
DIST pytorch-1.13.1.tar.gz 108279745 BLAKE2B
75de03b74dfdaf8d8fb5ea743fcc0c1b0e408a714ad4160c487921220a7b1755e5fa6e587e6bbc8c9f34dd75e096d2e6dd69c80d24821835fff6c833314434d3
SHA512
f16f89d027efade11d057245cad5b69a390e88b458398310ae30de2dbff7c8fd7f1165be7b8da7ea989c81ac3f5a66c5cb9050610e441a97c83fb8aa28c0bd62
-DIST pytorch-2.0.0.tar.gz 111327292 BLAKE2B
6d593a975c0ade714f0b189f7e3c4ff704b9a9a2377b5e441a9cefc202fa22779966d08948e63671912c6ea5a0eee124042155f4f57a654db34e19e42f013cc9
SHA512
4dd76160711c0d87f3026c8b7fa3ed149dd86b8ac0ee9ecea0eaf80d2e6ce8c29368392e77b9466d90b60634087b462b782495997a5d33367cc8ca9fe14c8a14
DIST pytorch-2.0.1.tar.gz 111335778 BLAKE2B
7a10cc2b2d5e2422aef7e060a0c3a62ca5c7460c6e0b9becade9b98939501975c74ed5a175a653731f43ca824d2c9bd31f41d1f633c2b139779ab23d5331e9ce
SHA512
2309a22b3be3ccdb36d8d9781a59a7bdcc2fdb8d95ada205702ec77862480f0cbb12cd5d6b8cd3114d01a6e33b7743d0fe9de93debf37138ca5c14403cdb0c43
-DIST pytorch-2.1.1.tar.gz 116317162 BLAKE2B
d9819256cba0b9951aabe95d86fb135e97d8bafa2c010d13162cd9b3373ca75f20d218e31279ace41981f3f76308721c522f9e53745a1ff9e6386fa10634f9ad
SHA512
31b36e7732ee086ae7565a3811ab2d1b2869e79057bea7a4ffc4a3c95c544757e656a6d2289ee11fe7508828aca144e4220ef1e9ab1878e075e1259cf6ff9ca4
DIST pytorch-2.1.2.tar.gz 116316469 BLAKE2B
c5a55ee264bc3477d3556ba6376b5591117e992e56e0dd0c9ba93d12526e2727f7840f6f1e0730a38223b6492c9556840c4ebf22ffd220e97225c2abff303747
SHA512
a8961d78ad785b13c959a0612563a60e0de17a7c8bb9822ddea9a24072796354d07e81c47b6cc8761b21a6448845b088cf80e1661d9e889b0ed5474d3dc76756
diff --git a/sci-libs/caffe2/caffe2-2.0.0-r5.ebuild
b/sci-libs/caffe2/caffe2-2.0.0-r5.ebuild
deleted file mode 100644
index 425446a8564d..
--- a/sci-libs/caffe2/caffe2-2.0.0-r5.ebuild
+++ /dev/null
@@ -1,198 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit python-single-r1 cmake cuda flag-o-matic
-
-MYPN=pytorch
-MYP=${MYPN}-${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"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="cuda distributed fbgemm ffmpeg gloo mpi nnpack +numpy opencl opencv
openmp qnnpack tensorpipe xnnpack"
-RESTRICT="test"
-REQUIRED_USE="
- ${PYTHON_REQUIRED_USE}
- ffmpeg? ( opencv )
- mpi? ( distributed )
- tensorpipe? ( distributed )
- gloo? ( distributed )
-" # ?? ( cuda rocm )
-
-# CUDA 12 not supported yet: https://github.com/pytorch/pytorch/issues/91122
-RDEPEND="
- ${PYTHON_DEPS}
- dev-cpp/gflags:=
- >=dev-cpp/glog-0.5.0
- dev-libs/cpuinfo
- dev-libs/libfmt
- dev-libs/protobuf:=
- dev-libs/pthreadpool
- dev-libs/sleef
- sci-libs/lapack
- >=sci-libs/onnx-1.12.0
- =sci-libs/XNNPACK-2022.12.22 )
-"
-DEPEND="
- ${RDEPEND}
- dev-cpp/eigen
- cuda? ( dev-libs/cutlass )
- dev-libs/psimd
- dev-libs/FP16
- dev-libs/FXdiv
- dev-libs/pocketfft
- dev-libs/flatbuffers
- sci-libs/kineto
- $(python_gen_cond_dep '
- dev-python/pyyaml[${PYTHON_USEDEP}]
- dev-python/pybind11[${PYTHON_USEDEP}]
- ')
-"
-
-S="${WORKDIR}"/${MYP}
-
-PATCHES=(
- "${FILESDIR}"/${P}-gentoo.patch
- "${FILESDIR}"/${PN}-1.13.0-install-dirs.patch
- "${FILESDIR}"/${PN}-1.12.0-glog-0.6.0.patch
- "${FILESDIR}"/${PN}-1.13.1-tensorpipe.patch
- "${FILESDIR}"/${P}-gcc13.patch
- "${FILESDIR}"/${P}-cudnn_include_fix.patch
-)
-
-src_prepare() {
- filter-lto #bug 862672
- sed -i \
- -e "/third_party\/gloo/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
-}
-
-src_configure() {
- if use cuda && [[ -z ${TORCH_CUDA_ARCH_LIST} ]]; then
- ewarn "WARNING: caffe2 is being built with its default CUDA
[gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/files/, sci-libs/caffe2/, profiles/features/musl/
commit: 53a5bc45ce81fd5e1cc56536f408d1eea1c7f537
Author: Sv. Lockal gmail com>
AuthorDate: Sun Dec 31 15:07:04 2023 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Sun Dec 31 16:23:21 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53a5bc45
sci-libs/caffe2: add support of blas/lapack providers, including mkl
Closes: https://bugs.gentoo.org/921129
Signed-off-by: Sv. Lockal gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/34584
Signed-off-by: Alfredo Tupone gentoo.org>
profiles/features/musl/package.use.mask | 3 +++
.../{caffe2-2.1.2.ebuild => caffe2-2.1.2-r1.ebuild} | 19 +--
.../caffe2/files/caffe2-2.1.2-fix-openmp-link.patch | 15 +++
sci-libs/caffe2/files/caffe2-2.1.2-fix-rpath.patch| 12
sci-libs/caffe2/metadata.xml | 1 +
5 files changed, 44 insertions(+), 6 deletions(-)
diff --git a/profiles/features/musl/package.use.mask
b/profiles/features/musl/package.use.mask
index c9b7d23aaca6..3fa72fa2eaa5 100644
--- a/profiles/features/musl/package.use.mask
+++ b/profiles/features/musl/package.use.mask
@@ -142,3 +142,6 @@ app-shells/bash mem-scramble
# static linking works with musl
app-shells/mksh -static
+
+# linked against glibc
+sci-libs/caffe2 mkl
diff --git a/sci-libs/caffe2/caffe2-2.1.2.ebuild
b/sci-libs/caffe2/caffe2-2.1.2-r1.ebuild
similarity index 93%
rename from sci-libs/caffe2/caffe2-2.1.2.ebuild
rename to sci-libs/caffe2/caffe2-2.1.2-r1.ebuild
index aca834318aa5..56ae2472b0fb 100644
--- a/sci-libs/caffe2/caffe2-2.1.2.ebuild
+++ b/sci-libs/caffe2/caffe2-2.1.2-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{9..12} )
inherit python-single-r1 cmake cuda flag-o-matic prefix
MYPN=pytorch
@@ -17,7 +17,7 @@
SRC_URI="https://github.com/pytorch/${MYPN}/archive/refs/tags/v${PV}.tar.gz
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64"
-IUSE="cuda distributed fbgemm ffmpeg gloo mpi nnpack +numpy opencl opencv
openmp qnnpack tensorpipe xnnpack"
+IUSE="cuda distributed fbgemm ffmpeg gloo mkl mpi nnpack +numpy opencl opencv
openmp qnnpack tensorpipe xnnpack"
RESTRICT="test"
REQUIRED_USE="
${PYTHON_REQUIRED_USE}
@@ -38,7 +38,7 @@ RDEPEND="
dev-libs/protobuf:=
dev-libs/pthreadpool
dev-libs/sleef
- sci-libs/lapack
+ virtual/lapack
>=sci-libs/onnx-1.12.0
builds
+https://github.com/pytorch/pytorch/issues/116576
+--- a/caffe2/CMakeLists.txt
b/caffe2/CMakeLists.txt
+@@ -1575,6 +1575,10 @@ if(BUILD_SHARED_LIBS)
+ target_link_libraries(torch_global_deps TBB::tbb)
+ endif()
+
++ if(USE_OPENMP)
++target_link_libraries(torch_global_deps OpenMP::OpenMP_CXX)
++ endif()
++
+ install(TARGETS torch_global_deps DESTINATION "${TORCH_INSTALL_LIB_DIR}")
+ endif()
+
diff --git a/sci-libs/caffe2/files/caffe2-2.1.2-fix-rpath.patch
b/sci-libs/caffe2/files/caffe2-2.1.2-fix-rpath.patch
new file mode 100644
index ..731227fa25ee
--- /dev/null
+++ b/sci-libs/caffe2/files/caffe2-2.1.2-fix-rpath.patch
@@ -0,0 +1,12 @@
+Unset rpath to support blas-lapack-switch
+Bug: https://bugs.gentoo.org/921129
+--- a/cmake/Dependencies.cmake
b/cmake/Dependencies.cmake
+@@ -10,7 +10,6 @@ endif(APPLE)
+ set(CMAKE_SKIP_BUILD_RPATH FALSE)
+ # Don't use the install-rpath during the build phase
+ set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
+-set(CMAKE_INSTALL_RPATH "${_rpath_portable_origin}")
+ # Automatically add all linked folders that are NOT in the build directory to
+ # the rpath (per library?)
+ set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
diff --git a/sci-libs/caffe2/metadata.xml b/sci-libs/caffe2/metadata.xml
index 3b4ad7f29919..eac4c942a88d 100644
--- a/sci-libs/caffe2/metadata.xml
+++ b/sci-libs/caffe2/metadata.xml
@@ -21,6 +21,7 @@
Use QNNPACK
Use tensorpipe
Use XNNPACK
+ Use sci-libs/mkl for blas, lapack
and sparse blas routines
pytorch/pytorch
[gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
commit: fa5c4f75a2696331b2441f9e110f87c85b5fbbb6 Author: Andrew Udvare gmail com> AuthorDate: Fri Dec 29 08:11:37 2023 + Commit: Alfredo Tupone gentoo org> CommitDate: Fri Dec 29 09:53:00 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa5c4f75 sci-libs/caffe2: restrict sci-libs/onnx version Signed-off-by: Andrew Udvare gmail.com> Closes: https://github.com/gentoo/gentoo/pull/34528 Signed-off-by: Alfredo Tupone gentoo.org> sci-libs/caffe2/caffe2-1.13.1-r6.ebuild | 1 + sci-libs/caffe2/caffe2-2.0.0-r5.ebuild | 1 + sci-libs/caffe2/caffe2-2.0.1-r5.ebuild | 1 + sci-libs/caffe2/caffe2-2.1.1-r6.ebuild | 1 + sci-libs/caffe2/caffe2-2.1.2.ebuild | 1 + 5 files changed, 5 insertions(+) diff --git a/sci-libs/caffe2/caffe2-1.13.1-r6.ebuild b/sci-libs/caffe2/caffe2-1.13.1-r6.ebuild index e0d99129a9ac..1a1184178b12 100644 --- a/sci-libs/caffe2/caffe2-1.13.1-r6.ebuild +++ b/sci-libs/caffe2/caffe2-1.13.1-r6.ebuild @@ -39,6 +39,7 @@ RDEPEND=" dev-libs/sleef sci-libs/lapack >=sci-libs/onnx-1.12.0 + =sci-libs/onnx-1.12.0 + =sci-libs/onnx-1.12.0 +
[gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
commit: 1edd7df00301f5d108077e9c93daaa11668784eb
Author: Alfredo Tupone gentoo org>
AuthorDate: Tue Dec 26 21:03:43 2023 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Tue Dec 26 22:13:51 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1edd7df0
sci-libs/caffe2: add 2.1.2
Signed-off-by: Alfredo Tupone gentoo.org>
sci-libs/caffe2/Manifest| 1 +
sci-libs/caffe2/caffe2-2.1.2.ebuild | 219
2 files changed, 220 insertions(+)
diff --git a/sci-libs/caffe2/Manifest b/sci-libs/caffe2/Manifest
index d51cccdc3c37..2fc8f8663e91 100644
--- a/sci-libs/caffe2/Manifest
+++ b/sci-libs/caffe2/Manifest
@@ -2,3 +2,4 @@ DIST pytorch-1.13.1.tar.gz 108279745 BLAKE2B
75de03b74dfdaf8d8fb5ea743fcc0c1b0e4
DIST pytorch-2.0.0.tar.gz 111327292 BLAKE2B
6d593a975c0ade714f0b189f7e3c4ff704b9a9a2377b5e441a9cefc202fa22779966d08948e63671912c6ea5a0eee124042155f4f57a654db34e19e42f013cc9
SHA512
4dd76160711c0d87f3026c8b7fa3ed149dd86b8ac0ee9ecea0eaf80d2e6ce8c29368392e77b9466d90b60634087b462b782495997a5d33367cc8ca9fe14c8a14
DIST pytorch-2.0.1.tar.gz 111335778 BLAKE2B
7a10cc2b2d5e2422aef7e060a0c3a62ca5c7460c6e0b9becade9b98939501975c74ed5a175a653731f43ca824d2c9bd31f41d1f633c2b139779ab23d5331e9ce
SHA512
2309a22b3be3ccdb36d8d9781a59a7bdcc2fdb8d95ada205702ec77862480f0cbb12cd5d6b8cd3114d01a6e33b7743d0fe9de93debf37138ca5c14403cdb0c43
DIST pytorch-2.1.1.tar.gz 116317162 BLAKE2B
d9819256cba0b9951aabe95d86fb135e97d8bafa2c010d13162cd9b3373ca75f20d218e31279ace41981f3f76308721c522f9e53745a1ff9e6386fa10634f9ad
SHA512
31b36e7732ee086ae7565a3811ab2d1b2869e79057bea7a4ffc4a3c95c544757e656a6d2289ee11fe7508828aca144e4220ef1e9ab1878e075e1259cf6ff9ca4
+DIST pytorch-2.1.2.tar.gz 116316469 BLAKE2B
c5a55ee264bc3477d3556ba6376b5591117e992e56e0dd0c9ba93d12526e2727f7840f6f1e0730a38223b6492c9556840c4ebf22ffd220e97225c2abff303747
SHA512
a8961d78ad785b13c959a0612563a60e0de17a7c8bb9822ddea9a24072796354d07e81c47b6cc8761b21a6448845b088cf80e1661d9e889b0ed5474d3dc76756
diff --git a/sci-libs/caffe2/caffe2-2.1.2.ebuild
b/sci-libs/caffe2/caffe2-2.1.2.ebuild
new file mode 100644
index ..be2bdb80c02f
--- /dev/null
+++ b/sci-libs/caffe2/caffe2-2.1.2.ebuild
@@ -0,0 +1,219 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit python-single-r1 cmake cuda flag-o-matic prefix
+
+MYPN=pytorch
+MYP=${MYPN}-${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"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="cuda distributed fbgemm ffmpeg gloo mpi nnpack +numpy opencl opencv
openmp qnnpack tensorpipe xnnpack"
+RESTRICT="test"
+REQUIRED_USE="
+ ${PYTHON_REQUIRED_USE}
+ ffmpeg? ( opencv )
+ mpi? ( distributed )
+ tensorpipe? ( distributed )
+ distributed? ( tensorpipe )
+ gloo? ( distributed )
+" # ?? ( cuda rocm )
+
+# CUDA 12 not supported yet: https://github.com/pytorch/pytorch/issues/91122
+RDEPEND="
+ ${PYTHON_DEPS}
+ dev-cpp/gflags:=
+ >=dev-cpp/glog-0.5.0
+ dev-libs/cpuinfo
+ dev-libs/libfmt
+ dev-libs/protobuf:=
+ dev-libs/pthreadpool
+ dev-libs/sleef
+ sci-libs/lapack
+ >=sci-libs/onnx-1.12.0
+ sci-libs/foxi
+ cuda? (
+ =dev-libs/cudnn-8*
+ >=dev-libs/cudnn-frontend-0.9.2:0/8
+ dev-util/nvidia-cuda-toolkit:=[profiler]
+ )
+ fbgemm? ( >=dev-libs/FBGEMM-2023.11.02 )
+ ffmpeg? ( media-video/ffmpeg:= )
+ gloo? ( sci-libs/gloo[cuda?] )
+ mpi? ( virtual/mpi )
+ nnpack? ( sci-libs/NNPACK )
+ numpy? ( $(python_gen_cond_dep '
+ dev-python/numpy[${PYTHON_USEDEP}]
+ ') )
+ opencl? ( virtual/opencl )
+ opencv? ( media-libs/opencv:= )
+ qnnpack? ( sci-libs/QNNPACK )
+ tensorpipe? ( sci-libs/tensorpipe[cuda?] )
+ xnnpack? ( >=sci-libs/XNNPACK-2022.12.22 )
+"
+DEPEND="
+ ${RDEPEND}
+ dev-cpp/eigen
+ cuda? ( >=dev-libs/cutlass-3.1.0 )
+ dev-libs/psimd
+ dev-libs/FP16
+ dev-libs/FXdiv
+ dev-libs/pocketfft
+ dev-libs/flatbuffers
+ >=sci-libs/kineto-0.4.0_p20231031
+ $(python_gen_cond_dep '
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ dev-python/pybind11[${PYTHON_USEDEP}]
+ ')
+"
+
+S="${WORKDIR}"/${MYP}
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.1.1-gentoo.patch
+ "${FILESDIR}"/${PN}-1.13.0-install-dirs.patch
+ "${FILESDIR}"/${PN}-1.12.0-glog-0.6.0.patch
+ "${FILESDIR}"/${PN}-1.13.1-tensorpipe.patch
+ "${FILESDIR}"/${PN}-2.0.0-gcc13.patch
+ "${FILESDIR}"/${PN}-2.0.0-cudnn_include_fix.patch
+ "${FILESDIR}"/${PN}-2.1.1-cudaExtra.patch
+)
+
+src_prepare() {
+
[gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
commit: 60f42ca58ef409f2a08c17e6c62fd53b4cc5b87d
Author: Alfredo Tupone gentoo org>
AuthorDate: Sat Dec 23 16:04:31 2023 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Sat Dec 23 16:05:09 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60f42ca5
sci-libs/caffe2: fix nvfuser python module
Bug: https://bugs.gentoo.org/914572
Signed-off-by: Alfredo Tupone gentoo.org>
sci-libs/caffe2/{caffe2-2.1.1-r5.ebuild => caffe2-2.1.1-r6.ebuild} | 1 +
1 file changed, 1 insertion(+)
diff --git a/sci-libs/caffe2/caffe2-2.1.1-r5.ebuild
b/sci-libs/caffe2/caffe2-2.1.1-r6.ebuild
similarity index 98%
rename from sci-libs/caffe2/caffe2-2.1.1-r5.ebuild
rename to sci-libs/caffe2/caffe2-2.1.1-r6.ebuild
index 1dc4f2a32587..b22e5e52ead5 100644
--- a/sci-libs/caffe2/caffe2-2.1.1-r5.ebuild
+++ b/sci-libs/caffe2/caffe2-2.1.1-r6.ebuild
@@ -205,6 +205,7 @@ src_install() {
mv "${ED}"/usr/include/torch python/torch/include || die
if use cuda; then
mv "${ED}${S}"/nvfuser python/nvfuser || die
+ mv "${ED}"/usr/$(get_libdir)/nvfuser.so python/nvfuser/_C.so ||
die
fi
rm -rf "${ED}${S}"/test
rm -rf "${ED}${S}"/third_party
[gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
commit: 2f877a5bb3dd0a90848a2656cae80d5fcdbf1960
Author: Alfredo Tupone gentoo org>
AuthorDate: Sat Dec 23 08:23:06 2023 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Sat Dec 23 08:24:00 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f877a5b
sci-libs/caffe2: missing an important change
Closes: https://bugs.gentoo.org/920549
Signed-off-by: Alfredo Tupone gentoo.org>
sci-libs/caffe2/{caffe2-2.1.1-r4.ebuild => caffe2-2.1.1-r5.ebuild} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sci-libs/caffe2/caffe2-2.1.1-r4.ebuild
b/sci-libs/caffe2/caffe2-2.1.1-r5.ebuild
similarity index 98%
rename from sci-libs/caffe2/caffe2-2.1.1-r4.ebuild
rename to sci-libs/caffe2/caffe2-2.1.1-r5.ebuild
index ac5b4024c28f..1dc4f2a32587 100644
--- a/sci-libs/caffe2/caffe2-2.1.1-r4.ebuild
+++ b/sci-libs/caffe2/caffe2-2.1.1-r5.ebuild
@@ -206,8 +206,8 @@ src_install() {
if use cuda; then
mv "${ED}${S}"/nvfuser python/nvfuser || die
fi
- rm -r "${ED}${S}"/test || die
- rm -r "${ED}${S}"/third_party || die
+ rm -rf "${ED}${S}"/test
+ rm -rf "${ED}${S}"/third_party
cp torch/version.py python/torch/ || die
python_domodule python/caffe2
python_domodule python/torch
[gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
commit: 9623a3e98fc0f8e3658488d31f0708505505fa89
Author: Alfredo Tupone gentoo org>
AuthorDate: Fri Dec 22 22:26:06 2023 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Fri Dec 22 22:26:53 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9623a3e9
sci-libs/caffe2: fix install without cuda
Closes: https://bugs.gentoo.org/920549
Signed-off-by: Alfredo Tupone gentoo.org>
sci-libs/caffe2/{caffe2-2.1.1-r3.ebuild => caffe2-2.1.1-r4.ebuild} | 3 +++
1 file changed, 3 insertions(+)
diff --git a/sci-libs/caffe2/caffe2-2.1.1-r3.ebuild
b/sci-libs/caffe2/caffe2-2.1.1-r4.ebuild
similarity index 99%
rename from sci-libs/caffe2/caffe2-2.1.1-r3.ebuild
rename to sci-libs/caffe2/caffe2-2.1.1-r4.ebuild
index d2022d69585d..ac5b4024c28f 100644
--- a/sci-libs/caffe2/caffe2-2.1.1-r3.ebuild
+++ b/sci-libs/caffe2/caffe2-2.1.1-r4.ebuild
@@ -211,5 +211,8 @@ src_install() {
cp torch/version.py python/torch/ || die
python_domodule python/caffe2
python_domodule python/torch
+ if use cuda; then
+ python_domodule python/nvfuser
+ fi
find "${ED}" -empty -delete
}
[gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
commit: 60b645821036cba6aecb772566881d9df6f8786e
Author: Alfredo Tupone gentoo org>
AuthorDate: Sun Dec 17 09:30:11 2023 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Sun Dec 17 09:30:11 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60b64582
sci-libs/caffe2: enable nvidia-cuda-toolkit-12
Closes: https://bugs.gentoo.org/917585
Signed-off-by: Alfredo Tupone gentoo.org>
sci-libs/caffe2/{caffe2-2.1.1-r2.ebuild => caffe2-2.1.1-r3.ebuild} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-libs/caffe2/caffe2-2.1.1-r2.ebuild
b/sci-libs/caffe2/caffe2-2.1.1-r3.ebuild
similarity index 99%
rename from sci-libs/caffe2/caffe2-2.1.1-r2.ebuild
rename to sci-libs/caffe2/caffe2-2.1.1-r3.ebuild
index 714b5477c38f..d2022d69585d 100644
--- a/sci-libs/caffe2/caffe2-2.1.1-r2.ebuild
+++ b/sci-libs/caffe2/caffe2-2.1.1-r3.ebuild
@@ -44,7 +44,7 @@ RDEPEND="
cuda? (
=dev-libs/cudnn-8*
>=dev-libs/cudnn-frontend-0.9.2:0/8
- =dev-libs/FBGEMM-2023.11.02 )
ffmpeg? ( media-video/ffmpeg:= )
[gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
commit: 52575e06cb70d8f89dfbcfa3b40c4b216b4f35db
Author: Alfredo Tupone gentoo org>
AuthorDate: Thu Dec 14 18:29:37 2023 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Thu Dec 14 18:30:24 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52575e06
sci-libs/caffe2: adj deps
Closes: https://bugs.gentoo.org/919744
Signed-off-by: Alfredo Tupone gentoo.org>
.../caffe2/{caffe2-2.1.1-r1.ebuild => caffe2-2.1.1-r2.ebuild} | 10 ++
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/sci-libs/caffe2/caffe2-2.1.1-r1.ebuild
b/sci-libs/caffe2/caffe2-2.1.1-r2.ebuild
similarity index 96%
rename from sci-libs/caffe2/caffe2-2.1.1-r1.ebuild
rename to sci-libs/caffe2/caffe2-2.1.1-r2.ebuild
index f5aafac33607..714b5477c38f 100644
--- a/sci-libs/caffe2/caffe2-2.1.1-r1.ebuild
+++ b/sci-libs/caffe2/caffe2-2.1.1-r2.ebuild
@@ -43,10 +43,10 @@ RDEPEND="
sci-libs/foxi
cuda? (
=dev-libs/cudnn-8*
- dev-libs/cudnn-frontend:0/8
+ >=dev-libs/cudnn-frontend-0.9.2:0/8
=dev-libs/FBGEMM-2023.11.02 )
ffmpeg? ( media-video/ffmpeg:= )
gloo? ( sci-libs/gloo[cuda?] )
mpi? ( virtual/mpi )
@@ -63,7 +63,7 @@ RDEPEND="
DEPEND="
${RDEPEND}
dev-cpp/eigen
- cuda? ( dev-libs/cutlass )
+ cuda? ( >=dev-libs/cutlass-3.1.0 )
dev-libs/psimd
dev-libs/FP16
dev-libs/FXdiv
@@ -203,7 +203,9 @@ src_install() {
mkdir -p python/torch/include || die
mv "${ED}"/usr/lib/python*/site-packages/caffe2 python/ || die
mv "${ED}"/usr/include/torch python/torch/include || die
- mv "${ED}${S}"/nvfuser python/nvfuser || die
+ if use cuda; then
+ mv "${ED}${S}"/nvfuser python/nvfuser || die
+ fi
rm -r "${ED}${S}"/test || die
rm -r "${ED}${S}"/third_party || die
cp torch/version.py python/torch/ || die
[gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
commit: 9b75f95a7b2dcec84de8837521815f23bdf93c68
Author: Alfredo Tupone gentoo org>
AuthorDate: Sun Dec 10 10:30:28 2023 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Sun Dec 10 10:31:28 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b75f95a
sci-libs/caffe2: nvfuser module belongs to pytorch
Signed-off-by: Alfredo Tupone gentoo.org>
sci-libs/caffe2/{caffe2-2.1.1.ebuild => caffe2-2.1.1-r1.ebuild} | 1 -
1 file changed, 1 deletion(-)
diff --git a/sci-libs/caffe2/caffe2-2.1.1.ebuild
b/sci-libs/caffe2/caffe2-2.1.1-r1.ebuild
similarity index 99%
rename from sci-libs/caffe2/caffe2-2.1.1.ebuild
rename to sci-libs/caffe2/caffe2-2.1.1-r1.ebuild
index 65c5c2831826..f5aafac33607 100644
--- a/sci-libs/caffe2/caffe2-2.1.1.ebuild
+++ b/sci-libs/caffe2/caffe2-2.1.1-r1.ebuild
@@ -209,6 +209,5 @@ src_install() {
cp torch/version.py python/torch/ || die
python_domodule python/caffe2
python_domodule python/torch
- python_domodule python/nvfuser
find "${ED}" -empty -delete
}
[gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
commit: a30ecc1b69628e20faa989943ff1b0dda32d9d69
Author: Alfredo Tupone gentoo org>
AuthorDate: Wed Dec 6 19:48:46 2023 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Wed Dec 6 19:49:16 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a30ecc1b
sci-libs/caffe2: install nvfuser python module
Bug: https://bugs.gentoo.org/914572
Signed-off-by: Alfredo Tupone gentoo.org>
sci-libs/caffe2/caffe2-2.1.1.ebuild | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/sci-libs/caffe2/caffe2-2.1.1.ebuild
b/sci-libs/caffe2/caffe2-2.1.1.ebuild
index e5e9a71069cd..65c5c2831826 100644
--- a/sci-libs/caffe2/caffe2-2.1.1.ebuild
+++ b/sci-libs/caffe2/caffe2-2.1.1.ebuild
@@ -135,7 +135,6 @@ src_configure() {
-DUSE_CCACHE=OFF
-DUSE_CUDA=$(usex cuda)
-DUSE_CUDNN=$(usex cuda)
- -DUSE_FAST_NVCC=$(usex cuda)
-DTORCH_CUDA_ARCH_LIST="${TORCH_CUDA_ARCH_LIST:-3.5 7.0}"
-DBUILD_NVFUSER=$(usex cuda)
-DUSE_DISTRIBUTED=$(usex distributed)
@@ -204,7 +203,12 @@ src_install() {
mkdir -p python/torch/include || die
mv "${ED}"/usr/lib/python*/site-packages/caffe2 python/ || die
mv "${ED}"/usr/include/torch python/torch/include || die
+ mv "${ED}${S}"/nvfuser python/nvfuser || die
+ rm -r "${ED}${S}"/test || die
+ rm -r "${ED}${S}"/third_party || die
cp torch/version.py python/torch/ || die
python_domodule python/caffe2
python_domodule python/torch
+ python_domodule python/nvfuser
+ find "${ED}" -empty -delete
}
[gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/files/, sci-libs/caffe2/
commit: 783ebfe477601f3a416a1bf7f7f0daf5b0732c5c
Author: Alfredo Tupone gentoo org>
AuthorDate: Wed Dec 6 11:55:09 2023 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Wed Dec 6 11:55:25 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=783ebfe4
sci-libs/caffe2: add 2.1.1
Signed-off-by: Alfredo Tupone gentoo.org>
sci-libs/caffe2/Manifest | 1 +
sci-libs/caffe2/caffe2-2.1.1.ebuild| 210 +
sci-libs/caffe2/files/caffe2-2.1.1-cudaExtra.patch | 28 +++
sci-libs/caffe2/files/caffe2-2.1.1-gentoo.patch| 188 ++
4 files changed, 427 insertions(+)
diff --git a/sci-libs/caffe2/Manifest b/sci-libs/caffe2/Manifest
index 0ee75499ccbe..d51cccdc3c37 100644
--- a/sci-libs/caffe2/Manifest
+++ b/sci-libs/caffe2/Manifest
@@ -1,3 +1,4 @@
DIST pytorch-1.13.1.tar.gz 108279745 BLAKE2B
75de03b74dfdaf8d8fb5ea743fcc0c1b0e408a714ad4160c487921220a7b1755e5fa6e587e6bbc8c9f34dd75e096d2e6dd69c80d24821835fff6c833314434d3
SHA512
f16f89d027efade11d057245cad5b69a390e88b458398310ae30de2dbff7c8fd7f1165be7b8da7ea989c81ac3f5a66c5cb9050610e441a97c83fb8aa28c0bd62
DIST pytorch-2.0.0.tar.gz 111327292 BLAKE2B
6d593a975c0ade714f0b189f7e3c4ff704b9a9a2377b5e441a9cefc202fa22779966d08948e63671912c6ea5a0eee124042155f4f57a654db34e19e42f013cc9
SHA512
4dd76160711c0d87f3026c8b7fa3ed149dd86b8ac0ee9ecea0eaf80d2e6ce8c29368392e77b9466d90b60634087b462b782495997a5d33367cc8ca9fe14c8a14
DIST pytorch-2.0.1.tar.gz 111335778 BLAKE2B
7a10cc2b2d5e2422aef7e060a0c3a62ca5c7460c6e0b9becade9b98939501975c74ed5a175a653731f43ca824d2c9bd31f41d1f633c2b139779ab23d5331e9ce
SHA512
2309a22b3be3ccdb36d8d9781a59a7bdcc2fdb8d95ada205702ec77862480f0cbb12cd5d6b8cd3114d01a6e33b7743d0fe9de93debf37138ca5c14403cdb0c43
+DIST pytorch-2.1.1.tar.gz 116317162 BLAKE2B
d9819256cba0b9951aabe95d86fb135e97d8bafa2c010d13162cd9b3373ca75f20d218e31279ace41981f3f76308721c522f9e53745a1ff9e6386fa10634f9ad
SHA512
31b36e7732ee086ae7565a3811ab2d1b2869e79057bea7a4ffc4a3c95c544757e656a6d2289ee11fe7508828aca144e4220ef1e9ab1878e075e1259cf6ff9ca4
diff --git a/sci-libs/caffe2/caffe2-2.1.1.ebuild
b/sci-libs/caffe2/caffe2-2.1.1.ebuild
new file mode 100644
index ..e5e9a71069cd
--- /dev/null
+++ b/sci-libs/caffe2/caffe2-2.1.1.ebuild
@@ -0,0 +1,210 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit python-single-r1 cmake cuda flag-o-matic prefix
+
+MYPN=pytorch
+MYP=${MYPN}-${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"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="cuda distributed fbgemm ffmpeg gloo mpi nnpack +numpy opencl opencv
openmp qnnpack tensorpipe xnnpack"
+RESTRICT="test"
+REQUIRED_USE="
+ ${PYTHON_REQUIRED_USE}
+ ffmpeg? ( opencv )
+ mpi? ( distributed )
+ tensorpipe? ( distributed )
+ distributed? ( tensorpipe )
+ gloo? ( distributed )
+" # ?? ( cuda rocm )
+
+# CUDA 12 not supported yet: https://github.com/pytorch/pytorch/issues/91122
+RDEPEND="
+ ${PYTHON_DEPS}
+ dev-cpp/gflags:=
+ >=dev-cpp/glog-0.5.0
+ dev-libs/cpuinfo
+ dev-libs/libfmt
+ dev-libs/protobuf:=
+ dev-libs/pthreadpool
+ dev-libs/sleef
+ sci-libs/lapack
+ >=sci-libs/onnx-1.12.0
+ sci-libs/foxi
+ cuda? (
+ =dev-libs/cudnn-8*
+ dev-libs/cudnn-frontend:0/8
+ =sci-libs/XNNPACK-2022.12.22 )
+"
+DEPEND="
+ ${RDEPEND}
+ dev-cpp/eigen
+ cuda? ( dev-libs/cutlass )
+ dev-libs/psimd
+ dev-libs/FP16
+ dev-libs/FXdiv
+ dev-libs/pocketfft
+ dev-libs/flatbuffers
+ >=sci-libs/kineto-0.4.0_p20231031
+ $(python_gen_cond_dep '
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ dev-python/pybind11[${PYTHON_USEDEP}]
+ ')
+"
+
+S="${WORKDIR}"/${MYP}
+
+PATCHES=(
+ "${FILESDIR}"/${P}-gentoo.patch
+ "${FILESDIR}"/${PN}-1.13.0-install-dirs.patch
+ "${FILESDIR}"/${PN}-1.12.0-glog-0.6.0.patch
+ "${FILESDIR}"/${PN}-1.13.1-tensorpipe.patch
+ "${FILESDIR}"/${PN}-2.0.0-gcc13.patch
+ "${FILESDIR}"/${PN}-2.0.0-cudnn_include_fix.patch
+ "${FILESDIR}"/${P}-cudaExtra.patch
+)
+
+src_prepare() {
+ filter-lto #bug 862672
+ sed -i \
+ -e "/third_party\/gloo/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 \
+
[gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
commit: 564efa91f7fbb739529a10bebe6d17be740cb4d5
Author: Alfredo Tupone gentoo org>
AuthorDate: Fri Dec 1 05:54:22 2023 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Fri Dec 1 05:54:22 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=564efa91
sci-libs/caffe2: drop 2.0.1-r4
Signed-off-by: Alfredo Tupone gentoo.org>
sci-libs/caffe2/caffe2-2.0.1-r4.ebuild | 212 -
1 file changed, 212 deletions(-)
diff --git a/sci-libs/caffe2/caffe2-2.0.1-r4.ebuild
b/sci-libs/caffe2/caffe2-2.0.1-r4.ebuild
deleted file mode 100644
index 67ab76e8ed76..
--- a/sci-libs/caffe2/caffe2-2.0.1-r4.ebuild
+++ /dev/null
@@ -1,212 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit python-single-r1 cmake cuda flag-o-matic prefix
-
-MYPN=pytorch
-MYP=${MYPN}-${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"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="cuda distributed fbgemm ffmpeg gloo mpi nnpack +numpy opencl opencv
openmp qnnpack tensorpipe xnnpack"
-RESTRICT="test"
-REQUIRED_USE="
- ${PYTHON_REQUIRED_USE}
- ffmpeg? ( opencv )
- mpi? ( distributed )
- tensorpipe? ( distributed )
- distributed? ( tensorpipe )
- gloo? ( distributed )
-" # ?? ( cuda rocm )
-
-# CUDA 12 not supported yet: https://github.com/pytorch/pytorch/issues/91122
-RDEPEND="
- ${PYTHON_DEPS}
- dev-cpp/gflags:=
- >=dev-cpp/glog-0.5.0
- dev-libs/cpuinfo
- dev-libs/libfmt
- dev-libs/protobuf:=
- dev-libs/pthreadpool
- dev-libs/sleef
- sci-libs/lapack
- >=sci-libs/onnx-1.12.0
- sci-libs/foxi
- cuda? (
- =dev-libs/cudnn-8*
- dev-libs/cudnn-frontend:0/8
- =sci-libs/XNNPACK-2022.12.22 )
-"
-DEPEND="
- ${RDEPEND}
- dev-cpp/eigen
- cuda? ( dev-libs/cutlass )
- dev-libs/psimd
- dev-libs/FP16
- dev-libs/FXdiv
- dev-libs/pocketfft
- dev-libs/flatbuffers
- sci-libs/kineto
- $(python_gen_cond_dep '
- dev-python/pyyaml[${PYTHON_USEDEP}]
- dev-python/pybind11[${PYTHON_USEDEP}]
- ')
-"
-
-S="${WORKDIR}"/${MYP}
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.0.0-gentoo.patch
- "${FILESDIR}"/${PN}-1.13.0-install-dirs.patch
- "${FILESDIR}"/${PN}-1.12.0-glog-0.6.0.patch
- "${FILESDIR}"/${PN}-1.13.1-tensorpipe.patch
- "${FILESDIR}"/${PN}-2.0.0-gcc13.patch
- "${FILESDIR}"/${PN}-2.0.0-cudnn_include_fix.patch
-)
-
-src_prepare() {
- filter-lto #bug 862672
- sed -i \
- -e "/third_party\/gloo/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
-}
-
-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
- -DBUILD_SHARED_LIBS=ON
-
- -DUSE_CCACHE=OFF
- -DUSE_CUDA=$(usex cuda)
- -DUSE_CUDNN=$(usex cuda)
-
[gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/, sci-libs/caffe2/files/
commit: 6066231bec8d7a83aff48ff16eb28e44eadd6ef4
Author: Alfredo Tupone gentoo org>
AuthorDate: Fri Dec 1 05:52:18 2023 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Fri Dec 1 05:53:04 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6066231b
sci-libs/caffe2: install nvfuser and functorch files
Closes: https://bugs.gentoo.org/914572
Signed-off-by: Alfredo Tupone gentoo.org>
sci-libs/caffe2/caffe2-2.0.1-r5.ebuild | 210 +
sci-libs/caffe2/files/caffe2-2.0.1-cudaExtra.patch | 28 +++
2 files changed, 238 insertions(+)
diff --git a/sci-libs/caffe2/caffe2-2.0.1-r5.ebuild
b/sci-libs/caffe2/caffe2-2.0.1-r5.ebuild
new file mode 100644
index ..c062b38f1e86
--- /dev/null
+++ b/sci-libs/caffe2/caffe2-2.0.1-r5.ebuild
@@ -0,0 +1,210 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit python-single-r1 cmake cuda flag-o-matic prefix
+
+MYPN=pytorch
+MYP=${MYPN}-${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"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="cuda distributed fbgemm ffmpeg gloo mpi nnpack +numpy opencl opencv
openmp qnnpack tensorpipe xnnpack"
+RESTRICT="test"
+REQUIRED_USE="
+ ${PYTHON_REQUIRED_USE}
+ ffmpeg? ( opencv )
+ mpi? ( distributed )
+ tensorpipe? ( distributed )
+ distributed? ( tensorpipe )
+ gloo? ( distributed )
+" # ?? ( cuda rocm )
+
+# CUDA 12 not supported yet: https://github.com/pytorch/pytorch/issues/91122
+RDEPEND="
+ ${PYTHON_DEPS}
+ dev-cpp/gflags:=
+ >=dev-cpp/glog-0.5.0
+ dev-libs/cpuinfo
+ dev-libs/libfmt
+ dev-libs/protobuf:=
+ dev-libs/pthreadpool
+ dev-libs/sleef
+ sci-libs/lapack
+ >=sci-libs/onnx-1.12.0
+ sci-libs/foxi
+ cuda? (
+ =dev-libs/cudnn-8*
+ dev-libs/cudnn-frontend:0/8
+ =sci-libs/XNNPACK-2022.12.22 )
+"
+DEPEND="
+ ${RDEPEND}
+ dev-cpp/eigen
+ cuda? ( dev-libs/cutlass )
+ dev-libs/psimd
+ dev-libs/FP16
+ dev-libs/FXdiv
+ dev-libs/pocketfft
+ dev-libs/flatbuffers
+ sci-libs/kineto
+ $(python_gen_cond_dep '
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ dev-python/pybind11[${PYTHON_USEDEP}]
+ ')
+"
+
+S="${WORKDIR}"/${MYP}
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.0.0-gentoo.patch
+ "${FILESDIR}"/${PN}-1.13.0-install-dirs.patch
+ "${FILESDIR}"/${PN}-1.12.0-glog-0.6.0.patch
+ "${FILESDIR}"/${PN}-1.13.1-tensorpipe.patch
+ "${FILESDIR}"/${PN}-2.0.0-gcc13.patch
+ "${FILESDIR}"/${PN}-2.0.0-cudnn_include_fix.patch
+ "${FILESDIR}"/${P}-cudaExtra.patch
+)
+
+src_prepare() {
+ filter-lto #bug 862672
+ sed -i \
+ -e "/third_party\/gloo/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
+}
+
+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
[gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
commit: 71578f583267ca3847dab44526e40eb0ca171dec
Author: Alfredo Tupone gentoo org>
AuthorDate: Fri Aug 11 08:39:37 2023 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Fri Aug 11 08:40:05 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71578f58
sci-libs/caffe2: build nvfuser for cuda users
Signed-off-by: Alfredo Tupone gentoo.org>
sci-libs/caffe2/{caffe2-2.0.1-r3.ebuild => caffe2-2.0.1-r4.ebuild} | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/sci-libs/caffe2/caffe2-2.0.1-r3.ebuild
b/sci-libs/caffe2/caffe2-2.0.1-r4.ebuild
similarity index 98%
rename from sci-libs/caffe2/caffe2-2.0.1-r3.ebuild
rename to sci-libs/caffe2/caffe2-2.0.1-r4.ebuild
index 29087a44643f..67ab76e8ed76 100644
--- a/sci-libs/caffe2/caffe2-2.0.1-r3.ebuild
+++ b/sci-libs/caffe2/caffe2-2.0.1-r4.ebuild
@@ -136,7 +136,7 @@ src_configure() {
-DUSE_CUDNN=$(usex cuda)
-DUSE_FAST_NVCC=$(usex cuda)
-DTORCH_CUDA_ARCH_LIST="${TORCH_CUDA_ARCH_LIST:-3.5 7.0}"
- -DBUILD_NVFUSER=OFF
+ -DBUILD_NVFUSER=$(usex cuda)
-DUSE_DISTRIBUTED=$(usex distributed)
-DUSE_MPI=$(usex mpi)
-DUSE_FAKELOWP=OFF
@@ -196,6 +196,8 @@ src_configure() {
src_install() {
cmake_src_install
+ use cuda && dolib.so "${BUILD_DIR}"/lib/libnvfuser_codegen.so
+
insinto "/var/lib/${PN}"
doins "${BUILD_DIR}"/CMakeCache.txt
[gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
commit: 5088a2d38c87926670b7d18f75fc6b91da982caf
Author: Alfredo Tupone gentoo org>
AuthorDate: Fri Aug 11 07:26:35 2023 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Fri Aug 11 07:31:10 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5088a2d3
sci-libs/caffe2: build nvfuser for cuda users
Signed-off-by: Alfredo Tupone gentoo.org>
sci-libs/caffe2/{caffe2-2.0.0-r4.ebuild => caffe2-2.0.0-r5.ebuild} | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/sci-libs/caffe2/caffe2-2.0.0-r4.ebuild
b/sci-libs/caffe2/caffe2-2.0.0-r5.ebuild
similarity index 98%
rename from sci-libs/caffe2/caffe2-2.0.0-r4.ebuild
rename to sci-libs/caffe2/caffe2-2.0.0-r5.ebuild
index f6a3684a96a0..eaf3e07d46ac 100644
--- a/sci-libs/caffe2/caffe2-2.0.0-r4.ebuild
+++ b/sci-libs/caffe2/caffe2-2.0.0-r5.ebuild
@@ -121,7 +121,7 @@ src_configure() {
-DUSE_CUDNN=$(usex cuda)
-DUSE_FAST_NVCC=$(usex cuda)
-DTORCH_CUDA_ARCH_LIST="${TORCH_CUDA_ARCH_LIST:-3.5 7.0}"
- -DBUILD_NVFUSER=OFF
+ -DBUILD_NVFUSER=$(usex cuda)
-DUSE_DISTRIBUTED=$(usex distributed)
-DUSE_MPI=$(usex mpi)
-DUSE_FAKELOWP=OFF
@@ -181,6 +181,8 @@ src_configure() {
src_install() {
cmake_src_install
+ use cuda && dolib.so "${BUILD_DIR}"/lib/libnvfuser_codegen.so
+
insinto "/var/lib/${PN}"
doins "${BUILD_DIR}"/CMakeCache.txt
[gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
commit: 1155091de323b8ccb618a774460e529688b7f748
Author: Alfredo Tupone gentoo org>
AuthorDate: Tue Aug 1 07:26:16 2023 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Tue Aug 1 07:30:08 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1155091d
sci-libs/caffe2: prefixify (by ZongyuZ)
Bug: https://bugs.gentoo.org/911421
Signed-off-by: Alfredo Tupone gentoo.org>
.../{caffe2-2.0.1-r2.ebuild => caffe2-2.0.1-r3.ebuild} | 16 +++-
1 file changed, 15 insertions(+), 1 deletion(-)
diff --git a/sci-libs/caffe2/caffe2-2.0.1-r2.ebuild
b/sci-libs/caffe2/caffe2-2.0.1-r3.ebuild
similarity index 90%
rename from sci-libs/caffe2/caffe2-2.0.1-r2.ebuild
rename to sci-libs/caffe2/caffe2-2.0.1-r3.ebuild
index b8f88ae63e41..29087a44643f 100644
--- a/sci-libs/caffe2/caffe2-2.0.1-r2.ebuild
+++ b/sci-libs/caffe2/caffe2-2.0.1-r3.ebuild
@@ -4,7 +4,7 @@
EAPI=8
PYTHON_COMPAT=( python3_{9..11} )
-inherit python-single-r1 cmake cuda flag-o-matic
+inherit python-single-r1 cmake cuda flag-o-matic prefix
MYPN=pytorch
MYP=${MYPN}-${PV}
@@ -97,6 +97,20 @@ 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
}
src_configure() {
[gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
commit: 715a287b389218206948f60a4e848300b56364e3
Author: Alfredo Tupone gentoo org>
AuthorDate: Sat Jun 17 14:02:05 2023 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Sat Jun 17 14:02:05 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=715a287b
sci-libs/caffe2: depends on virtual/mpi
Closes: https://bugs.gentoo.org/908462
Signed-off-by: Alfredo Tupone gentoo.org>
sci-libs/caffe2/{caffe2-2.0.1-r1.ebuild => caffe2-2.0.1-r2.ebuild} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sci-libs/caffe2/caffe2-2.0.1-r1.ebuild
b/sci-libs/caffe2/caffe2-2.0.1-r2.ebuild
similarity index 98%
rename from sci-libs/caffe2/caffe2-2.0.1-r1.ebuild
rename to sci-libs/caffe2/caffe2-2.0.1-r2.ebuild
index 65814fb3e0e6..b8f88ae63e41 100644
--- a/sci-libs/caffe2/caffe2-2.0.1-r1.ebuild
+++ b/sci-libs/caffe2/caffe2-2.0.1-r2.ebuild
@@ -49,7 +49,7 @@ RDEPEND="
fbgemm? ( dev-libs/FBGEMM )
ffmpeg? ( media-video/ffmpeg:= )
gloo? ( sci-libs/gloo[cuda?] )
- mpi? ( sys-cluster/openmpi )
+ mpi? ( virtual/mpi )
nnpack? ( sci-libs/NNPACK )
numpy? ( $(python_gen_cond_dep '
dev-python/numpy[${PYTHON_USEDEP}]
@@ -106,7 +106,7 @@ src_configure() {
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 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;
[gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
commit: 956d531c9b11328f220abea0bdc319ed3ccfe891
Author: Alfredo Tupone gentoo org>
AuthorDate: Mon May 15 06:25:19 2023 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Mon May 15 06:26:07 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=956d531c
sci-libs/caffe2: if cuda require tensorpipe[cuda]
Bug: https://bugs.gentoo.org/906204
Signed-off-by: Alfredo Tupone gentoo.org>
sci-libs/caffe2/{caffe2-2.0.1.ebuild => caffe2-2.0.1-r1.ebuild} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-libs/caffe2/caffe2-2.0.1.ebuild
b/sci-libs/caffe2/caffe2-2.0.1-r1.ebuild
similarity index 99%
rename from sci-libs/caffe2/caffe2-2.0.1.ebuild
rename to sci-libs/caffe2/caffe2-2.0.1-r1.ebuild
index 558e1671f543..65814fb3e0e6 100644
--- a/sci-libs/caffe2/caffe2-2.0.1.ebuild
+++ b/sci-libs/caffe2/caffe2-2.0.1-r1.ebuild
@@ -57,7 +57,7 @@ RDEPEND="
opencl? ( virtual/opencl )
opencv? ( media-libs/opencv:= )
qnnpack? ( sci-libs/QNNPACK )
- tensorpipe? ( sci-libs/tensorpipe )
+ tensorpipe? ( sci-libs/tensorpipe[cuda?] )
xnnpack? ( >=sci-libs/XNNPACK-2022.12.22 )
"
DEPEND="
[gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
commit: 060541e234fe016898d27600efefc8c93f184cda
Author: Alfredo Tupone gentoo org>
AuthorDate: Sun May 14 07:58:04 2023 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Sun May 14 07:58:52 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=060541e2
sci-libs/caffe2: add 2.0.1
Signed-off-by: Alfredo Tupone gentoo.org>
sci-libs/caffe2/Manifest| 1 +
sci-libs/caffe2/caffe2-2.0.1.ebuild | 196
2 files changed, 197 insertions(+)
diff --git a/sci-libs/caffe2/Manifest b/sci-libs/caffe2/Manifest
index 1424256938e9..0ee75499ccbe 100644
--- a/sci-libs/caffe2/Manifest
+++ b/sci-libs/caffe2/Manifest
@@ -1,2 +1,3 @@
DIST pytorch-1.13.1.tar.gz 108279745 BLAKE2B
75de03b74dfdaf8d8fb5ea743fcc0c1b0e408a714ad4160c487921220a7b1755e5fa6e587e6bbc8c9f34dd75e096d2e6dd69c80d24821835fff6c833314434d3
SHA512
f16f89d027efade11d057245cad5b69a390e88b458398310ae30de2dbff7c8fd7f1165be7b8da7ea989c81ac3f5a66c5cb9050610e441a97c83fb8aa28c0bd62
DIST pytorch-2.0.0.tar.gz 111327292 BLAKE2B
6d593a975c0ade714f0b189f7e3c4ff704b9a9a2377b5e441a9cefc202fa22779966d08948e63671912c6ea5a0eee124042155f4f57a654db34e19e42f013cc9
SHA512
4dd76160711c0d87f3026c8b7fa3ed149dd86b8ac0ee9ecea0eaf80d2e6ce8c29368392e77b9466d90b60634087b462b782495997a5d33367cc8ca9fe14c8a14
+DIST pytorch-2.0.1.tar.gz 111335778 BLAKE2B
7a10cc2b2d5e2422aef7e060a0c3a62ca5c7460c6e0b9becade9b98939501975c74ed5a175a653731f43ca824d2c9bd31f41d1f633c2b139779ab23d5331e9ce
SHA512
2309a22b3be3ccdb36d8d9781a59a7bdcc2fdb8d95ada205702ec77862480f0cbb12cd5d6b8cd3114d01a6e33b7743d0fe9de93debf37138ca5c14403cdb0c43
diff --git a/sci-libs/caffe2/caffe2-2.0.1.ebuild
b/sci-libs/caffe2/caffe2-2.0.1.ebuild
new file mode 100644
index ..558e1671f543
--- /dev/null
+++ b/sci-libs/caffe2/caffe2-2.0.1.ebuild
@@ -0,0 +1,196 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit python-single-r1 cmake cuda flag-o-matic
+
+MYPN=pytorch
+MYP=${MYPN}-${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"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="cuda distributed fbgemm ffmpeg gloo mpi nnpack +numpy opencl opencv
openmp qnnpack tensorpipe xnnpack"
+RESTRICT="test"
+REQUIRED_USE="
+ ${PYTHON_REQUIRED_USE}
+ ffmpeg? ( opencv )
+ mpi? ( distributed )
+ tensorpipe? ( distributed )
+ distributed? ( tensorpipe )
+ gloo? ( distributed )
+" # ?? ( cuda rocm )
+
+# CUDA 12 not supported yet: https://github.com/pytorch/pytorch/issues/91122
+RDEPEND="
+ ${PYTHON_DEPS}
+ dev-cpp/gflags:=
+ >=dev-cpp/glog-0.5.0
+ dev-libs/cpuinfo
+ dev-libs/libfmt
+ dev-libs/protobuf:=
+ dev-libs/pthreadpool
+ dev-libs/sleef
+ sci-libs/lapack
+ >=sci-libs/onnx-1.12.0
+ sci-libs/foxi
+ cuda? (
+ =dev-libs/cudnn-8*
+ dev-libs/cudnn-frontend:0/8
+ =sci-libs/XNNPACK-2022.12.22 )
+"
+DEPEND="
+ ${RDEPEND}
+ dev-cpp/eigen
+ cuda? ( dev-libs/cutlass )
+ dev-libs/psimd
+ dev-libs/FP16
+ dev-libs/FXdiv
+ dev-libs/pocketfft
+ dev-libs/flatbuffers
+ sci-libs/kineto
+ $(python_gen_cond_dep '
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ dev-python/pybind11[${PYTHON_USEDEP}]
+ ')
+"
+
+S="${WORKDIR}"/${MYP}
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.0.0-gentoo.patch
+ "${FILESDIR}"/${PN}-1.13.0-install-dirs.patch
+ "${FILESDIR}"/${PN}-1.12.0-glog-0.6.0.patch
+ "${FILESDIR}"/${PN}-1.13.1-tensorpipe.patch
+ "${FILESDIR}"/${PN}-2.0.0-gcc13.patch
+ "${FILESDIR}"/${PN}-2.0.0-cudnn_include_fix.patch
+)
+
+src_prepare() {
+ filter-lto #bug 862672
+ sed -i \
+ -e "/third_party\/gloo/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
+}
+
+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"
+
[gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
commit: 31ce941c3695409c169e43143b869ae19aae119b
Author: wangjiezhe gmail com>
AuthorDate: Mon May 8 12:58:32 2023 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Mon May 8 21:00:12 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31ce941c
sci-libs/caffe2: fix gloo use with cuda
Signed-off-by: wangjiezhe gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/30931
Signed-off-by: Alfredo Tupone gentoo.org>
sci-libs/caffe2/{caffe2-1.13.1-r5.ebuild => caffe2-1.13.1-r6.ebuild} | 2 +-
sci-libs/caffe2/{caffe2-2.0.0-r3.ebuild => caffe2-2.0.0-r4.ebuild} | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sci-libs/caffe2/caffe2-1.13.1-r5.ebuild
b/sci-libs/caffe2/caffe2-1.13.1-r6.ebuild
similarity index 99%
rename from sci-libs/caffe2/caffe2-1.13.1-r5.ebuild
rename to sci-libs/caffe2/caffe2-1.13.1-r6.ebuild
index 7fc257acd3ab..e0d99129a9ac 100644
--- a/sci-libs/caffe2/caffe2-1.13.1-r5.ebuild
+++ b/sci-libs/caffe2/caffe2-1.13.1-r6.ebuild
@@ -47,7 +47,7 @@ RDEPEND="
)
fbgemm? ( dev-libs/FBGEMM )
ffmpeg? ( media-video/ffmpeg:= )
- gloo? ( sci-libs/gloo )
+ gloo? ( sci-libs/gloo[cuda?] )
mpi? ( sys-cluster/openmpi )
nnpack? ( sci-libs/NNPACK )
numpy? ( $(python_gen_cond_dep '
diff --git a/sci-libs/caffe2/caffe2-2.0.0-r3.ebuild
b/sci-libs/caffe2/caffe2-2.0.0-r4.ebuild
similarity index 99%
rename from sci-libs/caffe2/caffe2-2.0.0-r3.ebuild
rename to sci-libs/caffe2/caffe2-2.0.0-r4.ebuild
index 42b8dae69229..f6a3684a96a0 100644
--- a/sci-libs/caffe2/caffe2-2.0.0-r3.ebuild
+++ b/sci-libs/caffe2/caffe2-2.0.0-r4.ebuild
@@ -47,7 +47,7 @@ RDEPEND="
)
fbgemm? ( dev-libs/FBGEMM )
ffmpeg? ( media-video/ffmpeg:= )
- gloo? ( sci-libs/gloo )
+ gloo? ( sci-libs/gloo[cuda?] )
mpi? ( sys-cluster/openmpi )
nnpack? ( sci-libs/NNPACK )
numpy? ( $(python_gen_cond_dep '
[gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/, sci-libs/caffe2/files/
commit: d8ee6c1a21bd0be7cc254b7539f544083347c34c
Author: Alfredo Tupone gentoo org>
AuthorDate: Fri May 5 20:19:16 2023 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Sat May 6 17:27:39 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8ee6c1a
sci-libs/caffe2: fix fbgemm use and add gloo
Signed-off-by: Alfredo Tupone gentoo.org>
...e2-1.13.1-r4.ebuild => caffe2-1.13.1-r5.ebuild} | 13 +++--
...ffe2-2.0.0-r2.ebuild => caffe2-2.0.0-r3.ebuild} | 10 +++-
sci-libs/caffe2/files/caffe2-1.13.0-gentoo.patch | 61 ++
sci-libs/caffe2/files/caffe2-2.0.0-gentoo.patch| 61 ++
sci-libs/caffe2/metadata.xml | 1 +
5 files changed, 95 insertions(+), 51 deletions(-)
diff --git a/sci-libs/caffe2/caffe2-1.13.1-r4.ebuild
b/sci-libs/caffe2/caffe2-1.13.1-r5.ebuild
similarity index 93%
rename from sci-libs/caffe2/caffe2-1.13.1-r4.ebuild
rename to sci-libs/caffe2/caffe2-1.13.1-r5.ebuild
index efb497856e53..7fc257acd3ab 100644
--- a/sci-libs/caffe2/caffe2-1.13.1-r4.ebuild
+++ b/sci-libs/caffe2/caffe2-1.13.1-r5.ebuild
@@ -17,13 +17,14 @@
SRC_URI="https://github.com/pytorch/${MYPN}/archive/refs/tags/v${PV}.tar.gz
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64"
-IUSE="cuda distributed ffmpeg mpi nnpack +numpy opencl opencv openmp qnnpack
tensorpipe xnnpack"
+IUSE="cuda distributed fbgemm ffmpeg gloo mpi nnpack +numpy opencl opencv
openmp qnnpack tensorpipe xnnpack"
RESTRICT="test"
REQUIRED_USE="
${PYTHON_REQUIRED_USE}
ffmpeg? ( opencv )
mpi? ( distributed )
tensorpipe? ( distributed )
+ gloo? ( distributed )
" # ?? ( cuda rocm )
# CUDA 12 not supported yet: https://github.com/pytorch/pytorch/issues/91122
@@ -44,7 +45,9 @@ RDEPEND="
dev-libs/cudnn-frontend:0/8
https://github.com/pytorch/${MYPN}/archive/refs/tags/v${PV}.tar.gz
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64"
-IUSE="cuda distributed fbgemm ffmpeg mpi nnpack +numpy opencl opencv openmp
qnnpack tensorpipe xnnpack"
+IUSE="cuda distributed fbgemm ffmpeg gloo mpi nnpack +numpy opencl opencv
openmp qnnpack tensorpipe xnnpack"
RESTRICT="test"
REQUIRED_USE="
${PYTHON_REQUIRED_USE}
ffmpeg? ( opencv )
mpi? ( distributed )
tensorpipe? ( distributed )
+ gloo? ( distributed )
" # ?? ( cuda rocm )
# CUDA 12 not supported yet: https://github.com/pytorch/pytorch/issues/91122
@@ -46,6 +47,7 @@ RDEPEND="
)
fbgemm? ( dev-libs/FBGEMM )
ffmpeg? ( media-video/ffmpeg:= )
+ gloo? ( sci-libs/gloo )
mpi? ( sys-cluster/openmpi )
nnpack? ( sci-libs/NNPACK )
numpy? ( $(python_gen_cond_dep '
@@ -86,6 +88,10 @@ PATCHES=(
src_prepare() {
filter-lto #bug 862672
+ sed -i \
+ -e "/third_party\/gloo/d" \
+ cmake/Dependencies.cmake \
+ || die
cmake_src_prepare
pushd torch/csrc/jit/serialization || die
flatc --cpp --gen-mutable --scoped-enums mobile_bytecode.fbs || die
@@ -123,7 +129,7 @@ src_configure() {
-DUSE_FFMPEG=$(usex ffmpeg)
-DUSE_GFLAGS=ON
-DUSE_GLOG=ON
- -DUSE_GLOO=OFF
+ -DUSE_GLOO=$(usex gloo)
-DUSE_KINETO=OFF # TODO
-DUSE_LEVELDB=OFF
-DUSE_MAGMA=OFF # TODO: In GURU as sci-libs/magma
diff --git a/sci-libs/caffe2/files/caffe2-1.13.0-gentoo.patch
b/sci-libs/caffe2/files/caffe2-1.13.0-gentoo.patch
index a2771e3319d8..f72d44f475fa 100644
--- a/sci-libs/caffe2/files/caffe2-1.13.0-gentoo.patch
+++ b/sci-libs/caffe2/files/caffe2-1.13.0-gentoo.patch
@@ -1,6 +1,41 @@
--- a/cmake/Dependencies.cmake
+++ b/cmake/Dependencies.cmake
-@@ -1557,7 +1557,6 @@
+@@ -481,7 +481,7 @@ endif()
+ list(APPEND Caffe2_DEPENDENCY_LIBS cpuinfo)
+
+ # ---[ QNNPACK
+-if(USE_QNNPACK)
++if(FALSE)
+ set(CAFFE2_THIRD_PARTY_ROOT "${PROJECT_SOURCE_DIR}/third_party")
+
+ if(NOT DEFINED QNNPACK_SOURCE_DIR)
+@@ -537,7 +537,7 @@ if(USE_QNNPACK)
+ endif()
+
+ # ---[ Caffe2 Int8 operators (enabled by USE_QNNPACK) depend on gemmlowp and
neon2sse headers
+-if(USE_QNNPACK)
++if(FALSE)
+ set(CAFFE2_THIRD_PARTY_ROOT "${PROJECT_SOURCE_DIR}/third_party")
+ include_directories(SYSTEM "${CAFFE2_THIRD_PARTY_ROOT}/gemmlowp")
+ include_directories(SYSTEM "${CAFFE2_THIRD_PARTY_ROOT}/neon2sse")
+@@ -789,7 +789,7 @@
+ endif()
+
+ # ---[ FBGEMM
+-if(USE_FBGEMM)
++if(FALSE)
+ set(CAFFE2_THIRD_PARTY_ROOT "${PROJECT_SOURCE_DIR}/third_party")
+ if(NOT DEFINED FBGEMM_SOURCE_DIR)
+ set(FBGEMM_SOURCE_DIR "${CAFFE2_THIRD_PARTY_ROOT}/fbgemm" CACHE STRING
"FBGEMM source directory")
+@@ -834,6 +834,7 @@
+ endif()
+
+ if(USE_FBGEMM)
++ list(APPEND Caffe2_DEPENDENCY_LIBS fbgemm)
+ caffe2_update_option(USE_FBGEMM ON)
+ else()
+ caffe2_update_option(USE_FBGEMM OFF)
+@@ -1557,7 +1558,6 @@
if(NOT USE_SYSTEM_ONNX)
[gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
commit: 9c94203f8b64847edab176509c93ebdc5aef7573
Author: Alfredo Tupone gentoo org>
AuthorDate: Fri May 5 05:59:11 2023 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Fri May 5 06:00:02 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c94203f
sci-libs/caffe2: fix sandbox error
Closes: https://bugs.gentoo.org/905436
Signed-off-by: Alfredo Tupone gentoo.org>
sci-libs/caffe2/caffe2-1.13.1-r4.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/sci-libs/caffe2/caffe2-1.13.1-r4.ebuild
b/sci-libs/caffe2/caffe2-1.13.1-r4.ebuild
index afc6a29fc8df..efb497856e53 100644
--- a/sci-libs/caffe2/caffe2-1.13.1-r4.ebuild
+++ b/sci-libs/caffe2/caffe2-1.13.1-r4.ebuild
@@ -160,6 +160,7 @@ src_configure() {
if use cuda; then
addpredict "/dev/nvidiactl" # bug 867706
+ addpredict "/dev/char"
mycmakeargs+=(
-DCMAKE_CUDA_FLAGS="$(cuda_gccdir -f | tr -d \")"
[gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/files/, sci-libs/caffe2/
commit: 4d6a404d63ba3914c98344efe64d9b631089e3e1
Author: Alfredo Tupone gentoo org>
AuthorDate: Mon Apr 24 08:06:19 2023 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Mon Apr 24 08:35:48 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d6a404d
sci-libs/caffe2: fix cudnn include path
Closes: https://bugs.gentoo.org/904882
Signed-off-by: Alfredo Tupone gentoo.org>
sci-libs/caffe2/caffe2-2.0.0-r2.ebuild | 1 +
sci-libs/caffe2/files/caffe2-2.0.0-cudnn_include_fix.patch | 12
2 files changed, 13 insertions(+)
diff --git a/sci-libs/caffe2/caffe2-2.0.0-r2.ebuild
b/sci-libs/caffe2/caffe2-2.0.0-r2.ebuild
index 38ce9cd3befa..7667c7bbee17 100644
--- a/sci-libs/caffe2/caffe2-2.0.0-r2.ebuild
+++ b/sci-libs/caffe2/caffe2-2.0.0-r2.ebuild
@@ -81,6 +81,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.12.0-glog-0.6.0.patch
"${FILESDIR}"/${PN}-1.13.1-tensorpipe.patch
"${FILESDIR}"/${P}-gcc13.patch
+ "${FILESDIR}"/${P}-cudnn_include_fix.patch
)
src_prepare() {
diff --git a/sci-libs/caffe2/files/caffe2-2.0.0-cudnn_include_fix.patch
b/sci-libs/caffe2/files/caffe2-2.0.0-cudnn_include_fix.patch
new file mode 100644
index ..ff64e4108087
--- /dev/null
+++ b/sci-libs/caffe2/files/caffe2-2.0.0-cudnn_include_fix.patch
@@ -0,0 +1,12 @@
+diff -uar pytorch-2.0.0/cmake/Dependencies.cmake
pytorch-2.0.0orig/cmake/Dependencies.cmake
+--- a/cmake/Dependencies.cmake 2023-04-23 09:43:20.767566047 -0400
b/cmake/Dependencies.cmake 2023-03-09 17:42:00.0 -0500
+@@ -1235,7 +1235,7 @@
+
+ # ---[ cuDNN
+ if(USE_CUDNN)
+- set(CUDNN_FRONTEND_INCLUDE_DIR
${CMAKE_CURRENT_LIST_DIR}/../third_party/cudnn_frontend/include)
++ set(CUDNN_FRONTEND_INCLUDE_DIR /opt/cuda/include)
+ target_include_directories(torch::cudnn INTERFACE
${CUDNN_FRONTEND_INCLUDE_DIR})
+ endif()
+
[gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
commit: 2e4e05aca4cca79904e30cdbc9019043a5261262
Author: Alfredo Tupone gentoo org>
AuthorDate: Sun Apr 23 17:24:37 2023 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Sun Apr 23 17:25:05 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e4e05ac
sci-libs/caffe2: disable nvfuser
Closes: https://bugs.gentoo.org/904886
Signed-off-by: Alfredo Tupone gentoo.org>
sci-libs/caffe2/{caffe2-2.0.0-r1.ebuild => caffe2-2.0.0-r2.ebuild} | 1 +
1 file changed, 1 insertion(+)
diff --git a/sci-libs/caffe2/caffe2-2.0.0-r1.ebuild
b/sci-libs/caffe2/caffe2-2.0.0-r2.ebuild
similarity index 99%
rename from sci-libs/caffe2/caffe2-2.0.0-r1.ebuild
rename to sci-libs/caffe2/caffe2-2.0.0-r2.ebuild
index 4f0586de46e1..38ce9cd3befa 100644
--- a/sci-libs/caffe2/caffe2-2.0.0-r1.ebuild
+++ b/sci-libs/caffe2/caffe2-2.0.0-r2.ebuild
@@ -114,6 +114,7 @@ src_configure() {
-DUSE_CUDNN=$(usex cuda)
-DUSE_FAST_NVCC=$(usex cuda)
-DTORCH_CUDA_ARCH_LIST="${TORCH_CUDA_ARCH_LIST:-3.5 7.0}"
+ -DBUILD_NVFUSER=OFF
-DUSE_DISTRIBUTED=$(usex distributed)
-DUSE_MPI=$(usex mpi)
-DUSE_FAKELOWP=OFF
[gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
commit: aa8428244c620f062a55f86b5b2d7d2bbc15739b
Author: Alfredo Tupone gentoo org>
AuthorDate: Sun Apr 23 13:23:33 2023 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Sun Apr 23 13:23:33 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa842824
sci-libs/caffe2: sandbox error
Signed-off-by: Alfredo Tupone gentoo.org>
sci-libs/caffe2/caffe2-2.0.0-r1.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/sci-libs/caffe2/caffe2-2.0.0-r1.ebuild
b/sci-libs/caffe2/caffe2-2.0.0-r1.ebuild
index 48a01218a4e0..4f0586de46e1 100644
--- a/sci-libs/caffe2/caffe2-2.0.0-r1.ebuild
+++ b/sci-libs/caffe2/caffe2-2.0.0-r1.ebuild
@@ -161,6 +161,7 @@ src_configure() {
if use cuda; then
addpredict "/dev/nvidiactl" # bug 867706
+ addpredict "/dev/char"
mycmakeargs+=(
-DCMAKE_CUDA_FLAGS="$(cuda_gccdir -f | tr -d \")"
[gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/, sci-libs/caffe2/files/
commit: 6c34a781ed2d42b1923889fc4f6d015813d2fcdf
Author: Alfredo Tupone gentoo org>
AuthorDate: Wed Apr 12 17:56:54 2023 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Wed Apr 12 17:57:45 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c34a781
sci-libs/caffe2: to build with gcc-13
Closes: https://bugs.gentoo.org/904086
Signed-off-by: Alfredo Tupone gentoo.org>
sci-libs/caffe2/caffe2-2.0.0-r1.ebuild | 1 +
sci-libs/caffe2/files/caffe2-2.0.0-gcc13.patch | 41 ++
2 files changed, 42 insertions(+)
diff --git a/sci-libs/caffe2/caffe2-2.0.0-r1.ebuild
b/sci-libs/caffe2/caffe2-2.0.0-r1.ebuild
index ae14175b2471..48a01218a4e0 100644
--- a/sci-libs/caffe2/caffe2-2.0.0-r1.ebuild
+++ b/sci-libs/caffe2/caffe2-2.0.0-r1.ebuild
@@ -80,6 +80,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.13.0-install-dirs.patch
"${FILESDIR}"/${PN}-1.12.0-glog-0.6.0.patch
"${FILESDIR}"/${PN}-1.13.1-tensorpipe.patch
+ "${FILESDIR}"/${P}-gcc13.patch
)
src_prepare() {
diff --git a/sci-libs/caffe2/files/caffe2-2.0.0-gcc13.patch
b/sci-libs/caffe2/files/caffe2-2.0.0-gcc13.patch
new file mode 100644
index ..acbcebad0a5d
--- /dev/null
+++ b/sci-libs/caffe2/files/caffe2-2.0.0-gcc13.patch
@@ -0,0 +1,41 @@
+--- a/c10/util/Registry.h 2023-03-09 17:42:00.0 -0500
b/c10/util/Registry.h 2023-04-09 20:38:33.108135511 -0400
+@@ -16,6 +16,7 @@
+ #include
+ #include
+ #include
++#include
+ #include
+ #include
+
+--- a/torch/csrc/jit/passes/quantization/quantization_type.h2023-03-09
17:42:00.0 -0500
b/torch/csrc/jit/passes/quantization/quantization_type.h2023-04-09
20:43:43.124806308 -0400
+@@ -1,5 +1,6 @@
+ #pragma once
+ #include
++#include
+
+ namespace torch {
+ namespace jit {
+
+--- a/torch/csrc/jit/runtime/logging.cpp2023-03-09 17:42:00.0 -0500
b/torch/csrc/jit/runtime/logging.cpp2023-04-09 20:47:49.758142941 -0400
+@@ -1,6 +1,7 @@
+ #include
+
+ #include
++#include
+ #include
+ #include
+
+
+--- a/torch/csrc/lazy/core/multi_wait.cpp 2023-03-09 17:42:00.0 -0500
b/torch/csrc/lazy/core/multi_wait.cpp 2023-04-09 20:50:36.608145172 -0400
+@@ -1,6 +1,7 @@
+ #include
+
+ #include
++#include
+ #include
+
+ namespace torch {
[gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
commit: 2299e56b110834ccc6e8d9a675d1093a4d8559a0
Author: Alfredo Tupone gentoo org>
AuthorDate: Sat Apr 8 14:28:31 2023 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Sat Apr 8 14:28:31 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2299e56b
sci-libs/caffe2: enable use of FBGEMM
Signed-off-by: Alfredo Tupone gentoo.org>
sci-libs/caffe2/{caffe2-2.0.0.ebuild => caffe2-2.0.0-r1.ebuild} | 5 +++--
sci-libs/caffe2/metadata.xml| 1 +
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/sci-libs/caffe2/caffe2-2.0.0.ebuild
b/sci-libs/caffe2/caffe2-2.0.0-r1.ebuild
similarity index 96%
rename from sci-libs/caffe2/caffe2-2.0.0.ebuild
rename to sci-libs/caffe2/caffe2-2.0.0-r1.ebuild
index 9b010cdda9a9..ae14175b2471 100644
--- a/sci-libs/caffe2/caffe2-2.0.0.ebuild
+++ b/sci-libs/caffe2/caffe2-2.0.0-r1.ebuild
@@ -17,7 +17,7 @@
SRC_URI="https://github.com/pytorch/${MYPN}/archive/refs/tags/v${PV}.tar.gz
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64"
-IUSE="cuda distributed ffmpeg mpi nnpack +numpy opencl opencv openmp qnnpack
tensorpipe xnnpack"
+IUSE="cuda distributed fbgemm ffmpeg mpi nnpack +numpy opencl opencv openmp
qnnpack tensorpipe xnnpack"
RESTRICT="test"
REQUIRED_USE="
${PYTHON_REQUIRED_USE}
@@ -44,6 +44,7 @@ RDEPEND="
dev-libs/cudnn-frontend:0/8
Add support for CUDA processing
Support distributed applications
+ Use FBGEMM
Add support for video processing
operators
Use NNPACK
Add support for math operations through
numpy
[gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
commit: 6a9a03c380b72076af556055149fc6a203135d4a
Author: Alfredo Tupone gentoo org>
AuthorDate: Thu Apr 6 19:44:50 2023 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Thu Apr 6 19:46:08 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a9a03c3
sci-libs/caffe2: depends on a new XNNPACK
Signed-off-by: Alfredo Tupone gentoo.org>
sci-libs/caffe2/caffe2-2.0.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-libs/caffe2/caffe2-2.0.0.ebuild
b/sci-libs/caffe2/caffe2-2.0.0.ebuild
index d06eaa5b375f..9b010cdda9a9 100644
--- a/sci-libs/caffe2/caffe2-2.0.0.ebuild
+++ b/sci-libs/caffe2/caffe2-2.0.0.ebuild
@@ -54,7 +54,7 @@ RDEPEND="
opencv? ( media-libs/opencv:= )
qnnpack? ( sci-libs/QNNPACK )
tensorpipe? ( sci-libs/tensorpipe )
- xnnpack? ( sci-libs/XNNPACK )
+ xnnpack? ( >=sci-libs/XNNPACK-2022.12.22 )
"
DEPEND="
${RDEPEND}
[gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/files/, sci-libs/caffe2/
commit: af7595c6e757334814a1d164a6fcaf35cfd0a944
Author: Alfredo Tupone gentoo org>
AuthorDate: Wed Apr 5 09:05:54 2023 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Wed Apr 5 09:06:53 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af7595c6
sci-libs/caffe2: add 2.0.0
Signed-off-by: Alfredo Tupone gentoo.org>
sci-libs/caffe2/Manifest| 1 +
sci-libs/caffe2/caffe2-2.0.0.ebuild | 184 +++
sci-libs/caffe2/files/caffe2-2.0.0-gentoo.patch | 189
3 files changed, 374 insertions(+)
diff --git a/sci-libs/caffe2/Manifest b/sci-libs/caffe2/Manifest
index 616b75a49763..1424256938e9 100644
--- a/sci-libs/caffe2/Manifest
+++ b/sci-libs/caffe2/Manifest
@@ -1 +1,2 @@
DIST pytorch-1.13.1.tar.gz 108279745 BLAKE2B
75de03b74dfdaf8d8fb5ea743fcc0c1b0e408a714ad4160c487921220a7b1755e5fa6e587e6bbc8c9f34dd75e096d2e6dd69c80d24821835fff6c833314434d3
SHA512
f16f89d027efade11d057245cad5b69a390e88b458398310ae30de2dbff7c8fd7f1165be7b8da7ea989c81ac3f5a66c5cb9050610e441a97c83fb8aa28c0bd62
+DIST pytorch-2.0.0.tar.gz 111327292 BLAKE2B
6d593a975c0ade714f0b189f7e3c4ff704b9a9a2377b5e441a9cefc202fa22779966d08948e63671912c6ea5a0eee124042155f4f57a654db34e19e42f013cc9
SHA512
4dd76160711c0d87f3026c8b7fa3ed149dd86b8ac0ee9ecea0eaf80d2e6ce8c29368392e77b9466d90b60634087b462b782495997a5d33367cc8ca9fe14c8a14
diff --git a/sci-libs/caffe2/caffe2-2.0.0.ebuild
b/sci-libs/caffe2/caffe2-2.0.0.ebuild
new file mode 100644
index ..d06eaa5b375f
--- /dev/null
+++ b/sci-libs/caffe2/caffe2-2.0.0.ebuild
@@ -0,0 +1,184 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit python-single-r1 cmake cuda flag-o-matic
+
+MYPN=pytorch
+MYP=${MYPN}-${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"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="cuda distributed ffmpeg mpi nnpack +numpy opencl opencv openmp qnnpack
tensorpipe xnnpack"
+RESTRICT="test"
+REQUIRED_USE="
+ ${PYTHON_REQUIRED_USE}
+ ffmpeg? ( opencv )
+ mpi? ( distributed )
+ tensorpipe? ( distributed )
+" # ?? ( cuda rocm )
+
+# CUDA 12 not supported yet: https://github.com/pytorch/pytorch/issues/91122
+RDEPEND="
+ ${PYTHON_DEPS}
+ dev-cpp/gflags:=
+ >=dev-cpp/glog-0.5.0
+ dev-libs/cpuinfo
+ dev-libs/libfmt
+ dev-libs/protobuf:=
+ dev-libs/pthreadpool
+ dev-libs/sleef
+ sci-libs/lapack
+ >=sci-libs/onnx-1.12.0
+ sci-libs/foxi
+ cuda? (
+ =dev-libs/cudnn-8*
+ dev-libs/cudnn-frontend:0/8
+ 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
+ -DBUILD_SHARED_LIBS=ON
+
+ -DUSE_CCACHE=OFF
+ -DUSE_CUDA=$(usex cuda)
+ -DUSE_CUDNN=$(usex cuda)
+ -DUSE_FAST_NVCC=$(usex cuda)
+ -DTORCH_CUDA_ARCH_LIST="${TORCH_CUDA_ARCH_LIST:-3.5 7.0}"
+ -DUSE_DISTRIBUTED=$(usex distributed)
+ -DUSE_MPI=$(usex mpi)
+ -DUSE_FAKELOWP=OFF
+ -DUSE_FBGEMM=OFF # TODO
+ -DUSE_FFMPEG=$(usex ffmpeg)
+ -DUSE_GFLAGS=ON
+ -DUSE_GLOG=ON
+ -DUSE_GLOO=OFF
+ -DUSE_KINETO=OFF # TODO
+ -DUSE_LEVELDB=OFF
+ -DUSE_MAGMA=OFF # TODO: In GURU as sci-libs/magma
+ -DUSE_MKLDNN=OFF
+ -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)
+ -DUSE_OPENCL=$(usex opencl)
+ -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
+ -DBLAS=Eigen # avoid the use of MKL, if found on the system
+ -DUSE_SYSTEM_EIGEN_INSTALL=ON
+ -DUSE_SYSTEM_PTHREADPOOL=ON
+ -DUSE_SYSTEM_FXDIV=ON
+ -DUSE_SYSTEM_FP16=ON
+ -DUSE_SYSTEM_GLOO=ON
+
[gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
commit: de476863a8113542d076564b80f6a06883cbdc1b
Author: Alfredo Tupone gentoo org>
AuthorDate: Sun Mar 26 15:46:52 2023 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Sun Mar 26 18:10:30 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de476863
sci-libs/caffe2: avoid the use of MKL
Signed-off-by: Alfredo Tupone gentoo.org>
sci-libs/caffe2/caffe2-1.13.1-r4.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/sci-libs/caffe2/caffe2-1.13.1-r4.ebuild
b/sci-libs/caffe2/caffe2-1.13.1-r4.ebuild
index 133fd14a1f9d..afc6a29fc8df 100644
--- a/sci-libs/caffe2/caffe2-1.13.1-r4.ebuild
+++ b/sci-libs/caffe2/caffe2-1.13.1-r4.ebuild
@@ -144,6 +144,7 @@ src_configure() {
-DPYBIND11_PYTHON_VERSION="${EPYTHON#python}"
-DPYTHON_EXECUTABLE="${PYTHON}"
-DUSE_ITT=OFF
+ -DBLAS=Eigen # avoid the use of MKL, if found on the system
-DUSE_SYSTEM_EIGEN_INSTALL=ON
-DUSE_SYSTEM_PTHREADPOOL=ON
-DUSE_SYSTEM_FXDIV=ON
[gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
commit: 5569e6c21c3020ed6c15c175063ec5633564b53f
Author: Larry D. Pyeatt sdsmt edu>
AuthorDate: Fri Mar 17 17:47:50 2023 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Fri Mar 17 18:46:38 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5569e6c2
sci-libs/caffe2: sci-libs/caffe2-1.13.1-r4 fails during install - rm: cannot
remove '/dev/shm/portage/sci-libs/caffe2-1.13.1-r4/image/var/tmp': No such file
or directory
Closes: https://bugs.gentoo.org/901967
Signed-off-by: Larry D. Pyeatt sdsmt.edu>
Closes: https://github.com/gentoo/gentoo/pull/30187
Signed-off-by: Alfredo Tupone gentoo.org>
sci-libs/caffe2/caffe2-1.13.1-r4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-libs/caffe2/caffe2-1.13.1-r4.ebuild
b/sci-libs/caffe2/caffe2-1.13.1-r4.ebuild
index 9411531dd1ec..133fd14a1f9d 100644
--- a/sci-libs/caffe2/caffe2-1.13.1-r4.ebuild
+++ b/sci-libs/caffe2/caffe2-1.13.1-r4.ebuild
@@ -178,7 +178,7 @@ src_install() {
mv "${ED}"/usr/lib/python*/site-packages/caffe2 python/ || die
mv "${ED}"/usr/include/torch python/torch/include || die
cp torch/version.py python/torch/ || die
- rm -r "${ED}"/var/tmp || die
+ rm -rf "${ED}"/var/tmp || die
python_domodule python/caffe2
python_domodule python/torch
}
[gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/files/, sci-libs/caffe2/
commit: 725ad515274266020396fdae1a5b949b30fdc127
Author: Alfredo Tupone gentoo org>
AuthorDate: Tue Feb 28 20:37:40 2023 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Tue Feb 28 20:38:24 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=725ad515
sci-libs/caffe2: add tensorpipe use flag
Signed-off-by: Alfredo Tupone gentoo.org>
.../{caffe2-1.13.1-r3.ebuild => caffe2-1.13.1-r4.ebuild} | 7 +--
sci-libs/caffe2/files/caffe2-1.13.1-tensorpipe.patch | 10 ++
sci-libs/caffe2/metadata.xml | 1 +
3 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/sci-libs/caffe2/caffe2-1.13.1-r3.ebuild
b/sci-libs/caffe2/caffe2-1.13.1-r4.ebuild
similarity index 96%
rename from sci-libs/caffe2/caffe2-1.13.1-r3.ebuild
rename to sci-libs/caffe2/caffe2-1.13.1-r4.ebuild
index 04521a5c26ef..9411531dd1ec 100644
--- a/sci-libs/caffe2/caffe2-1.13.1-r3.ebuild
+++ b/sci-libs/caffe2/caffe2-1.13.1-r4.ebuild
@@ -17,12 +17,13 @@
SRC_URI="https://github.com/pytorch/${MYPN}/archive/refs/tags/v${PV}.tar.gz
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64"
-IUSE="cuda distributed ffmpeg mpi nnpack +numpy opencl opencv openmp qnnpack
xnnpack"
+IUSE="cuda distributed ffmpeg mpi nnpack +numpy opencl opencv openmp qnnpack
tensorpipe xnnpack"
RESTRICT="test"
REQUIRED_USE="
${PYTHON_REQUIRED_USE}
ffmpeg? ( opencv )
mpi? ( distributed )
+ tensorpipe? ( distributed )
" # ?? ( cuda rocm )
# CUDA 12 not supported yet: https://github.com/pytorch/pytorch/issues/91122
@@ -52,6 +53,7 @@ RDEPEND="
opencl? ( virtual/opencl )
opencv? ( media-libs/opencv:= )
qnnpack? ( sci-libs/QNNPACK )
+ tensorpipe? ( sci-libs/tensorpipe )
xnnpack? ( sci-libs/XNNPACK )
"
DEPEND="
@@ -77,6 +79,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.13.0-install-dirs.patch
"${FILESDIR}"/${PN}-1.12.0-glog-0.6.0.patch
"${FILESDIR}"/${PN}-1.12.0-clang.patch
+ "${FILESDIR}"/${P}-tensorpipe.patch
)
src_prepare() {
@@ -127,6 +130,7 @@ src_configure() {
-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)
-DUSE_OPENCL=$(usex opencl)
@@ -147,7 +151,6 @@ src_configure() {
-DUSE_SYSTEM_GLOO=ON
-DUSE_SYSTEM_ONNX=ON
-DUSE_SYSTEM_SLEEF=ON
- -DUSE_TENSORPIPE=OFF
-Wno-dev
-DTORCH_INSTALL_LIB_DIR="${EPREFIX}"/usr/$(get_libdir)
diff --git a/sci-libs/caffe2/files/caffe2-1.13.1-tensorpipe.patch
b/sci-libs/caffe2/files/caffe2-1.13.1-tensorpipe.patch
new file mode 100644
index ..ae0cac9fb947
--- /dev/null
+++ b/sci-libs/caffe2/files/caffe2-1.13.1-tensorpipe.patch
@@ -0,0 +1,10 @@
+--- a/cmake/Dependencies.cmake 2023-02-28 14:14:49.099057348 +0100
b/cmake/Dependencies.cmake 2023-02-28 14:15:05.326790806 +0100
+@@ -1404,7 +1404,6 @@
+
+ # Tensorpipe uses cuda_add_library
+ torch_update_find_cuda_flags()
+-add_subdirectory(${PROJECT_SOURCE_DIR}/third_party/tensorpipe)
+
+ list(APPEND Caffe2_DEPENDENCY_LIBS tensorpipe)
+ if(USE_CUDA)
diff --git a/sci-libs/caffe2/metadata.xml b/sci-libs/caffe2/metadata.xml
index f009baee81bb..531b9cbf5879 100644
--- a/sci-libs/caffe2/metadata.xml
+++ b/sci-libs/caffe2/metadata.xml
@@ -19,6 +19,7 @@
Add support for image processing
operators
Use OpenMP for parallel code
Use QNNPACK
+ Use tensorpipe
Use XNNPACK
[gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
commit: 7a54b4eda38431f1b3cfdd61c9611df8292cba91
Author: Alfredo Tupone gentoo org>
AuthorDate: Mon Feb 27 19:13:08 2023 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Tue Feb 28 07:12:00 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a54b4ed
sci-libs/caffe2: CUDA 12 not supported yet
Signed-off-by: Alfredo Tupone gentoo.org>
sci-libs/caffe2/{caffe2-1.13.1-r1.ebuild => caffe2-1.13.1-r2.ebuild} | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/sci-libs/caffe2/caffe2-1.13.1-r1.ebuild
b/sci-libs/caffe2/caffe2-1.13.1-r2.ebuild
similarity index 97%
rename from sci-libs/caffe2/caffe2-1.13.1-r1.ebuild
rename to sci-libs/caffe2/caffe2-1.13.1-r2.ebuild
index c2bc254f2787..d985af6d9995 100644
--- a/sci-libs/caffe2/caffe2-1.13.1-r1.ebuild
+++ b/sci-libs/caffe2/caffe2-1.13.1-r2.ebuild
@@ -24,6 +24,7 @@ REQUIRED_USE="
ffmpeg? ( opencv )
" # ?? ( cuda rocm )
+# CUDA 12 not supported yet: https://github.com/pytorch/pytorch/issues/91122
RDEPEND="
${PYTHON_DEPS}
dev-cpp/gflags:=
@@ -39,7 +40,7 @@ RDEPEND="
cuda? (
=dev-libs/cudnn-8*
dev-libs/cudnn-frontend:0/8
- dev-util/nvidia-cuda-toolkit:=[profiler]
+
[gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
commit: 70a1cabccd1d81a307686ab693d0443a439b64d1
Author: Alfredo Tupone gentoo org>
AuthorDate: Tue Feb 28 07:10:59 2023 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Tue Feb 28 07:12:05 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70a1cabc
sci-libs/caffe2: add mpi use flag
Signed-off-by: Alfredo Tupone gentoo.org>
.../caffe2/{caffe2-1.13.1-r2.ebuild => caffe2-1.13.1-r3.ebuild} | 8 ++--
sci-libs/caffe2/metadata.xml | 1 +
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/sci-libs/caffe2/caffe2-1.13.1-r2.ebuild
b/sci-libs/caffe2/caffe2-1.13.1-r3.ebuild
similarity index 95%
rename from sci-libs/caffe2/caffe2-1.13.1-r2.ebuild
rename to sci-libs/caffe2/caffe2-1.13.1-r3.ebuild
index d985af6d9995..04521a5c26ef 100644
--- a/sci-libs/caffe2/caffe2-1.13.1-r2.ebuild
+++ b/sci-libs/caffe2/caffe2-1.13.1-r3.ebuild
@@ -17,11 +17,12 @@
SRC_URI="https://github.com/pytorch/${MYPN}/archive/refs/tags/v${PV}.tar.gz
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64"
-IUSE="cuda ffmpeg nnpack +numpy opencl opencv openmp qnnpack xnnpack"
+IUSE="cuda distributed ffmpeg mpi nnpack +numpy opencl opencv openmp qnnpack
xnnpack"
RESTRICT="test"
REQUIRED_USE="
${PYTHON_REQUIRED_USE}
ffmpeg? ( opencv )
+ mpi? ( distributed )
" # ?? ( cuda rocm )
# CUDA 12 not supported yet: https://github.com/pytorch/pytorch/issues/91122
@@ -43,6 +44,7 @@ RDEPEND="
Add support for CUDA processing
+ Support distributed applications
Add support for video processing
operators
Use NNPACK
Add support for math operations through
numpy
[gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
commit: b2f385739323abaf90da0a967b3cdc3a4f548bb0
Author: Alfredo Tupone gentoo org>
AuthorDate: Mon Feb 27 14:16:03 2023 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Mon Feb 27 14:16:03 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2f38573
sci-libs/caffe2: add cutlass deps
Closes: https://bugs.gentoo.org/895490
Signed-off-by: Alfredo Tupone gentoo.org>
sci-libs/caffe2/caffe2-1.13.1-r1.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/sci-libs/caffe2/caffe2-1.13.1-r1.ebuild
b/sci-libs/caffe2/caffe2-1.13.1-r1.ebuild
index 4e0dfcb9b980..c2bc254f2787 100644
--- a/sci-libs/caffe2/caffe2-1.13.1-r1.ebuild
+++ b/sci-libs/caffe2/caffe2-1.13.1-r1.ebuild
@@ -54,6 +54,7 @@ RDEPEND="
DEPEND="
${RDEPEND}
dev-cpp/eigen
+ cuda? ( dev-libs/cutlass )
dev-libs/psimd
dev-libs/FP16
dev-libs/FXdiv
[gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
commit: 04f1c73d1190c41edc24667ebd0c2505c62a6706
Author: Alfredo Tupone gentoo org>
AuthorDate: Mon Feb 27 07:13:55 2023 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Mon Feb 27 07:23:15 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04f1c73d
sci-libs/caffe2: find the right GCC for CUDA
Closes: https://bugs.gentoo.org/888039
Signed-off-by: Alfredo Tupone gentoo.org>
sci-libs/caffe2/caffe2-1.13.1-r1.ebuild | 10 --
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/sci-libs/caffe2/caffe2-1.13.1-r1.ebuild
b/sci-libs/caffe2/caffe2-1.13.1-r1.ebuild
index 352a593d3559..4e0dfcb9b980 100644
--- a/sci-libs/caffe2/caffe2-1.13.1-r1.ebuild
+++ b/sci-libs/caffe2/caffe2-1.13.1-r1.ebuild
@@ -4,7 +4,7 @@
EAPI=8
PYTHON_COMPAT=( python3_{9..11} )
-inherit python-single-r1 cmake flag-o-matic
+inherit python-single-r1 cmake cuda flag-o-matic
MYPN=pytorch
MYP=${MYPN}-${PV}
@@ -148,7 +148,13 @@ src_configure() {
-DLIBSHM_INSTALL_LIB_SUBDIR="${EPREFIX}"/usr/$(get_libdir)
)
- use cuda && addpredict "/dev/nvidiactl" # bug 867706
+ if use cuda; then
+ addpredict "/dev/nvidiactl" # bug 867706
+
+ mycmakeargs+=(
+ -DCMAKE_CUDA_FLAGS="$(cuda_gccdir -f | tr -d \")"
+ )
+ fi
cmake_src_configure
}
[gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/files/, sci-libs/caffe2/
commit: 67094a0ab3f18f4c8bbcf4db3e1838b33527b15c
Author: Alfredo Tupone gentoo org>
AuthorDate: Wed Feb 22 08:06:43 2023 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Wed Feb 22 08:06:43 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67094a0a
sci-libs/caffe2: drop 1.12.0-r1, 1.12.1, 1.13.0-r1
Signed-off-by: Alfredo Tupone gentoo.org>
sci-libs/caffe2/Manifest | 3 -
sci-libs/caffe2/caffe2-1.12.0-r1.ebuild| 165
sci-libs/caffe2/caffe2-1.12.1.ebuild | 165
sci-libs/caffe2/caffe2-1.13.0-r1.ebuild| 169 -
sci-libs/caffe2/files/caffe2-1.11.0-gentoo.patch | 168
.../caffe2/files/caffe2-1.12.0-install-dirs.patch | 129
6 files changed, 799 deletions(-)
diff --git a/sci-libs/caffe2/Manifest b/sci-libs/caffe2/Manifest
index 7a1c9e4370ae..616b75a49763 100644
--- a/sci-libs/caffe2/Manifest
+++ b/sci-libs/caffe2/Manifest
@@ -1,4 +1 @@
-DIST pytorch-1.12.0.tar.gz 106286765 BLAKE2B
ff9bafedb35f859f7dccb9b606299cf9c345bdaa0deb87ecfe0c0c30c3c828414d989e1d9a243d9b7cd3f376d56a2f81c241ca2e3c9a8a2b30cddcdeddd3a5c7
SHA512
c9c748a2e0047daaaf199a1ba3198d2d1aee47f664170a9b34ccacd3deeb95f2070e4035eeb900012ef48dc62cf6fb6806f1a1dfe22de8c94892963076e593b7
-DIST pytorch-1.12.1.tar.gz 106311625 BLAKE2B
e8ca19d0e1987449c33ad4c36722a3a467f7f8a9f90be2a7f2de643cbd665038f6802b5ff1f1d3da09b6253d8f29e11549a24295de013d97f73affe538c84c99
SHA512
afeb551904ebd9b5901ae623a98eadbb3045115247cedf8006a940742cfad04e5ce24cfaf363336a9ed88d7ce6a4ac53dbb6a5c690aef6efdf20477c3a22c7ca
-DIST pytorch-1.13.0.tar.gz 108276317 BLAKE2B
8149775dea06d8e4027b741c828169d33f768a96aef58cd2f86daa3bbad5bf36143454e26b683a992aca34e7fb52e6483c46168b698db48ff6978c9605d7a3d2
SHA512
5a0e8c589bdf552ccf682511a8860c754ab6f5844f51e568c5034793f787b97707af4340b338b9b8606dd27a6ced6ef50091f0cc514458b3021a2220409d7f20
DIST pytorch-1.13.1.tar.gz 108279745 BLAKE2B
75de03b74dfdaf8d8fb5ea743fcc0c1b0e408a714ad4160c487921220a7b1755e5fa6e587e6bbc8c9f34dd75e096d2e6dd69c80d24821835fff6c833314434d3
SHA512
f16f89d027efade11d057245cad5b69a390e88b458398310ae30de2dbff7c8fd7f1165be7b8da7ea989c81ac3f5a66c5cb9050610e441a97c83fb8aa28c0bd62
diff --git a/sci-libs/caffe2/caffe2-1.12.0-r1.ebuild
b/sci-libs/caffe2/caffe2-1.12.0-r1.ebuild
deleted file mode 100644
index 1840db7282a4..
--- a/sci-libs/caffe2/caffe2-1.12.0-r1.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..10} )
-inherit python-single-r1 cmake flag-o-matic
-
-MYPN=pytorch
-MYP=${MYPN}-${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"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="cuda ffmpeg nnpack +numpy opencl opencv openmp qnnpack xnnpack"
-RESTRICT="test"
-REQUIRED_USE="
- ${PYTHON_REQUIRED_USE}
- ffmpeg? ( opencv )
-" # ?? ( cuda rocm )
-
-RDEPEND="
- ${PYTHON_DEPS}
- dev-cpp/gflags:=
- >=dev-cpp/glog-0.5.0
- dev-libs/cpuinfo
- dev-libs/libfmt
- dev-libs/protobuf:=
- dev-libs/pthreadpool
- dev-libs/sleef
- sci-libs/lapack
- sci-libs/onnx
- sci-libs/foxi
- cuda? (
- =dev-libs/cudnn-8*
- dev-libs/cudnn-frontend:0/8
- dev-util/nvidia-cuda-toolkit:=[profiler]
- )
- ffmpeg? ( media-video/ffmpeg:= )
- nnpack? ( sci-libs/NNPACK )
- numpy? ( $(python_gen_cond_dep '
- dev-python/numpy[${PYTHON_USEDEP}]
- ') )
- opencl? ( virtual/opencl )
- opencv? ( media-libs/opencv:= )
- qnnpack? ( sci-libs/QNNPACK )
- xnnpack? ( sci-libs/XNNPACK )
-"
-DEPEND="
- ${RDEPEND}
- dev-cpp/eigen
- dev-libs/psimd
- dev-libs/FP16
- dev-libs/FXdiv
- dev-libs/pocketfft
- dev-libs/flatbuffers
- $(python_gen_cond_dep '
- dev-python/pyyaml[${PYTHON_USEDEP}]
- dev-python/pybind11[${PYTHON_USEDEP}]
- ')
-"
-
-S="${WORKDIR}"/${MYP}
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.11.0-gentoo.patch
- "${FILESDIR}"/${PN}-1.12.0-install-dirs.patch
- "${FILESDIR}"/${P}-glog-0.6.0.patch
- "${FILESDIR}"/${P}-clang.patch
-)
-
-src_prepare() {
- filter-lto #bug 862672
- cmake_src_prepare
- pushd torch/csrc/jit/serialization || die
- flatc --cpp --gen-mutable --scoped-enums mobile_bytecode.fbs || die
- popd
-}
-
-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
[gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
commit: 39efa04922e0172b9b5f6313022e70d693d9c61e
Author: Alfredo Tupone gentoo org>
AuthorDate: Mon Feb 20 21:22:05 2023 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Mon Feb 20 21:22:05 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39efa049
sci-libs/caffe2: enable python 3.11
Signed-off-by: Alfredo Tupone gentoo.org>
sci-libs/caffe2/{caffe2-1.13.1.ebuild => caffe2-1.13.1-r1.ebuild} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-libs/caffe2/caffe2-1.13.1.ebuild
b/sci-libs/caffe2/caffe2-1.13.1-r1.ebuild
similarity index 99%
rename from sci-libs/caffe2/caffe2-1.13.1.ebuild
rename to sci-libs/caffe2/caffe2-1.13.1-r1.ebuild
index caf62fd84b8f..352a593d3559 100644
--- a/sci-libs/caffe2/caffe2-1.13.1.ebuild
+++ b/sci-libs/caffe2/caffe2-1.13.1-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
inherit python-single-r1 cmake flag-o-matic
MYPN=pytorch
[gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
commit: f62dca7123b6dd4842866afaeba30c16d3e5e64e
Author: Alfredo Tupone gentoo org>
AuthorDate: Wed Feb 15 19:38:46 2023 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Wed Feb 15 19:38:46 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f62dca71
sci-libs/caffe2: add 1.13.1
Signed-off-by: Alfredo Tupone gentoo.org>
sci-libs/caffe2/Manifest | 1 +
sci-libs/caffe2/caffe2-1.13.1.ebuild | 169 +++
2 files changed, 170 insertions(+)
diff --git a/sci-libs/caffe2/Manifest b/sci-libs/caffe2/Manifest
index fba79e4a9a24..7a1c9e4370ae 100644
--- a/sci-libs/caffe2/Manifest
+++ b/sci-libs/caffe2/Manifest
@@ -1,3 +1,4 @@
DIST pytorch-1.12.0.tar.gz 106286765 BLAKE2B
ff9bafedb35f859f7dccb9b606299cf9c345bdaa0deb87ecfe0c0c30c3c828414d989e1d9a243d9b7cd3f376d56a2f81c241ca2e3c9a8a2b30cddcdeddd3a5c7
SHA512
c9c748a2e0047daaaf199a1ba3198d2d1aee47f664170a9b34ccacd3deeb95f2070e4035eeb900012ef48dc62cf6fb6806f1a1dfe22de8c94892963076e593b7
DIST pytorch-1.12.1.tar.gz 106311625 BLAKE2B
e8ca19d0e1987449c33ad4c36722a3a467f7f8a9f90be2a7f2de643cbd665038f6802b5ff1f1d3da09b6253d8f29e11549a24295de013d97f73affe538c84c99
SHA512
afeb551904ebd9b5901ae623a98eadbb3045115247cedf8006a940742cfad04e5ce24cfaf363336a9ed88d7ce6a4ac53dbb6a5c690aef6efdf20477c3a22c7ca
DIST pytorch-1.13.0.tar.gz 108276317 BLAKE2B
8149775dea06d8e4027b741c828169d33f768a96aef58cd2f86daa3bbad5bf36143454e26b683a992aca34e7fb52e6483c46168b698db48ff6978c9605d7a3d2
SHA512
5a0e8c589bdf552ccf682511a8860c754ab6f5844f51e568c5034793f787b97707af4340b338b9b8606dd27a6ced6ef50091f0cc514458b3021a2220409d7f20
+DIST pytorch-1.13.1.tar.gz 108279745 BLAKE2B
75de03b74dfdaf8d8fb5ea743fcc0c1b0e408a714ad4160c487921220a7b1755e5fa6e587e6bbc8c9f34dd75e096d2e6dd69c80d24821835fff6c833314434d3
SHA512
f16f89d027efade11d057245cad5b69a390e88b458398310ae30de2dbff7c8fd7f1165be7b8da7ea989c81ac3f5a66c5cb9050610e441a97c83fb8aa28c0bd62
diff --git a/sci-libs/caffe2/caffe2-1.13.1.ebuild
b/sci-libs/caffe2/caffe2-1.13.1.ebuild
new file mode 100644
index ..caf62fd84b8f
--- /dev/null
+++ b/sci-libs/caffe2/caffe2-1.13.1.ebuild
@@ -0,0 +1,169 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..10} )
+inherit python-single-r1 cmake flag-o-matic
+
+MYPN=pytorch
+MYP=${MYPN}-${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"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="cuda ffmpeg nnpack +numpy opencl opencv openmp qnnpack xnnpack"
+RESTRICT="test"
+REQUIRED_USE="
+ ${PYTHON_REQUIRED_USE}
+ ffmpeg? ( opencv )
+" # ?? ( cuda rocm )
+
+RDEPEND="
+ ${PYTHON_DEPS}
+ dev-cpp/gflags:=
+ >=dev-cpp/glog-0.5.0
+ dev-libs/cpuinfo
+ dev-libs/libfmt
+ dev-libs/protobuf:=
+ dev-libs/pthreadpool
+ dev-libs/sleef
+ sci-libs/lapack
+ >=sci-libs/onnx-1.12.0
+ sci-libs/foxi
+ cuda? (
+ =dev-libs/cudnn-8*
+ dev-libs/cudnn-frontend:0/8
+ dev-util/nvidia-cuda-toolkit:=[profiler]
+ )
+ ffmpeg? ( media-video/ffmpeg:= )
+ nnpack? ( sci-libs/NNPACK )
+ numpy? ( $(python_gen_cond_dep '
+ dev-python/numpy[${PYTHON_USEDEP}]
+ ') )
+ opencl? ( virtual/opencl )
+ opencv? ( media-libs/opencv:= )
+ qnnpack? ( sci-libs/QNNPACK )
+ xnnpack? ( sci-libs/XNNPACK )
+"
+DEPEND="
+ ${RDEPEND}
+ dev-cpp/eigen
+ dev-libs/psimd
+ dev-libs/FP16
+ dev-libs/FXdiv
+ dev-libs/pocketfft
+ dev-libs/flatbuffers
+ sci-libs/kineto
+ $(python_gen_cond_dep '
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ dev-python/pybind11[${PYTHON_USEDEP}]
+ ')
+"
+
+S="${WORKDIR}"/${MYP}
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.13.0-gentoo.patch
+ "${FILESDIR}"/${PN}-1.13.0-install-dirs.patch
+ "${FILESDIR}"/${PN}-1.12.0-glog-0.6.0.patch
+ "${FILESDIR}"/${PN}-1.12.0-clang.patch
+)
+
+src_prepare() {
+ filter-lto #bug 862672
+ cmake_src_prepare
+ pushd torch/csrc/jit/serialization || die
+ flatc --cpp --gen-mutable --scoped-enums mobile_bytecode.fbs || die
+ popd
+}
+
+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,
[gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
commit: 974a17b47648adf241d5bdba1291f2c2ed9b9592 Author: Sam James gentoo org> AuthorDate: Wed Feb 15 07:35:38 2023 + Commit: Sam James gentoo org> CommitDate: Wed Feb 15 07:35:38 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=974a17b4 sci-libs/caffe2: fix UnknownManifest Signed-off-by: Sam James gentoo.org> sci-libs/caffe2/Manifest | 1 - 1 file changed, 1 deletion(-) diff --git a/sci-libs/caffe2/Manifest b/sci-libs/caffe2/Manifest index 7a1c9e4370ae..fba79e4a9a24 100644 --- a/sci-libs/caffe2/Manifest +++ b/sci-libs/caffe2/Manifest @@ -1,4 +1,3 @@ DIST pytorch-1.12.0.tar.gz 106286765 BLAKE2B ff9bafedb35f859f7dccb9b606299cf9c345bdaa0deb87ecfe0c0c30c3c828414d989e1d9a243d9b7cd3f376d56a2f81c241ca2e3c9a8a2b30cddcdeddd3a5c7 SHA512 c9c748a2e0047daaaf199a1ba3198d2d1aee47f664170a9b34ccacd3deeb95f2070e4035eeb900012ef48dc62cf6fb6806f1a1dfe22de8c94892963076e593b7 DIST pytorch-1.12.1.tar.gz 106311625 BLAKE2B e8ca19d0e1987449c33ad4c36722a3a467f7f8a9f90be2a7f2de643cbd665038f6802b5ff1f1d3da09b6253d8f29e11549a24295de013d97f73affe538c84c99 SHA512 afeb551904ebd9b5901ae623a98eadbb3045115247cedf8006a940742cfad04e5ce24cfaf363336a9ed88d7ce6a4ac53dbb6a5c690aef6efdf20477c3a22c7ca DIST pytorch-1.13.0.tar.gz 108276317 BLAKE2B 8149775dea06d8e4027b741c828169d33f768a96aef58cd2f86daa3bbad5bf36143454e26b683a992aca34e7fb52e6483c46168b698db48ff6978c9605d7a3d2 SHA512 5a0e8c589bdf552ccf682511a8860c754ab6f5844f51e568c5034793f787b97707af4340b338b9b8606dd27a6ced6ef50091f0cc514458b3021a2220409d7f20 -DIST pytorch-1.13.1.tar.gz 108279745 BLAKE2B 75de03b74dfdaf8d8fb5ea743fcc0c1b0e408a714ad4160c487921220a7b1755e5fa6e587e6bbc8c9f34dd75e096d2e6dd69c80d24821835fff6c833314434d3 SHA512 f16f89d027efade11d057245cad5b69a390e88b458398310ae30de2dbff7c8fd7f1165be7b8da7ea989c81ac3f5a66c5cb9050610e441a97c83fb8aa28c0bd62
[gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
commit: 076708ac7139e30709bf7cb99d9e82c9bcfaec6d
Author: Alfredo Tupone gentoo org>
AuthorDate: Wed Feb 15 07:13:46 2023 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Wed Feb 15 07:18:24 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=076708ac
sci-libs/caffe2: depends on kineto
Closes: https://bugs.gentoo.org/894436
Signed-off-by: Alfredo Tupone gentoo.org>
sci-libs/caffe2/Manifest | 1 +
sci-libs/caffe2/{caffe2-1.13.0.ebuild => caffe2-1.13.0-r1.ebuild} | 1 +
2 files changed, 2 insertions(+)
diff --git a/sci-libs/caffe2/Manifest b/sci-libs/caffe2/Manifest
index fba79e4a9a24..7a1c9e4370ae 100644
--- a/sci-libs/caffe2/Manifest
+++ b/sci-libs/caffe2/Manifest
@@ -1,3 +1,4 @@
DIST pytorch-1.12.0.tar.gz 106286765 BLAKE2B
ff9bafedb35f859f7dccb9b606299cf9c345bdaa0deb87ecfe0c0c30c3c828414d989e1d9a243d9b7cd3f376d56a2f81c241ca2e3c9a8a2b30cddcdeddd3a5c7
SHA512
c9c748a2e0047daaaf199a1ba3198d2d1aee47f664170a9b34ccacd3deeb95f2070e4035eeb900012ef48dc62cf6fb6806f1a1dfe22de8c94892963076e593b7
DIST pytorch-1.12.1.tar.gz 106311625 BLAKE2B
e8ca19d0e1987449c33ad4c36722a3a467f7f8a9f90be2a7f2de643cbd665038f6802b5ff1f1d3da09b6253d8f29e11549a24295de013d97f73affe538c84c99
SHA512
afeb551904ebd9b5901ae623a98eadbb3045115247cedf8006a940742cfad04e5ce24cfaf363336a9ed88d7ce6a4ac53dbb6a5c690aef6efdf20477c3a22c7ca
DIST pytorch-1.13.0.tar.gz 108276317 BLAKE2B
8149775dea06d8e4027b741c828169d33f768a96aef58cd2f86daa3bbad5bf36143454e26b683a992aca34e7fb52e6483c46168b698db48ff6978c9605d7a3d2
SHA512
5a0e8c589bdf552ccf682511a8860c754ab6f5844f51e568c5034793f787b97707af4340b338b9b8606dd27a6ced6ef50091f0cc514458b3021a2220409d7f20
+DIST pytorch-1.13.1.tar.gz 108279745 BLAKE2B
75de03b74dfdaf8d8fb5ea743fcc0c1b0e408a714ad4160c487921220a7b1755e5fa6e587e6bbc8c9f34dd75e096d2e6dd69c80d24821835fff6c833314434d3
SHA512
f16f89d027efade11d057245cad5b69a390e88b458398310ae30de2dbff7c8fd7f1165be7b8da7ea989c81ac3f5a66c5cb9050610e441a97c83fb8aa28c0bd62
diff --git a/sci-libs/caffe2/caffe2-1.13.0.ebuild
b/sci-libs/caffe2/caffe2-1.13.0-r1.ebuild
similarity index 99%
rename from sci-libs/caffe2/caffe2-1.13.0.ebuild
rename to sci-libs/caffe2/caffe2-1.13.0-r1.ebuild
index f77c5dd01c55..ee1d1154a978 100644
--- a/sci-libs/caffe2/caffe2-1.13.0.ebuild
+++ b/sci-libs/caffe2/caffe2-1.13.0-r1.ebuild
@@ -59,6 +59,7 @@ DEPEND="
dev-libs/FXdiv
dev-libs/pocketfft
dev-libs/flatbuffers
+ sci-libs/kineto
$(python_gen_cond_dep '
dev-python/pyyaml[${PYTHON_USEDEP}]
dev-python/pybind11[${PYTHON_USEDEP}]
[gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/, sci-libs/caffe2/files/
commit: fa7df6a08decc35c91a5a791a27a71b32e105b30
Author: Alfredo Tupone gentoo org>
AuthorDate: Tue Feb 14 19:30:31 2023 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Tue Feb 14 19:31:37 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa7df6a0
sci-libs/caffe2: add 1.13.0
Signed-off-by: Alfredo Tupone gentoo.org>
sci-libs/caffe2/Manifest | 1 +
sci-libs/caffe2/caffe2-1.13.0.ebuild | 168
sci-libs/caffe2/files/caffe2-1.13.0-gentoo.patch | 224 +
.../caffe2/files/caffe2-1.13.0-install-dirs.patch | 121 +++
4 files changed, 514 insertions(+)
diff --git a/sci-libs/caffe2/Manifest b/sci-libs/caffe2/Manifest
index adfe026eaff0..fba79e4a9a24 100644
--- a/sci-libs/caffe2/Manifest
+++ b/sci-libs/caffe2/Manifest
@@ -1,2 +1,3 @@
DIST pytorch-1.12.0.tar.gz 106286765 BLAKE2B
ff9bafedb35f859f7dccb9b606299cf9c345bdaa0deb87ecfe0c0c30c3c828414d989e1d9a243d9b7cd3f376d56a2f81c241ca2e3c9a8a2b30cddcdeddd3a5c7
SHA512
c9c748a2e0047daaaf199a1ba3198d2d1aee47f664170a9b34ccacd3deeb95f2070e4035eeb900012ef48dc62cf6fb6806f1a1dfe22de8c94892963076e593b7
DIST pytorch-1.12.1.tar.gz 106311625 BLAKE2B
e8ca19d0e1987449c33ad4c36722a3a467f7f8a9f90be2a7f2de643cbd665038f6802b5ff1f1d3da09b6253d8f29e11549a24295de013d97f73affe538c84c99
SHA512
afeb551904ebd9b5901ae623a98eadbb3045115247cedf8006a940742cfad04e5ce24cfaf363336a9ed88d7ce6a4ac53dbb6a5c690aef6efdf20477c3a22c7ca
+DIST pytorch-1.13.0.tar.gz 108276317 BLAKE2B
8149775dea06d8e4027b741c828169d33f768a96aef58cd2f86daa3bbad5bf36143454e26b683a992aca34e7fb52e6483c46168b698db48ff6978c9605d7a3d2
SHA512
5a0e8c589bdf552ccf682511a8860c754ab6f5844f51e568c5034793f787b97707af4340b338b9b8606dd27a6ced6ef50091f0cc514458b3021a2220409d7f20
diff --git a/sci-libs/caffe2/caffe2-1.13.0.ebuild
b/sci-libs/caffe2/caffe2-1.13.0.ebuild
new file mode 100644
index ..f77c5dd01c55
--- /dev/null
+++ b/sci-libs/caffe2/caffe2-1.13.0.ebuild
@@ -0,0 +1,168 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..10} )
+inherit python-single-r1 cmake flag-o-matic
+
+MYPN=pytorch
+MYP=${MYPN}-${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"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="cuda ffmpeg nnpack +numpy opencl opencv openmp qnnpack xnnpack"
+RESTRICT="test"
+REQUIRED_USE="
+ ${PYTHON_REQUIRED_USE}
+ ffmpeg? ( opencv )
+" # ?? ( cuda rocm )
+
+RDEPEND="
+ ${PYTHON_DEPS}
+ dev-cpp/gflags:=
+ >=dev-cpp/glog-0.5.0
+ dev-libs/cpuinfo
+ dev-libs/libfmt
+ dev-libs/protobuf:=
+ dev-libs/pthreadpool
+ dev-libs/sleef
+ sci-libs/lapack
+ >=sci-libs/onnx-1.12.0
+ sci-libs/foxi
+ cuda? (
+ =dev-libs/cudnn-8*
+ dev-libs/cudnn-frontend:0/8
+ dev-util/nvidia-cuda-toolkit:=[profiler]
+ )
+ ffmpeg? ( media-video/ffmpeg:= )
+ nnpack? ( sci-libs/NNPACK )
+ numpy? ( $(python_gen_cond_dep '
+ dev-python/numpy[${PYTHON_USEDEP}]
+ ') )
+ opencl? ( virtual/opencl )
+ opencv? ( media-libs/opencv:= )
+ qnnpack? ( sci-libs/QNNPACK )
+ xnnpack? ( sci-libs/XNNPACK )
+"
+DEPEND="
+ ${RDEPEND}
+ dev-cpp/eigen
+ dev-libs/psimd
+ dev-libs/FP16
+ dev-libs/FXdiv
+ dev-libs/pocketfft
+ dev-libs/flatbuffers
+ $(python_gen_cond_dep '
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ dev-python/pybind11[${PYTHON_USEDEP}]
+ ')
+"
+
+S="${WORKDIR}"/${MYP}
+
+PATCHES=(
+ "${FILESDIR}"/${P}-gentoo.patch
+ "${FILESDIR}"/${P}-install-dirs.patch
+ "${FILESDIR}"/${PN}-1.12.0-glog-0.6.0.patch
+ "${FILESDIR}"/${PN}-1.12.0-clang.patch
+)
+
+src_prepare() {
+ filter-lto #bug 862672
+ cmake_src_prepare
+ pushd torch/csrc/jit/serialization || die
+ flatc --cpp --gen-mutable --scoped-enums mobile_bytecode.fbs || die
+ popd
+}
+
+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
[gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
commit: f068859e8141d769156afc65d354c84adb0d0faf
Author: Alfredo Tupone gentoo org>
AuthorDate: Sun Feb 12 09:07:49 2023 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Sun Feb 12 09:08:53 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f068859e
sci-libs/caffe2: add 1.12.1
Signed-off-by: Alfredo Tupone gentoo.org>
sci-libs/caffe2/Manifest | 1 +
sci-libs/caffe2/caffe2-1.12.1.ebuild | 165 +++
2 files changed, 166 insertions(+)
diff --git a/sci-libs/caffe2/Manifest b/sci-libs/caffe2/Manifest
index 013309cd70ce..adfe026eaff0 100644
--- a/sci-libs/caffe2/Manifest
+++ b/sci-libs/caffe2/Manifest
@@ -1 +1,2 @@
DIST pytorch-1.12.0.tar.gz 106286765 BLAKE2B
ff9bafedb35f859f7dccb9b606299cf9c345bdaa0deb87ecfe0c0c30c3c828414d989e1d9a243d9b7cd3f376d56a2f81c241ca2e3c9a8a2b30cddcdeddd3a5c7
SHA512
c9c748a2e0047daaaf199a1ba3198d2d1aee47f664170a9b34ccacd3deeb95f2070e4035eeb900012ef48dc62cf6fb6806f1a1dfe22de8c94892963076e593b7
+DIST pytorch-1.12.1.tar.gz 106311625 BLAKE2B
e8ca19d0e1987449c33ad4c36722a3a467f7f8a9f90be2a7f2de643cbd665038f6802b5ff1f1d3da09b6253d8f29e11549a24295de013d97f73affe538c84c99
SHA512
afeb551904ebd9b5901ae623a98eadbb3045115247cedf8006a940742cfad04e5ce24cfaf363336a9ed88d7ce6a4ac53dbb6a5c690aef6efdf20477c3a22c7ca
diff --git a/sci-libs/caffe2/caffe2-1.12.1.ebuild
b/sci-libs/caffe2/caffe2-1.12.1.ebuild
new file mode 100644
index ..218cdb2ce9e7
--- /dev/null
+++ b/sci-libs/caffe2/caffe2-1.12.1.ebuild
@@ -0,0 +1,165 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..10} )
+inherit python-single-r1 cmake flag-o-matic
+
+MYPN=pytorch
+MYP=${MYPN}-${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"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="cuda ffmpeg nnpack +numpy opencl opencv openmp qnnpack xnnpack"
+RESTRICT="test"
+REQUIRED_USE="
+ ${PYTHON_REQUIRED_USE}
+ ffmpeg? ( opencv )
+" # ?? ( cuda rocm )
+
+RDEPEND="
+ ${PYTHON_DEPS}
+ dev-cpp/gflags:=
+ >=dev-cpp/glog-0.5.0
+ dev-libs/cpuinfo
+ dev-libs/libfmt
+ dev-libs/protobuf:=
+ dev-libs/pthreadpool
+ dev-libs/sleef
+ sci-libs/lapack
+ sci-libs/onnx
+ sci-libs/foxi
+ cuda? (
+ =dev-libs/cudnn-8*
+ dev-libs/cudnn-frontend:0/8
+ dev-util/nvidia-cuda-toolkit:=[profiler]
+ )
+ ffmpeg? ( media-video/ffmpeg:= )
+ nnpack? ( sci-libs/NNPACK )
+ numpy? ( $(python_gen_cond_dep '
+ dev-python/numpy[${PYTHON_USEDEP}]
+ ') )
+ opencl? ( virtual/opencl )
+ opencv? ( media-libs/opencv:= )
+ qnnpack? ( sci-libs/QNNPACK )
+ xnnpack? ( sci-libs/XNNPACK )
+"
+DEPEND="
+ ${RDEPEND}
+ dev-cpp/eigen
+ dev-libs/psimd
+ dev-libs/FP16
+ dev-libs/FXdiv
+ dev-libs/pocketfft
+ dev-libs/flatbuffers
+ $(python_gen_cond_dep '
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ dev-python/pybind11[${PYTHON_USEDEP}]
+ ')
+"
+
+S="${WORKDIR}"/${MYP}
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.11.0-gentoo.patch
+ "${FILESDIR}"/${PN}-1.12.0-install-dirs.patch
+ "${FILESDIR}"/${PN}-1.12.0-glog-0.6.0.patch
+ "${FILESDIR}"/${PN}-1.12.0-clang.patch
+)
+
+src_prepare() {
+ filter-lto #bug 862672
+ cmake_src_prepare
+ pushd torch/csrc/jit/serialization || die
+ flatc --cpp --gen-mutable --scoped-enums mobile_bytecode.fbs || die
+ popd
+}
+
+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
+ -DBUILD_SHARED_LIBS=ON
+
+ -DUSE_CCACHE=OFF
+ -DUSE_CUDA=$(usex cuda)
+ -DUSE_CUDNN=$(usex cuda)
+
[gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/files/, sci-libs/caffe2/
commit: 05b4eaf3a0b650d61c1ae0adbcc52a1717aa36d4
Author: Alfredo Tupone gentoo org>
AuthorDate: Thu Jan 12 12:05:46 2023 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Thu Jan 12 12:08:10 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05b4eaf3
sci-libs/caffe2: fix build with clang
Closes: https://bugs.gentoo.org/886273
Signed-off-by: Alfredo Tupone gentoo.org>
sci-libs/caffe2/caffe2-1.12.0-r1.ebuild | 2 ++
sci-libs/caffe2/files/caffe2-1.12.0-clang.patch | 42 +
2 files changed, 44 insertions(+)
diff --git a/sci-libs/caffe2/caffe2-1.12.0-r1.ebuild
b/sci-libs/caffe2/caffe2-1.12.0-r1.ebuild
index 8f6e1f87386f..3ed8c6670b1d 100644
--- a/sci-libs/caffe2/caffe2-1.12.0-r1.ebuild
+++ b/sci-libs/caffe2/caffe2-1.12.0-r1.ebuild
@@ -71,6 +71,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.11.0-gentoo.patch
"${FILESDIR}"/${PN}-1.12.0-install-dirs.patch
"${FILESDIR}"/${P}-glog-0.6.0.patch
+ "${FILESDIR}"/${P}-clang.patch
)
src_prepare() {
@@ -134,6 +135,7 @@ src_configure() {
-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_TENSORPIPE=OFF
diff --git a/sci-libs/caffe2/files/caffe2-1.12.0-clang.patch
b/sci-libs/caffe2/files/caffe2-1.12.0-clang.patch
new file mode 100644
index ..dd43b06a97a1
--- /dev/null
+++ b/sci-libs/caffe2/files/caffe2-1.12.0-clang.patch
@@ -0,0 +1,42 @@
+From bfdc0358dc37c55af6118fe5d8b6ccd898e003fd Mon Sep 17 00:00:00 2001
+From: Kazuki Sakamoto
+Date: Wed, 21 Dec 2022 11:19:58 +
+Subject: [PATCH] Compile fix for Clang + libc++ (#91212)
+
+Summary:
+LLVM 15 has a compile issue with the deprecated __has_trivial_copy. Update the
GCC ifdef logic to exclude Clang + libc++.
+
+```
+caffe2/c10/util/Optional.h:536:13: error: builtin __has_trivial_copy is
deprecated; use __is_trivially_copyable instead [-Werror,-Wdeprecated-builtins]
+C10_IS_TRIVIALLY_COPYABLE(T) &&
+^
+caffe2/c10/macros/Macros.h:438:38: note: expanded from macro
'C10_IS_TRIVIALLY_COPYABLE'
+#define C10_IS_TRIVIALLY_COPYABLE(T) __has_trivial_copy(T)
+```
+
+Test Plan: CI
+
+Reviewed By: kit1980
+
+Differential Revision: D42180203
+
+Pull Request resolved: https://github.com/pytorch/pytorch/pull/91212
+Approved by: https://github.com/kit1980, https://github.com/soumith
+---
+ c10/macros/Macros.h | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/c10/macros/Macros.h b/c10/macros/Macros.h
+index 9098a294228f4..09e57ca0a4d6a 100644
+--- a/c10/macros/Macros.h
b/c10/macros/Macros.h
+@@ -434,7 +434,8 @@ __device__ __attribute__((noinline)) __attribute__((weak))
void __assert_fail(
+ // Warning: __has_trivial_copy for GCC may not always detect the non-POD
+ // correctly. For example, T = std::unique_ptr may evaluate to true and be
+ // treated as POD. This can cause unexpected behavior.
+-#if defined(__GNUG__) && __GNUC__ < 5
++#if defined(__GNUG__) && __GNUC__ < 5 && \
++!(defined(__clang__) && defined(_LIBCPP_VERSION))
+ #define C10_IS_TRIVIALLY_COPYABLE(T) __has_trivial_copy(T)
+ #else
+ #define C10_IS_TRIVIALLY_COPYABLE(T) std::is_trivially_copyable::value
[gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/files/
commit: d63f5f531caa6c5a6cd5db49ba9efd96006a7325
Author: Alfredo Tupone gentoo org>
AuthorDate: Wed Jan 4 14:00:46 2023 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Wed Jan 4 14:01:57 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d63f5f53
sci-libs/caffe2: remove last Werror
Closes: https://bugs.gentoo.org/889444
Signed-off-by: Alfredo Tupone gentoo.org>
sci-libs/caffe2/files/caffe2-1.11.0-gentoo.patch | 38 +---
1 file changed, 27 insertions(+), 11 deletions(-)
diff --git a/sci-libs/caffe2/files/caffe2-1.11.0-gentoo.patch
b/sci-libs/caffe2/files/caffe2-1.11.0-gentoo.patch
index 059bcc2b9705..67d4281c8b95 100644
--- a/sci-libs/caffe2/files/caffe2-1.11.0-gentoo.patch
+++ b/sci-libs/caffe2/files/caffe2-1.11.0-gentoo.patch
@@ -1,6 +1,6 @@
--- a/cmake/Dependencies.cmake
+++ b/cmake/Dependencies.cmake
-@@ -1512,7 +1512,6 @@
+@@ -1523,7 +1523,6 @@
if(NOT USE_SYSTEM_ONNX)
add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/../third_party/onnx
EXCLUDE_FROM_ALL)
endif()
@@ -8,7 +8,7 @@
add_definitions(-DONNX_NAMESPACE=${ONNX_NAMESPACE})
if(NOT USE_SYSTEM_ONNX)
-@@ -1810,7 +1809,6 @@
+@@ -1821,7 +1820,6 @@
#
set(TEMP_BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS})
set(BUILD_SHARED_LIBS OFF CACHE BOOL "Build shared libs" FORCE)
@@ -16,7 +16,7 @@
# Disable compiler feature checks for `fmt`.
#
-@@ -1819,9 +1817,7 @@
+@@ -1830,9 +1828,7 @@
# CMAKE_CXX_FLAGS in ways that break feature checks. Since we already know
# `fmt` is compatible with a superset of the compilers that PyTorch is, it
# shouldn't be too bad to just disable the checks.
@@ -25,10 +25,10 @@
-list(APPEND Caffe2_DEPENDENCY_LIBS fmt::fmt-header-only)
set(BUILD_SHARED_LIBS ${TEMP_BUILD_SHARED_LIBS} CACHE BOOL "Build shared
libs" FORCE)
- if(USE_BREAKPAD)
+ # ---[ Kineto
--- a/c10/CMakeLists.txt
+++ b/c10/CMakeLists.txt
-@@ -59,7 +59,7 @@
+@@ -62,7 +62,7 @@
if(${USE_GLOG})
target_link_libraries(c10 PUBLIC glog::glog)
endif()
@@ -39,9 +39,9 @@
if(Backtrace_FOUND)
--- a/torch/CMakeLists.txt
+++ b/torch/CMakeLists.txt
-@@ -82,7 +82,6 @@
-
- set(TORCH_PYTHON_LINK_LIBRARIES
+@@ -86,7 +86,6 @@
+ python::python
+ pybind::pybind11
shm
-fmt::fmt-header-only
ATEN_CPU_FILES_GEN_LIB)
@@ -80,7 +80,7 @@
# This doesn't work globally so we use the test on specific
--- a/cmake/public/utils.cmake
+++ b/cmake/public/utils.cmake
-@@ -512,8 +512,6 @@
+@@ -510,8 +510,6 @@
endif()
# Use -O2 for release builds (-O3 doesn't improve perf, and -Os results in
perf regression)
@@ -102,7 +102,7 @@
endif()
--- a/caffe2/CMakeLists.txt
+++ b/caffe2/CMakeLists.txt
-@@ -109,7 +109,7 @@
+@@ -111,7 +111,7 @@
# Note: the folders that are being commented out have not been properly
# addressed yet.
@@ -111,7 +111,23 @@
if(NOT TARGET fxdiv)
set(FXDIV_BUILD_TESTS OFF CACHE BOOL "")
set(FXDIV_BUILD_BENCHMARKS OFF CACHE BOOL "")
-@@ -967,7 +967,6 @@
+@@ -557,7 +557,6 @@
+ if(NOT MSVC)
+
set_source_files_properties(${TORCH_SRC_DIR}/csrc/jit/tensorexpr/llvm_jit.cpp
PROPERTIES COMPILE_FLAGS -Wno-noexcept-type)
+ # Force -Werror on several files
+-
set_source_files_properties(${CMAKE_CURRENT_LIST_DIR}/../aten/src/ATen/native/mkldnn/Pooling.cpp
PROPERTIES COMPILE_FLAGS "-Werror")
+ endif()
+ # Disable certain warnings for GCC-9.X
+ if(CMAKE_COMPILER_IS_GNUCXX AND (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER
9.0.0))
+@@ -825,7 +824,6 @@
+ torch_compile_options(torch_cpu) # see cmake/public/utils.cmake
+ if(HAS_WERROR_SIGN_COMPARE AND WERROR)
+ # target_compile_options(torch_cpu PRIVATE "-Werror=sign-compare")
+- set_property(SOURCE ${ATen_CORE_SRCS} ${ATen_CPU_SRCS} APPEND PROPERTY
COMPILE_OPTIONS "-Werror=sign-compare")
+ endif()
+
+ set_property(SOURCE ${ATen_CORE_SRCS} APPEND
+@@ -1017,7 +1015,6 @@
endif()
if(NOT MSVC AND USE_XNNPACK)
[gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
commit: 4590c8b8fa3b26439ac9336243331863a4ed2c52
Author: Alfredo Tupone gentoo org>
AuthorDate: Tue Jan 3 06:16:54 2023 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Tue Jan 3 06:19:58 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4590c8b8
sci-libs/caffe2: inherit single and mv api in python dir
Signed-off-by: Alfredo Tupone gentoo.org>
...affe2-1.12.0.ebuild => caffe2-1.12.0-r1.ebuild} | 26 +++---
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/sci-libs/caffe2/caffe2-1.12.0.ebuild
b/sci-libs/caffe2/caffe2-1.12.0-r1.ebuild
similarity index 91%
rename from sci-libs/caffe2/caffe2-1.12.0.ebuild
rename to sci-libs/caffe2/caffe2-1.12.0-r1.ebuild
index 035c81fabb3a..8f6e1f87386f 100644
--- a/sci-libs/caffe2/caffe2-1.12.0.ebuild
+++ b/sci-libs/caffe2/caffe2-1.12.0-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
PYTHON_COMPAT=( python3_{8..10} )
-inherit python-r1 cmake flag-o-matic
+inherit python-single-r1 cmake flag-o-matic
MYPN=pytorch
MYP=${MYPN}-${PV}
@@ -43,7 +43,9 @@ RDEPEND="
)
ffmpeg? ( media-video/ffmpeg:= )
nnpack? ( sci-libs/NNPACK )
- numpy? ( dev-python/numpy[${PYTHON_USEDEP}] )
+ numpy? ( $(python_gen_cond_dep '
+ dev-python/numpy[${PYTHON_USEDEP}]
+ ') )
opencl? ( virtual/opencl )
opencv? ( media-libs/opencv:= )
qnnpack? ( sci-libs/QNNPACK )
@@ -57,8 +59,10 @@ DEPEND="
dev-libs/FXdiv
dev-libs/pocketfft
dev-libs/flatbuffers
- dev-python/pyyaml[${PYTHON_USEDEP}]
- dev-python/pybind11[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ dev-python/pybind11[${PYTHON_USEDEP}]
+ ')
"
S="${WORKDIR}"/${MYP}
@@ -91,7 +95,6 @@ src_configure() {
ewarn "or by running /opt/cuda/extras/demo_suite/deviceQuery |
grep 'CUDA Capability'"
fi
- python_setup
local mycmakeargs=(
-DBUILD_CUSTOM_PROTOBUF=OFF
-DBUILD_SHARED_LIBS=ON
@@ -144,11 +147,6 @@ src_configure() {
cmake_src_configure
}
-python_install() {
- python_domodule python/caffe2
- python_domodule python/torch
-}
-
src_install() {
cmake_src_install
@@ -156,8 +154,10 @@ src_install() {
doins "${BUILD_DIR}"/CMakeCache.txt
rm -rf python
- mkdir -p python/torch || die
+ mkdir -p python/torch/include || die
mv "${ED}"/usr/lib/python*/site-packages/caffe2 python/ || die
+ mv "${ED}"/usr/include/torch python/torch/include || die
cp torch/version.py python/torch/ || die
- python_foreach_impl python_install
+ python_domodule python/caffe2
+ python_domodule python/torch
}
[gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/files/
commit: 4e35b1fd5cf76fe594ebc10a3a3d0e874cb78e75
Author: Alfredo Tupone gentoo org>
AuthorDate: Fri Dec 23 11:05:52 2022 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Fri Dec 23 11:06:42 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e35b1fd
sci-libs/caffe2: remove -Werror
Closes: https://bugs.gentoo.org/886441
Signed-off-by: Alfredo Tupone gentoo.org>
sci-libs/caffe2/files/caffe2-1.11.0-gentoo.patch | 22 +-
1 file changed, 21 insertions(+), 1 deletion(-)
diff --git a/sci-libs/caffe2/files/caffe2-1.11.0-gentoo.patch
b/sci-libs/caffe2/files/caffe2-1.11.0-gentoo.patch
index addf1eb0bfba..059bcc2b9705 100644
--- a/sci-libs/caffe2/files/caffe2-1.11.0-gentoo.patch
+++ b/sci-libs/caffe2/files/caffe2-1.11.0-gentoo.patch
@@ -49,7 +49,7 @@
set(TORCH_PYTHON_COMPILE_DEFINITIONS)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -750,7 +750,7 @@
+@@ -777,7 +777,7 @@
# ---[ Build flags
if(NOT MSVC)
@@ -58,6 +58,26 @@
string(APPEND CMAKE_CXX_FLAGS " -Wno-narrowing")
# Eigen fails to build with some versions, so convert this to a warning
# Details at http://eigen.tuxfamily.org/bz/show_bug.cgi?id=1459
+@@ -783,7 +783,6 @@
+ # Details at http://eigen.tuxfamily.org/bz/show_bug.cgi?id=1459
+ string(APPEND CMAKE_CXX_FLAGS " -Wall")
+ string(APPEND CMAKE_CXX_FLAGS " -Wextra")
+- string(APPEND CMAKE_CXX_FLAGS " -Werror=return-type")
+ string(APPEND CMAKE_CXX_FLAGS " -Wno-missing-field-initializers")
+ string(APPEND CMAKE_CXX_FLAGS " -Wno-type-limits")
+ string(APPEND CMAKE_CXX_FLAGS " -Wno-array-bounds")
+@@ -883,11 +882,9 @@
+ string(APPEND CMAKE_CXX_FLAGS " -fno-trapping-math")
+ check_cxx_compiler_flag("-Werror=format" HAS_WERROR_FORMAT)
+ if(HAS_WERROR_FORMAT)
+-string(APPEND CMAKE_CXX_FLAGS " -Werror=format")
+ endif()
+ check_cxx_compiler_flag("-Werror=cast-function-type"
HAS_WERROR_CAST_FUNCTION_TYPE)
+ if(HAS_WERROR_CAST_FUNCTION_TYPE)
+-string(APPEND CMAKE_CXX_FLAGS " -Werror=cast-function-type")
+ endif()
+ check_cxx_compiler_flag("-Werror=sign-compare" HAS_WERROR_SIGN_COMPARE)
+ # This doesn't work globally so we use the test on specific
--- a/cmake/public/utils.cmake
+++ b/cmake/public/utils.cmake
@@ -512,8 +512,6 @@
[gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
commit: ae6b1d9d546691729c0b154c746260b025db5878 Author: Alfredo Tupone gentoo org> AuthorDate: Fri Dec 16 15:54:39 2022 + Commit: Alfredo Tupone gentoo org> CommitDate: Fri Dec 16 15:56:07 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae6b1d9d sci-libs/caffe2: fix deps Signed-off-by: Alfredo Tupone gentoo.org> sci-libs/caffe2/caffe2-1.12.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sci-libs/caffe2/caffe2-1.12.0.ebuild b/sci-libs/caffe2/caffe2-1.12.0.ebuild index ddf9e99a9ba2..035c81fabb3a 100644 --- a/sci-libs/caffe2/caffe2-1.12.0.ebuild +++ b/sci-libs/caffe2/caffe2-1.12.0.ebuild @@ -30,7 +30,7 @@ RDEPEND=" >=dev-cpp/glog-0.5.0 dev-libs/cpuinfo dev-libs/libfmt - dev-libs/protobuf + dev-libs/protobuf:= dev-libs/pthreadpool dev-libs/sleef sci-libs/lapack
[gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
commit: 3625a2f15847ca2daefbbb7c267840701886507b
Author: Alfredo Tupone gentoo org>
AuthorDate: Wed Nov 30 18:19:55 2022 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Wed Nov 30 18:19:55 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3625a2f1
sci-libs/caffe2: drop 1.11.0-r2
Signed-off-by: Alfredo Tupone gentoo.org>
sci-libs/caffe2/Manifest| 1 -
sci-libs/caffe2/caffe2-1.11.0-r2.ebuild | 160
2 files changed, 161 deletions(-)
diff --git a/sci-libs/caffe2/Manifest b/sci-libs/caffe2/Manifest
index 0d28654e641f..013309cd70ce 100644
--- a/sci-libs/caffe2/Manifest
+++ b/sci-libs/caffe2/Manifest
@@ -1,2 +1 @@
-DIST pytorch-1.11.0.tar.gz 20719323 BLAKE2B
24e7aaa2c26821d36f8092542de9d8d5ac85a619fb9fffb5131987958842afb1cad395780662d15f3411a7cc6ff83a445871960eca1e469fcbf0b9895d83d6e0
SHA512
2342eb7a1a241f5855a7cf12e11f62bc4baaa78d1d0864e53bfc946e783eb4addd05ca154a814d2376cd602098b5547e61c158d6eddb7cad5a9f3b0c1357adca
DIST pytorch-1.12.0.tar.gz 106286765 BLAKE2B
ff9bafedb35f859f7dccb9b606299cf9c345bdaa0deb87ecfe0c0c30c3c828414d989e1d9a243d9b7cd3f376d56a2f81c241ca2e3c9a8a2b30cddcdeddd3a5c7
SHA512
c9c748a2e0047daaaf199a1ba3198d2d1aee47f664170a9b34ccacd3deeb95f2070e4035eeb900012ef48dc62cf6fb6806f1a1dfe22de8c94892963076e593b7
diff --git a/sci-libs/caffe2/caffe2-1.11.0-r2.ebuild
b/sci-libs/caffe2/caffe2-1.11.0-r2.ebuild
deleted file mode 100644
index d5d2250da0f5..
--- a/sci-libs/caffe2/caffe2-1.11.0-r2.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit python-r1 cmake
-
-MYPN=pytorch
-MYP=${MYPN}-${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"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="cuda ffmpeg nnpack +numpy opencl opencv openmp qnnpack xnnpack"
-RESTRICT="test"
-REQUIRED_USE="
- ${PYTHON_REQUIRED_USE}
- ffmpeg? ( opencv )
-" # ?? ( cuda rocm )
-
-RDEPEND="
- ${PYTHON_DEPS}
- dev-cpp/gflags:=
- https://developer.nvidia.com/cuda-gpus;
- ewarn "or by running /opt/cuda/extras/demo_suite/deviceQuery |
grep 'CUDA Capability'"
- fi
-
- python_setup
- local mycmakeargs=(
- -DBUILD_CUSTOM_PROTOBUF=OFF
- -DBUILD_SHARED_LIBS=ON
-
- -DUSE_CCACHE=OFF
- -DUSE_CUDA=$(usex cuda)
- -DUSE_CUDNN=$(usex cuda)
- -DUSE_FAST_NVCC=$(usex cuda)
- -DTORCH_CUDA_ARCH_LIST="${TORCH_CUDA_ARCH_LIST:-3.5 7.0}"
- -DUSE_DISTRIBUTED=OFF
- -DUSE_FAKELOWP=OFF
- -DUSE_FBGEMM=OFF # TODO
- -DUSE_FFMPEG=$(usex ffmpeg)
- -DUSE_GFLAGS=ON
- -DUSE_GLOG=ON
- -DUSE_GLOO=OFF
- -DUSE_KINETO=OFF # TODO
- -DUSE_LEVELDB=OFF
- -DUSE_MAGMA=OFF # TODO: In GURU as sci-libs/magma
- -DUSE_MKLDNN=OFF
- -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_PYTORCH_QNNPACK=OFF
- -DUSE_NUMPY=$(usex numpy)
- -DUSE_OPENCL=$(usex opencl)
- -DUSE_OPENCV=$(usex opencv)
- -DUSE_OPENMP=$(usex openmp)
- -DUSE_ROCM=OFF # TODO
- -DUSE_SYSTEM_CPUINFO=ON
- -DUSE_BREAKPAD=OFF # TODO
- -DUSE_SYSTEM_BIND11=ON
- -DPYBIND11_PYTHON_VERSION="${EPYTHON#python}"
- -DPYTHON_EXECUTABLE="${PYTHON}"
- -DUSE_SYSTEM_EIGEN_INSTALL=ON
- -DUSE_SYSTEM_PTHREADPOOL=ON
- -DUSE_SYSTEM_FXDIV=ON
- -DUSE_SYSTEM_FP16=ON
- -DUSE_SYSTEM_ONNX=ON
- -DUSE_SYSTEM_SLEEF=ON
- -DUSE_TENSORPIPE=OFF
-
- -Wno-dev
- -DTORCH_INSTALL_LIB_DIR="${EPREFIX}"/usr/$(get_libdir)
- -DLIBSHM_INSTALL_LIB_SUBDIR="${EPREFIX}"/usr/$(get_libdir)
- )
- cmake_src_configure
-}
-
-python_install() {
- python_domodule python/caffe2
- python_domodule python/torch
-}
-
-src_install() {
- cmake_src_install
-
- insinto "/var/lib/${PN}"
- doins "${BUILD_DIR}"/CMakeCache.txt
-
- rm -rf python
- mkdir -p python/torch || die
- mv "${ED}"/usr/lib/python*/site-packages/caffe2 python/ || die
- cp torch/version.py python/torch/ || die
- python_foreach_impl python_install
-}
[gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
commit: 3f3bd41414e681c097158fd4edadf2461b0b9326
Author: Marek Behún kernel org>
AuthorDate: Thu Nov 10 12:47:55 2022 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Thu Nov 10 16:50:21 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f3bd414
sci-libs/caffe2: Fix installation for Gentoo Prefix
Add EPREFIX to the TORCH_INSTALL_LIB_DIR and LIBSHM_INSTALL_LIB_SUBDIR
library directories in src_configure() and use the ED instead of D
variable in src_install() to fix the installation when installing in
Gentoo Prefix.
Signed-off-by: Marek Behún kernel.org>
Closes: https://github.com/gentoo/gentoo/pull/28208
Signed-off-by: Alfredo Tupone gentoo.org>
sci-libs/caffe2/caffe2-1.11.0-r2.ebuild | 6 +++---
sci-libs/caffe2/caffe2-1.12.0.ebuild| 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/sci-libs/caffe2/caffe2-1.11.0-r2.ebuild
b/sci-libs/caffe2/caffe2-1.11.0-r2.ebuild
index 6ae8a8dc9187..d5d2250da0f5 100644
--- a/sci-libs/caffe2/caffe2-1.11.0-r2.ebuild
+++ b/sci-libs/caffe2/caffe2-1.11.0-r2.ebuild
@@ -135,8 +135,8 @@ src_configure() {
-DUSE_TENSORPIPE=OFF
-Wno-dev
- -DTORCH_INSTALL_LIB_DIR=/usr/$(get_libdir)
- -DLIBSHM_INSTALL_LIB_SUBDIR=/usr/$(get_libdir)
+ -DTORCH_INSTALL_LIB_DIR="${EPREFIX}"/usr/$(get_libdir)
+ -DLIBSHM_INSTALL_LIB_SUBDIR="${EPREFIX}"/usr/$(get_libdir)
)
cmake_src_configure
}
@@ -154,7 +154,7 @@ src_install() {
rm -rf python
mkdir -p python/torch || die
- mv "${D}"/usr/lib/python*/site-packages/caffe2 python/ || die
+ mv "${ED}"/usr/lib/python*/site-packages/caffe2 python/ || die
cp torch/version.py python/torch/ || die
python_foreach_impl python_install
}
diff --git a/sci-libs/caffe2/caffe2-1.12.0.ebuild
b/sci-libs/caffe2/caffe2-1.12.0.ebuild
index 366c29f98b7f..ddf9e99a9ba2 100644
--- a/sci-libs/caffe2/caffe2-1.12.0.ebuild
+++ b/sci-libs/caffe2/caffe2-1.12.0.ebuild
@@ -136,8 +136,8 @@ src_configure() {
-DUSE_TENSORPIPE=OFF
-Wno-dev
- -DTORCH_INSTALL_LIB_DIR=/usr/$(get_libdir)
- -DLIBSHM_INSTALL_LIB_SUBDIR=/usr/$(get_libdir)
+ -DTORCH_INSTALL_LIB_DIR="${EPREFIX}"/usr/$(get_libdir)
+ -DLIBSHM_INSTALL_LIB_SUBDIR="${EPREFIX}"/usr/$(get_libdir)
)
use cuda && addpredict "/dev/nvidiactl" # bug 867706
@@ -157,7 +157,7 @@ src_install() {
rm -rf python
mkdir -p python/torch || die
- mv "${D}"/usr/lib/python*/site-packages/caffe2 python/ || die
+ mv "${ED}"/usr/lib/python*/site-packages/caffe2 python/ || die
cp torch/version.py python/torch/ || die
python_foreach_impl python_install
}
[gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/files/
commit: bdcc968d38d7f1a211f1a96830e2bdf32e7c8f55
Author: David Seifert gentoo org>
AuthorDate: Sun Oct 30 11:12:49 2022 +
Commit: David Seifert gentoo org>
CommitDate: Sun Oct 30 11:12:49 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bdcc968d
sci-libs/caffe2/files: [QA] use git-format-patch style patches
Signed-off-by: David Seifert gentoo.org>
sci-libs/caffe2/files/caffe2-1.11.0-gentoo.patch | 32 +++---
.../caffe2/files/caffe2-1.12.0-glog-0.6.0.patch| 4 +--
.../caffe2/files/caffe2-1.12.0-install-dirs.patch | 22 ++-
3 files changed, 20 insertions(+), 38 deletions(-)
diff --git a/sci-libs/caffe2/files/caffe2-1.11.0-gentoo.patch
b/sci-libs/caffe2/files/caffe2-1.11.0-gentoo.patch
index 505af5e6695c..addf1eb0bfba 100644
--- a/sci-libs/caffe2/files/caffe2-1.11.0-gentoo.patch
+++ b/sci-libs/caffe2/files/caffe2-1.11.0-gentoo.patch
@@ -1,5 +1,5 @@
a/cmake/Dependencies.cmake 2022-06-17 22:12:34.451841710 +0200
-+++ b/cmake/Dependencies.cmake 2022-06-17 22:12:48.302786501 +0200
+--- a/cmake/Dependencies.cmake
b/cmake/Dependencies.cmake
@@ -1512,7 +1512,6 @@
if(NOT USE_SYSTEM_ONNX)
add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/../third_party/onnx
EXCLUDE_FROM_ALL)
@@ -26,8 +26,8 @@
set(BUILD_SHARED_LIBS ${TEMP_BUILD_SHARED_LIBS} CACHE BOOL "Build shared
libs" FORCE)
if(USE_BREAKPAD)
a/c10/CMakeLists.txt 2022-06-17 22:40:53.573306905 +0200
-+++ b/c10/CMakeLists.txt 2022-06-17 22:41:16.920219686 +0200
+--- a/c10/CMakeLists.txt
b/c10/CMakeLists.txt
@@ -59,7 +59,7 @@
if(${USE_GLOG})
target_link_libraries(c10 PUBLIC glog::glog)
@@ -37,8 +37,8 @@
find_package(Backtrace)
if(Backtrace_FOUND)
a/torch/CMakeLists.txt 2022-06-17 22:42:20.396982644 +0200
-+++ b/torch/CMakeLists.txt 2022-06-17 22:43:20.214759326 +0200
+--- a/torch/CMakeLists.txt
b/torch/CMakeLists.txt
@@ -82,7 +82,6 @@
set(TORCH_PYTHON_LINK_LIBRARIES
@@ -47,8 +47,8 @@
ATEN_CPU_FILES_GEN_LIB)
set(TORCH_PYTHON_COMPILE_DEFINITIONS)
a/CMakeLists.txt 2022-06-18 20:35:01.451116185 +0200
-+++ b/CMakeLists.txt 2022-06-18 20:35:08.219023569 +0200
+--- a/CMakeLists.txt
b/CMakeLists.txt
@@ -750,7 +750,7 @@
# ---[ Build flags
@@ -58,8 +58,8 @@
string(APPEND CMAKE_CXX_FLAGS " -Wno-narrowing")
# Eigen fails to build with some versions, so convert this to a warning
# Details at http://eigen.tuxfamily.org/bz/show_bug.cgi?id=1459
a/cmake/public/utils.cmake 2022-06-18 20:50:39.314263395 +0200
-+++ b/cmake/public/utils.cmake 2022-06-18 20:51:49.611291709 +0200
+--- a/cmake/public/utils.cmake
b/cmake/public/utils.cmake
@@ -512,8 +512,6 @@
endif()
@@ -69,8 +69,8 @@
endfunction()
a/cmake/Codegen.cmake 2022-06-18 21:33:13.366381817 +0200
-+++ b/cmake/Codegen.cmake 2022-06-18 21:33:30.249157610 +0200
+--- a/cmake/Codegen.cmake
b/cmake/Codegen.cmake
@@ -57,7 +57,7 @@
if(MSVC)
set(OPT_FLAG "/fp:strict ")
@@ -80,8 +80,8 @@
if("${CMAKE_BUILD_TYPE}" MATCHES "Debug")
set(OPT_FLAG " ")
endif()
a/caffe2/CMakeLists.txt2022-07-01 21:56:49.643490049 +0200
-+++ b/caffe2/CMakeLists.txt2022-07-01 21:57:17.091489479 +0200
+--- a/caffe2/CMakeLists.txt
b/caffe2/CMakeLists.txt
@@ -109,7 +109,7 @@
# Note: the folders that are being commented out have not been properly
# addressed yet.
@@ -99,8 +99,8 @@
endif()
# ==
a/cmake/External/nnpack.cmake 2022-07-02 21:56:54.905696921 +0200
-+++ b/cmake/External/nnpack.cmake 2022-07-02 21:57:03.665696739 +0200
+--- a/cmake/External/nnpack.cmake
b/cmake/External/nnpack.cmake
@@ -58,7 +58,7 @@
set(PTHREADPOOL_SOURCE_DIR "${CAFFE2_THIRD_PARTY_ROOT}/pthreadpool" CACHE
STRING "pthreadpool source directory")
set(GOOGLETEST_SOURCE_DIR "${CAFFE2_THIRD_PARTY_ROOT}/googletest" CACHE
STRING "Google Test source directory")
diff --git a/sci-libs/caffe2/files/caffe2-1.12.0-glog-0.6.0.patch
b/sci-libs/caffe2/files/caffe2-1.12.0-glog-0.6.0.patch
index a821ebedf7b7..6c06d2cca654 100644
--- a/sci-libs/caffe2/files/caffe2-1.12.0-glog-0.6.0.patch
+++ b/sci-libs/caffe2/files/caffe2-1.12.0-glog-0.6.0.patch
@@ -1,7 +1,7 @@
https://github.com/pytorch/pytorch/issues/58054
/c10/util/Logging.cpp
-+++ /c10/util/Logging.cpp
+--- a/c10/util/Logging.cpp
b/c10/util/Logging.cpp
@@ -192,23 +192,13 @@
google::GLOG_WARNING,
"The minimum log level that caffe2 will output.");
diff --git a/sci-libs/caffe2/files/caffe2-1.12.0-install-dirs.patch
b/sci-libs/caffe2/files/caffe2-1.12.0-install-dirs.patch
index d9c403d5882e..078e33f45020 100644
--- a/sci-libs/caffe2/files/caffe2-1.12.0-install-dirs.patch
+++ b/sci-libs/caffe2/files/caffe2-1.12.0-install-dirs.patch
@@ -1,5 +1,5 @@
a/c10/CMakeLists.txt 2022-06-19 09:57:16.776536871 +0200
-+++
[gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
commit: dfb44a20d723cace8c89d65437c4456bfba39f91
Author: James Beddek posteo de>
AuthorDate: Wed Sep 14 12:19:47 2022 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Wed Sep 14 20:51:17 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dfb44a20
sci-libs/caffe2: use addpredict /dev/nvidiactl for CUDA version check
Closes: https://bugs.gentoo.org/867706
Signed-off-by: James Beddek posteo.de>
Closes: https://github.com/gentoo/gentoo/pull/27253
Signed-off-by: Alfredo Tupone gentoo.org>
sci-libs/caffe2/caffe2-1.12.0.ebuild | 2 ++
1 file changed, 2 insertions(+)
diff --git a/sci-libs/caffe2/caffe2-1.12.0.ebuild
b/sci-libs/caffe2/caffe2-1.12.0.ebuild
index 0a44b6824c3c..366c29f98b7f 100644
--- a/sci-libs/caffe2/caffe2-1.12.0.ebuild
+++ b/sci-libs/caffe2/caffe2-1.12.0.ebuild
@@ -139,6 +139,8 @@ src_configure() {
-DTORCH_INSTALL_LIB_DIR=/usr/$(get_libdir)
-DLIBSHM_INSTALL_LIB_SUBDIR=/usr/$(get_libdir)
)
+
+ use cuda && addpredict "/dev/nvidiactl" # bug 867706
cmake_src_configure
}
[gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/files/, sci-libs/caffe2/
commit: 3f34c4d94727a44935b381b06d00367a2755930a
Author: Alfredo Tupone gentoo org>
AuthorDate: Mon Sep 5 06:40:29 2022 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Mon Sep 5 06:40:29 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f34c4d9
sci-libs/caffe2: support glog-0.5.0
Closes: https://bugs.gentoo.org/865681
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Alfredo Tupone gentoo.org>
sci-libs/caffe2/caffe2-1.12.0.ebuild | 3 ++-
.../caffe2/files/caffe2-1.12.0-glog-0.6.0.patch| 29 ++
2 files changed, 31 insertions(+), 1 deletion(-)
diff --git a/sci-libs/caffe2/caffe2-1.12.0.ebuild
b/sci-libs/caffe2/caffe2-1.12.0.ebuild
index 08e81ce1c8ab..0a44b6824c3c 100644
--- a/sci-libs/caffe2/caffe2-1.12.0.ebuild
+++ b/sci-libs/caffe2/caffe2-1.12.0.ebuild
@@ -27,7 +27,7 @@ REQUIRED_USE="
RDEPEND="
${PYTHON_DEPS}
dev-cpp/gflags:=
- =dev-cpp/glog-0.5.0
dev-libs/cpuinfo
dev-libs/libfmt
dev-libs/protobuf
@@ -66,6 +66,7 @@ S="${WORKDIR}"/${MYP}
PATCHES=(
"${FILESDIR}"/${PN}-1.11.0-gentoo.patch
"${FILESDIR}"/${PN}-1.12.0-install-dirs.patch
+ "${FILESDIR}"/${P}-glog-0.6.0.patch
)
src_prepare() {
diff --git a/sci-libs/caffe2/files/caffe2-1.12.0-glog-0.6.0.patch
b/sci-libs/caffe2/files/caffe2-1.12.0-glog-0.6.0.patch
new file mode 100644
index ..a821ebedf7b7
--- /dev/null
+++ b/sci-libs/caffe2/files/caffe2-1.12.0-glog-0.6.0.patch
@@ -0,0 +1,29 @@
+https://github.com/pytorch/pytorch/issues/58054
+
+--- /c10/util/Logging.cpp
/c10/util/Logging.cpp
+@@ -192,23 +192,13 @@
+ google::GLOG_WARNING,
+ "The minimum log level that caffe2 will output.");
+
+-// Google glog's api does not have an external function that allows one to
check
+-// if glog is initialized or not. It does have an internal function - so we
are
+-// declaring it here. This is a hack but has been used by a bunch of others
too
+-// (e.g. Torch).
+-namespace google {
+-namespace glog_internal_namespace_ {
+-bool IsGoogleLoggingInitialized();
+-} // namespace glog_internal_namespace_
+-} // namespace google
+-
+ namespace c10 {
+ namespace {
+
+ void initGoogleLogging(char const* name) {
+ #if !defined(_MSC_VER)
+ // This trick can only be used on UNIX platforms
+- if (!::google::glog_internal_namespace_::IsGoogleLoggingInitialized())
++ if (!::google::IsGoogleLoggingInitialized())
+ #endif
+ {
+ ::google::InitGoogleLogging(name);
[gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
commit: 63d4f2bfcfd5e696451103703854e9485c381314
Author: Alfredo Tupone gentoo org>
AuthorDate: Mon Aug 29 06:41:51 2022 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Mon Aug 29 06:41:51 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63d4f2bf
sci-libs/caffe2: no good for python 3.11
Closes: https://bugs.gentoo.org/864769
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Alfredo Tupone gentoo.org>
sci-libs/caffe2/caffe2-1.11.0-r2.ebuild | 2 +-
sci-libs/caffe2/caffe2-1.12.0.ebuild| 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sci-libs/caffe2/caffe2-1.11.0-r2.ebuild
b/sci-libs/caffe2/caffe2-1.11.0-r2.ebuild
index b5c92d8e88df..6ae8a8dc9187 100644
--- a/sci-libs/caffe2/caffe2-1.11.0-r2.ebuild
+++ b/sci-libs/caffe2/caffe2-1.11.0-r2.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit python-r1 cmake
MYPN=pytorch
diff --git a/sci-libs/caffe2/caffe2-1.12.0.ebuild
b/sci-libs/caffe2/caffe2-1.12.0.ebuild
index d8b678dbc4e8..08e81ce1c8ab 100644
--- a/sci-libs/caffe2/caffe2-1.12.0.ebuild
+++ b/sci-libs/caffe2/caffe2-1.12.0.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit python-r1 cmake flag-o-matic
MYPN=pytorch
[gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
commit: 7dd94587118b7333242a46b4f97c22ed69d6fc0d
Author: Alfredo Tupone gentoo org>
AuthorDate: Thu Aug 4 07:59:56 2022 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Thu Aug 4 07:59:56 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7dd94587
sci-libs/caffe2: filter lto
Closes: https://bugs.gentoo.org/862672
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Alfredo Tupone gentoo.org>
sci-libs/caffe2/caffe2-1.11.0-r2.ebuild | 2 +-
sci-libs/caffe2/caffe2-1.12.0.ebuild| 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/sci-libs/caffe2/caffe2-1.11.0-r2.ebuild
b/sci-libs/caffe2/caffe2-1.11.0-r2.ebuild
index 6ae8a8dc9187..b5c92d8e88df 100644
--- a/sci-libs/caffe2/caffe2-1.11.0-r2.ebuild
+++ b/sci-libs/caffe2/caffe2-1.11.0-r2.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
inherit python-r1 cmake
MYPN=pytorch
diff --git a/sci-libs/caffe2/caffe2-1.12.0.ebuild
b/sci-libs/caffe2/caffe2-1.12.0.ebuild
index a7bc65b359da..d8b678dbc4e8 100644
--- a/sci-libs/caffe2/caffe2-1.12.0.ebuild
+++ b/sci-libs/caffe2/caffe2-1.12.0.ebuild
@@ -3,8 +3,8 @@
EAPI=8
-PYTHON_COMPAT=( python3_{8..10} )
-inherit python-r1 cmake
+PYTHON_COMPAT=( python3_{8..11} )
+inherit python-r1 cmake flag-o-matic
MYPN=pytorch
MYP=${MYPN}-${PV}
@@ -69,6 +69,7 @@ PATCHES=(
)
src_prepare() {
+ filter-lto #bug 862672
cmake_src_prepare
pushd torch/csrc/jit/serialization || die
flatc --cpp --gen-mutable --scoped-enums mobile_bytecode.fbs || die
[gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
commit: 1c2af9aa14e6a116c72cc0722948988ccffc65cb
Author: James Beddek posteo de>
AuthorDate: Sun Jul 3 07:38:50 2022 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Sun Jul 3 10:44:38 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c2af9aa
sci-libs/caffe2: add support for cuda
add missing dev-libs/FXdiv dependency
use gflags
use glog <0.5.0 https://github.com/pytorch/pytorch/issues/58054
add myself as a maintainer
Signed-off-by: James Beddek posteo.de>
Signed-off-by: Alfredo Tupone gentoo.org>
sci-libs/caffe2/caffe2-1.11.0-r2.ebuild | 37 ++---
sci-libs/caffe2/caffe2-1.12.0.ebuild| 37 ++---
sci-libs/caffe2/metadata.xml| 5 +
3 files changed, 63 insertions(+), 16 deletions(-)
diff --git a/sci-libs/caffe2/caffe2-1.11.0-r2.ebuild
b/sci-libs/caffe2/caffe2-1.11.0-r2.ebuild
index d45e26d90d6d..6ae8a8dc9187 100644
--- a/sci-libs/caffe2/caffe2-1.11.0-r2.ebuild
+++ b/sci-libs/caffe2/caffe2-1.11.0-r2.ebuild
@@ -17,15 +17,17 @@
SRC_URI="https://github.com/pytorch/${MYPN}/archive/refs/tags/v${PV}.tar.gz
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64"
-IUSE="ffmpeg nnpack +numpy opencl opencv openmp qnnpack xnnpack"
+IUSE="cuda ffmpeg nnpack +numpy opencl opencv openmp qnnpack xnnpack"
RESTRICT="test"
REQUIRED_USE="
${PYTHON_REQUIRED_USE}
ffmpeg? ( opencv )
-"
+" # ?? ( cuda rocm )
RDEPEND="
${PYTHON_DEPS}
+ dev-cpp/gflags:=
+ https://developer.nvidia.com/cuda-gpus;
+ ewarn "or by running /opt/cuda/extras/demo_suite/deviceQuery |
grep 'CUDA Capability'"
+ fi
+
python_setup
local mycmakeargs=(
-DBUILD_CUSTOM_PROTOBUF=OFF
-DBUILD_SHARED_LIBS=ON
-DUSE_CCACHE=OFF
- -DUSE_CUDA=OFF # TODO
- -DUSE_CUDNN=OFF # TODO
- -DUSE_FAST_NVCC=OFF # TODO
- #-DCUDA_ARCH_LIST="${TORCH_CUDA_ARCH_LIST:-Auto}"
+ -DUSE_CUDA=$(usex cuda)
+ -DUSE_CUDNN=$(usex cuda)
+ -DUSE_FAST_NVCC=$(usex cuda)
+ -DTORCH_CUDA_ARCH_LIST="${TORCH_CUDA_ARCH_LIST:-3.5 7.0}"
-DUSE_DISTRIBUTED=OFF
-DUSE_FAKELOWP=OFF
-DUSE_FBGEMM=OFF # TODO
-DUSE_FFMPEG=$(usex ffmpeg)
- -DUSE_GFLAGS=OFF # TODO
- -DUSE_GLOG=OFF # TODO
+ -DUSE_GFLAGS=ON
+ -DUSE_GLOG=ON
-DUSE_GLOO=OFF
-DUSE_KINETO=OFF # TODO
-DUSE_LEVELDB=OFF
diff --git a/sci-libs/caffe2/caffe2-1.12.0.ebuild
b/sci-libs/caffe2/caffe2-1.12.0.ebuild
index c1e033bbfc7b..a7bc65b359da 100644
--- a/sci-libs/caffe2/caffe2-1.12.0.ebuild
+++ b/sci-libs/caffe2/caffe2-1.12.0.ebuild
@@ -17,15 +17,17 @@
SRC_URI="https://github.com/pytorch/${MYPN}/archive/refs/tags/v${PV}.tar.gz
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64"
-IUSE="ffmpeg nnpack +numpy opencl opencv openmp qnnpack xnnpack"
+IUSE="cuda ffmpeg nnpack +numpy opencl opencv openmp qnnpack xnnpack"
RESTRICT="test"
REQUIRED_USE="
${PYTHON_REQUIRED_USE}
ffmpeg? ( opencv )
-"
+" # ?? ( cuda rocm )
RDEPEND="
${PYTHON_DEPS}
+ dev-cpp/gflags:=
+ https://developer.nvidia.com/cuda-gpus;
+ ewarn "or by running /opt/cuda/extras/demo_suite/deviceQuery |
grep 'CUDA Capability'"
+ fi
+
python_setup
local mycmakeargs=(
-DBUILD_CUSTOM_PROTOBUF=OFF
-DBUILD_SHARED_LIBS=ON
-DUSE_CCACHE=OFF
- -DUSE_CUDA=OFF # TODO
- -DUSE_CUDNN=OFF # TODO
- -DUSE_FAST_NVCC=OFF # TODO
- #-DCUDA_ARCH_LIST="${TORCH_CUDA_ARCH_LIST:-Auto}"
+ -DUSE_CUDA=$(usex cuda)
+ -DUSE_CUDNN=$(usex cuda)
+ -DUSE_FAST_NVCC=$(usex cuda)
+ -DTORCH_CUDA_ARCH_LIST="${TORCH_CUDA_ARCH_LIST:-3.5 7.0}"
-DUSE_DISTRIBUTED=OFF
-DUSE_FAKELOWP=OFF
-DUSE_FBGEMM=OFF # TODO
-DUSE_FFMPEG=$(usex ffmpeg)
- -DUSE_GFLAGS=OFF # TODO
- -DUSE_GLOG=OFF # TODO
+ -DUSE_GFLAGS=ON
+ -DUSE_GLOG=ON
-DUSE_GLOO=OFF
-DUSE_KINETO=OFF # TODO
-DUSE_LEVELDB=OFF
diff --git a/sci-libs/caffe2/metadata.xml b/sci-libs/caffe2/metadata.xml
index 48cf68b11224..25a171ff1680 100644
--- a/sci-libs/caffe2/metadata.xml
+++ b/sci-libs/caffe2/metadata.xml
@@ -5,7 +5,12 @@
tup...@gentoo.org
Tupone Alfredo
+
+ tel...@posteo.de
+ James Beddek
+
+ Add support for CUDA processing
Add support for video processing
operators
Use NNPACK
Add support for math operations through
numpy
[gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/files/, sci-libs/caffe2/
commit: 7a3d0a4e3007f19ff60d86b8bcfbf40323c610aa
Author: James Beddek posteo de>
AuthorDate: Sun Jul 3 06:47:31 2022 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Sun Jul 3 09:56:50 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a3d0a4e
sci-libs/caffe2: add 1.12.0
add support fot QNNPACK, dev-python/numpy, opencv, ffmpeg, openmp, opencl
add patch to fix install dirs
Signed-off-by: James Beddek posteo.de>
Signed-off-by: Alfredo Tupone gentoo.org>
sci-libs/caffe2/Manifest | 1 +
sci-libs/caffe2/caffe2-1.11.0-r2.ebuild| 84
...affe2-1.11.0-r2.ebuild => caffe2-1.12.0.ebuild} | 83
sci-libs/caffe2/files/caffe2-1.11.0-gentoo.patch | 31 +++--
.../caffe2/files/caffe2-1.12.0-install-dirs.patch | 147 +
sci-libs/caffe2/metadata.xml | 6 +
6 files changed, 291 insertions(+), 61 deletions(-)
diff --git a/sci-libs/caffe2/Manifest b/sci-libs/caffe2/Manifest
index ae4d5567b7fc..0d28654e641f 100644
--- a/sci-libs/caffe2/Manifest
+++ b/sci-libs/caffe2/Manifest
@@ -1 +1,2 @@
DIST pytorch-1.11.0.tar.gz 20719323 BLAKE2B
24e7aaa2c26821d36f8092542de9d8d5ac85a619fb9fffb5131987958842afb1cad395780662d15f3411a7cc6ff83a445871960eca1e469fcbf0b9895d83d6e0
SHA512
2342eb7a1a241f5855a7cf12e11f62bc4baaa78d1d0864e53bfc946e783eb4addd05ca154a814d2376cd602098b5547e61c158d6eddb7cad5a9f3b0c1357adca
+DIST pytorch-1.12.0.tar.gz 106286765 BLAKE2B
ff9bafedb35f859f7dccb9b606299cf9c345bdaa0deb87ecfe0c0c30c3c828414d989e1d9a243d9b7cd3f376d56a2f81c241ca2e3c9a8a2b30cddcdeddd3a5c7
SHA512
c9c748a2e0047daaaf199a1ba3198d2d1aee47f664170a9b34ccacd3deeb95f2070e4035eeb900012ef48dc62cf6fb6806f1a1dfe22de8c94892963076e593b7
diff --git a/sci-libs/caffe2/caffe2-1.11.0-r2.ebuild
b/sci-libs/caffe2/caffe2-1.11.0-r2.ebuild
index c59a498341cd..d45e26d90d6d 100644
--- a/sci-libs/caffe2/caffe2-1.11.0-r2.ebuild
+++ b/sci-libs/caffe2/caffe2-1.11.0-r2.ebuild
@@ -17,23 +17,35 @@
SRC_URI="https://github.com/pytorch/${MYPN}/archive/refs/tags/v${PV}.tar.gz
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64"
+IUSE="ffmpeg nnpack +numpy opencl opencv openmp qnnpack xnnpack"
RESTRICT="test"
-IUSE="nnpack xnnpack"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+REQUIRED_USE="
+ ${PYTHON_REQUIRED_USE}
+ ffmpeg? ( opencv )
+"
RDEPEND="
${PYTHON_DEPS}
dev-libs/cpuinfo
dev-libs/libfmt
dev-libs/protobuf
+ dev-libs/pthreadpool
dev-libs/sleef
sci-libs/lapack
sci-libs/onnx
sci-libs/foxi
+ ffmpeg? ( media-video/ffmpeg:= )
nnpack? ( sci-libs/NNPACK )
+ numpy? ( dev-python/numpy[${PYTHON_USEDEP}] )
+ opencl? ( virtual/opencl )
+ opencv? ( media-libs/opencv:= )
+ qnnpack? ( sci-libs/QNNPACK )
xnnpack? ( sci-libs/XNNPACK )
"
-DEPEND="${RDEPEND}
+DEPEND="
+ ${RDEPEND}
+ dev-cpp/eigen
+ dev-libs/psimd
dev-libs/FP16
dev-libs/pocketfft
dev-libs/flatbuffers
@@ -43,7 +55,10 @@ DEPEND="${RDEPEND}
S="${WORKDIR}"/${MYP}
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.11.0-gentoo.patch
+ "${FILESDIR}"/${PN}-1.12.0-install-dirs.patch
+)
src_prepare() {
cmake_src_prepare
@@ -55,33 +70,52 @@ src_prepare() {
src_configure() {
python_setup
local mycmakeargs=(
- -DUSE_KINETO=OFF
- -DUSE_SYSTEM_SLEEF=ON
- -DUSE_BREAKPAD=OFF
- -DUSE_SYSTEM_ONNX=ON
- -DUSE_TENSORPIPE=OFF
+ -DBUILD_CUSTOM_PROTOBUF=OFF
+ -DBUILD_SHARED_LIBS=ON
+
+ -DUSE_CCACHE=OFF
+ -DUSE_CUDA=OFF # TODO
+ -DUSE_CUDNN=OFF # TODO
+ -DUSE_FAST_NVCC=OFF # TODO
+ #-DCUDA_ARCH_LIST="${TORCH_CUDA_ARCH_LIST:-Auto}"
+ -DUSE_DISTRIBUTED=OFF
+ -DUSE_FAKELOWP=OFF
+ -DUSE_FBGEMM=OFF # TODO
+ -DUSE_FFMPEG=$(usex ffmpeg)
+ -DUSE_GFLAGS=OFF # TODO
+ -DUSE_GLOG=OFF # TODO
-DUSE_GLOO=OFF
- -DUSE_SYSTEM_FP16=ON
- -DUSE_FBGEMM=OFF
+ -DUSE_KINETO=OFF # TODO
+ -DUSE_LEVELDB=OFF
+ -DUSE_MAGMA=OFF # TODO: In GURU as sci-libs/magma
+ -DUSE_MKLDNN=OFF
+ -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_PYTORCH_QNNPACK=OFF
- -DUSE_QNNPACK=OFF
+ -DUSE_NUMPY=$(usex numpy)
+ -DUSE_OPENCL=$(usex opencl)
+ -DUSE_OPENCV=$(usex opencv)
+ -DUSE_OPENMP=$(usex openmp)
+ -DUSE_ROCM=OFF # TODO
[gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/files/, sci-libs/caffe2/
commit: 0f9a010a044de133417cbd56f63c32692451732c
Author: Alfredo Tupone gentoo org>
AuthorDate: Sat Jul 2 21:12:40 2022 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Sat Jul 2 21:12:40 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f9a010a
sci-libs/caffe2: add support for nnpack
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Alfredo Tupone gentoo.org>
.../{caffe2-1.11.0-r1.ebuild => caffe2-1.11.0-r2.ebuild} | 5 +++--
sci-libs/caffe2/files/caffe2-1.11.0-gentoo.patch | 11 +++
sci-libs/caffe2/metadata.xml | 1 +
3 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/sci-libs/caffe2/caffe2-1.11.0-r1.ebuild
b/sci-libs/caffe2/caffe2-1.11.0-r2.ebuild
similarity index 96%
rename from sci-libs/caffe2/caffe2-1.11.0-r1.ebuild
rename to sci-libs/caffe2/caffe2-1.11.0-r2.ebuild
index d48fb9082441..c59a498341cd 100644
--- a/sci-libs/caffe2/caffe2-1.11.0-r1.ebuild
+++ b/sci-libs/caffe2/caffe2-1.11.0-r2.ebuild
@@ -18,7 +18,7 @@ LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64"
RESTRICT="test"
-IUSE="xnnpack"
+IUSE="nnpack xnnpack"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND="
@@ -30,6 +30,7 @@ RDEPEND="
sci-libs/lapack
sci-libs/onnx
sci-libs/foxi
+ nnpack? ( sci-libs/NNPACK )
xnnpack? ( sci-libs/XNNPACK )
"
DEPEND="${RDEPEND}
@@ -62,7 +63,6 @@ src_configure() {
-DUSE_GLOO=OFF
-DUSE_SYSTEM_FP16=ON
-DUSE_FBGEMM=OFF
- -DUSE_NNPACK=OFF
-DUSE_PYTORCH_QNNPACK=OFF
-DUSE_QNNPACK=OFF
-DUSE_SYSTEM_CPUINFO=ON
@@ -81,6 +81,7 @@ src_configure() {
-DUSE_SYSTEM_FXDIV=ON
-DUSE_XNNPACK=$(usex xnnpack ON OFF)
-DUSE_SYSTEM_XNNPACK=$(usex xnnpack ON OFF)
+ -DUSE_NNPACK=$(usex nnpack ON OFF)
)
cmake_src_configure
}
diff --git a/sci-libs/caffe2/files/caffe2-1.11.0-gentoo.patch
b/sci-libs/caffe2/files/caffe2-1.11.0-gentoo.patch
index f34216ea0970..b6b35e2329e8 100644
--- a/sci-libs/caffe2/files/caffe2-1.11.0-gentoo.patch
+++ b/sci-libs/caffe2/files/caffe2-1.11.0-gentoo.patch
@@ -110,3 +110,14 @@
endif()
# ==
+--- a/cmake/External/nnpack.cmake 2022-07-02 21:56:54.905696921 +0200
b/cmake/External/nnpack.cmake 2022-07-02 21:57:03.665696739 +0200
+@@ -58,7 +58,7 @@
+ set(PTHREADPOOL_SOURCE_DIR "${CAFFE2_THIRD_PARTY_ROOT}/pthreadpool" CACHE
STRING "pthreadpool source directory")
+ set(GOOGLETEST_SOURCE_DIR "${CAFFE2_THIRD_PARTY_ROOT}/googletest" CACHE
STRING "Google Test source directory")
+
+- if(NOT TARGET nnpack)
++ if(FALSE)
+ if(NOT USE_SYSTEM_PTHREADPOOL AND USE_INTERNAL_PTHREADPOOL_IMPL)
+ set(NNPACK_CUSTOM_THREADPOOL ON CACHE BOOL "")
+ endif()
diff --git a/sci-libs/caffe2/metadata.xml b/sci-libs/caffe2/metadata.xml
index bdd5f0fe..da10df6e0739 100644
--- a/sci-libs/caffe2/metadata.xml
+++ b/sci-libs/caffe2/metadata.xml
@@ -6,6 +6,7 @@
Tupone Alfredo
+ Use NNPACK
Use XNNPACK
[gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
commit: f5f020cc9a1d2505c5482637a2a95d85566aaa78
Author: Alfredo Tupone gentoo org>
AuthorDate: Sat Jul 2 16:20:27 2022 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Sat Jul 2 16:20:27 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5f020cc
sci-libs/caffe2: fix configure for xnnpack
Closes: https://bugs.gentoo.org/855860
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Alfredo Tupone gentoo.org>
sci-libs/caffe2/caffe2-1.11.0-r1.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sci-libs/caffe2/caffe2-1.11.0-r1.ebuild
b/sci-libs/caffe2/caffe2-1.11.0-r1.ebuild
index 137c5df60ebe..d48fb9082441 100644
--- a/sci-libs/caffe2/caffe2-1.11.0-r1.ebuild
+++ b/sci-libs/caffe2/caffe2-1.11.0-r1.ebuild
@@ -55,7 +55,6 @@ src_configure() {
python_setup
local mycmakeargs=(
-DUSE_KINETO=OFF
- -DUSE_XNNPACK=$(usex xnnpack ON OFF)
-DUSE_SYSTEM_SLEEF=ON
-DUSE_BREAKPAD=OFF
-DUSE_SYSTEM_ONNX=ON
@@ -79,8 +78,9 @@ src_configure() {
-DLIBSHM_INSTALL_LIB_SUBDIR=/usr/$(get_libdir)
-DUSE_CCACHE=OFF
-DUSE_SYSTEM_PTHREADPOOL=ON
- -DUSE_SYSTEM_XNNPACK=ON
-DUSE_SYSTEM_FXDIV=ON
+ -DUSE_XNNPACK=$(usex xnnpack ON OFF)
+ -DUSE_SYSTEM_XNNPACK=$(usex xnnpack ON OFF)
)
cmake_src_configure
}
[gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/, sci-libs/caffe2/files/
commit: e4f62deb1b127d32fc9845d5e90d21a0c090bf53
Author: Alfredo Tupone gentoo org>
AuthorDate: Fri Jul 1 22:22:08 2022 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Sat Jul 2 11:03:44 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4f62deb
sci-libs/caffe2: add XNNPACK usage
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Alfredo Tupone gentoo.org>
.../{caffe2-1.11.0.ebuild => caffe2-1.11.0-r1.ebuild} | 7 ++-
sci-libs/caffe2/files/caffe2-1.11.0-gentoo.patch | 19 +++
sci-libs/caffe2/metadata.xml | 3 +++
3 files changed, 28 insertions(+), 1 deletion(-)
diff --git a/sci-libs/caffe2/caffe2-1.11.0.ebuild
b/sci-libs/caffe2/caffe2-1.11.0-r1.ebuild
similarity index 92%
rename from sci-libs/caffe2/caffe2-1.11.0.ebuild
rename to sci-libs/caffe2/caffe2-1.11.0-r1.ebuild
index e0f6d0d772f2..137c5df60ebe 100644
--- a/sci-libs/caffe2/caffe2-1.11.0.ebuild
+++ b/sci-libs/caffe2/caffe2-1.11.0-r1.ebuild
@@ -18,6 +18,7 @@ LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64"
RESTRICT="test"
+IUSE="xnnpack"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND="
@@ -29,6 +30,7 @@ RDEPEND="
sci-libs/lapack
sci-libs/onnx
sci-libs/foxi
+ xnnpack? ( sci-libs/XNNPACK )
"
DEPEND="${RDEPEND}
dev-libs/FP16
@@ -53,7 +55,7 @@ src_configure() {
python_setup
local mycmakeargs=(
-DUSE_KINETO=OFF
- -DUSE_XNNPACK=OFF
+ -DUSE_XNNPACK=$(usex xnnpack ON OFF)
-DUSE_SYSTEM_SLEEF=ON
-DUSE_BREAKPAD=OFF
-DUSE_SYSTEM_ONNX=ON
@@ -76,6 +78,9 @@ src_configure() {
-DTORCH_INSTALL_LIB_DIR=/usr/$(get_libdir)
-DLIBSHM_INSTALL_LIB_SUBDIR=/usr/$(get_libdir)
-DUSE_CCACHE=OFF
+ -DUSE_SYSTEM_PTHREADPOOL=ON
+ -DUSE_SYSTEM_XNNPACK=ON
+ -DUSE_SYSTEM_FXDIV=ON
)
cmake_src_configure
}
diff --git a/sci-libs/caffe2/files/caffe2-1.11.0-gentoo.patch
b/sci-libs/caffe2/files/caffe2-1.11.0-gentoo.patch
index ac74edadab35..f34216ea0970 100644
--- a/sci-libs/caffe2/files/caffe2-1.11.0-gentoo.patch
+++ b/sci-libs/caffe2/files/caffe2-1.11.0-gentoo.patch
@@ -91,3 +91,22 @@
install(DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
DESTINATION include
FILES_MATCHING PATTERN "*.h")
+--- a/caffe2/CMakeLists.txt2022-07-01 21:56:49.643490049 +0200
b/caffe2/CMakeLists.txt2022-07-01 21:57:17.091489479 +0200
+@@ -109,7 +109,7 @@
+ # Note: the folders that are being commented out have not been properly
+ # addressed yet.
+
+-if(NOT MSVC AND USE_XNNPACK)
++if(FALSE)
+ if(NOT TARGET fxdiv)
+ set(FXDIV_BUILD_TESTS OFF CACHE BOOL "")
+ set(FXDIV_BUILD_BENCHMARKS OFF CACHE BOOL "")
+@@ -967,7 +967,6 @@
+ endif()
+
+ if(NOT MSVC AND USE_XNNPACK)
+- TARGET_LINK_LIBRARIES(torch_cpu PRIVATE fxdiv)
+ endif()
+
+ # ==
diff --git a/sci-libs/caffe2/metadata.xml b/sci-libs/caffe2/metadata.xml
index d12749aa5c21..bdd5f0fe 100644
--- a/sci-libs/caffe2/metadata.xml
+++ b/sci-libs/caffe2/metadata.xml
@@ -5,6 +5,9 @@
tup...@gentoo.org
Tupone Alfredo
+
+ Use XNNPACK
+
pytorch/pytorch
[gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
commit: 6d936c83383bf20d60e5d9289db6f22334df0975
Author: Alfredo Tupone gentoo org>
AuthorDate: Sun Jun 26 20:24:46 2022 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Sun Jun 26 20:24:46 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d936c83
sci-libs/caffe2: set python environment on configure
Closes: https://bugs.gentoo.org/854468
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Alfredo Tupone gentoo.org>
sci-libs/caffe2/caffe2-1.11.0.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/sci-libs/caffe2/caffe2-1.11.0.ebuild
b/sci-libs/caffe2/caffe2-1.11.0.ebuild
index b81f3208b3cf..e0f6d0d772f2 100644
--- a/sci-libs/caffe2/caffe2-1.11.0.ebuild
+++ b/sci-libs/caffe2/caffe2-1.11.0.ebuild
@@ -50,6 +50,7 @@ src_prepare() {
}
src_configure() {
+ python_setup
local mycmakeargs=(
-DUSE_KINETO=OFF
-DUSE_XNNPACK=OFF
[gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
commit: 9912dbf841eac00e0b131a2a25c5a252efa8ce2b
Author: Alfredo Tupone gentoo org>
AuthorDate: Sun Jun 26 18:03:29 2022 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Sun Jun 26 18:03:29 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9912dbf8
sci-libs/caffe2: fix deps
Closes: https://bugs.gentoo.org/854411
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Alfredo Tupone gentoo.org>
sci-libs/caffe2/caffe2-1.11.0.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/sci-libs/caffe2/caffe2-1.11.0.ebuild
b/sci-libs/caffe2/caffe2-1.11.0.ebuild
index 74e51e18a3ea..b81f3208b3cf 100644
--- a/sci-libs/caffe2/caffe2-1.11.0.ebuild
+++ b/sci-libs/caffe2/caffe2-1.11.0.ebuild
@@ -35,6 +35,7 @@ DEPEND="${RDEPEND}
dev-libs/pocketfft
dev-libs/flatbuffers
dev-python/pyyaml[${PYTHON_USEDEP}]
+ dev-python/pybind11[${PYTHON_USEDEP}]
"
S="${WORKDIR}"/${MYP}
[gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
commit: e47bc4e8204e32b66568bbaf12e0a5fbcf31b1a1
Author: Alfredo Tupone gentoo org>
AuthorDate: Sun Jun 26 17:29:53 2022 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Sun Jun 26 17:29:53 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e47bc4e8
sci-libs/caffe2: fix deps
Closes: https://bugs.gentoo.org/854408
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Alfredo Tupone gentoo.org>
sci-libs/caffe2/caffe2-1.11.0.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/sci-libs/caffe2/caffe2-1.11.0.ebuild
b/sci-libs/caffe2/caffe2-1.11.0.ebuild
index f8e9483bf74a..74e51e18a3ea 100644
--- a/sci-libs/caffe2/caffe2-1.11.0.ebuild
+++ b/sci-libs/caffe2/caffe2-1.11.0.ebuild
@@ -34,6 +34,7 @@ DEPEND="${RDEPEND}
dev-libs/FP16
dev-libs/pocketfft
dev-libs/flatbuffers
+ dev-python/pyyaml[${PYTHON_USEDEP}]
"
S="${WORKDIR}"/${MYP}
[gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/files/, sci-libs/caffe2/
commit: 794186914f817e446782620d16d4f7eda5d8353c
Author: Alfredo Tupone gentoo org>
AuthorDate: Sat Jun 25 21:40:03 2022 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Sun Jun 26 07:47:23 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79418691
sci-libs/caffe2: add to tree
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Alfredo Tupone gentoo.org>
sci-libs/caffe2/Manifest | 1 +
sci-libs/caffe2/caffe2-1.11.0.ebuild | 96
sci-libs/caffe2/files/caffe2-1.11.0-gentoo.patch | 93 +++
sci-libs/caffe2/metadata.xml | 11 +++
4 files changed, 201 insertions(+)
diff --git a/sci-libs/caffe2/Manifest b/sci-libs/caffe2/Manifest
new file mode 100644
index ..ae4d5567b7fc
--- /dev/null
+++ b/sci-libs/caffe2/Manifest
@@ -0,0 +1 @@
+DIST pytorch-1.11.0.tar.gz 20719323 BLAKE2B
24e7aaa2c26821d36f8092542de9d8d5ac85a619fb9fffb5131987958842afb1cad395780662d15f3411a7cc6ff83a445871960eca1e469fcbf0b9895d83d6e0
SHA512
2342eb7a1a241f5855a7cf12e11f62bc4baaa78d1d0864e53bfc946e783eb4addd05ca154a814d2376cd602098b5547e61c158d6eddb7cad5a9f3b0c1357adca
diff --git a/sci-libs/caffe2/caffe2-1.11.0.ebuild
b/sci-libs/caffe2/caffe2-1.11.0.ebuild
new file mode 100644
index ..f8e9483bf74a
--- /dev/null
+++ b/sci-libs/caffe2/caffe2-1.11.0.ebuild
@@ -0,0 +1,96 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit python-r1 cmake
+
+MYPN=pytorch
+MYP=${MYPN}-${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"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+RESTRICT="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+ ${PYTHON_DEPS}
+ dev-libs/cpuinfo
+ dev-libs/libfmt
+ dev-libs/protobuf
+ dev-libs/sleef
+ sci-libs/lapack
+ sci-libs/onnx
+ sci-libs/foxi
+"
+DEPEND="${RDEPEND}
+ dev-libs/FP16
+ dev-libs/pocketfft
+ dev-libs/flatbuffers
+"
+
+S="${WORKDIR}"/${MYP}
+
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+
+src_prepare() {
+ cmake_src_prepare
+ pushd torch/csrc/jit/serialization || die
+ flatc --cpp --gen-mutable --scoped-enums mobile_bytecode.fbs || die
+ popd
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DUSE_KINETO=OFF
+ -DUSE_XNNPACK=OFF
+ -DUSE_SYSTEM_SLEEF=ON
+ -DUSE_BREAKPAD=OFF
+ -DUSE_SYSTEM_ONNX=ON
+ -DUSE_TENSORPIPE=OFF
+ -DUSE_GLOO=OFF
+ -DUSE_SYSTEM_FP16=ON
+ -DUSE_FBGEMM=OFF
+ -DUSE_NNPACK=OFF
+ -DUSE_PYTORCH_QNNPACK=OFF
+ -DUSE_QNNPACK=OFF
+ -DUSE_SYSTEM_CPUINFO=ON
+ -DBUILD_CUSTOM_PROTOBUF=OFF
+ -DUSE_MKLDNN=OFF
+ -DUSE_NUMPY=OFF
+ -DUSE_OPENMP=OFF
+ -DUSE_DISTRIBUTED=OFF
+ -DUSE_CUDA=OFF
+ -DUSE_NCCL=OFF
+ -Wno-dev
+ -DTORCH_INSTALL_LIB_DIR=/usr/$(get_libdir)
+ -DLIBSHM_INSTALL_LIB_SUBDIR=/usr/$(get_libdir)
+ -DUSE_CCACHE=OFF
+ )
+ cmake_src_configure
+}
+
+python_install() {
+ python_domodule python/caffe2
+ python_domodule python/torch
+}
+
+src_install() {
+ cmake_src_install
+
+ insinto "/var/lib/${PN}"
+ doins "${BUILD_DIR}"/CMakeCache.txt
+
+ rm -rf python
+ mkdir -p python/torch || die
+ mv "${D}"/usr/lib/python*/site-packages/caffe2 python/ || die
+ cp torch/version.py python/torch/ || die
+ python_foreach_impl python_install
+}
diff --git a/sci-libs/caffe2/files/caffe2-1.11.0-gentoo.patch
b/sci-libs/caffe2/files/caffe2-1.11.0-gentoo.patch
new file mode 100644
index ..ac74edadab35
--- /dev/null
+++ b/sci-libs/caffe2/files/caffe2-1.11.0-gentoo.patch
@@ -0,0 +1,93 @@
+--- a/cmake/Dependencies.cmake 2022-06-17 22:12:34.451841710 +0200
b/cmake/Dependencies.cmake 2022-06-17 22:12:48.302786501 +0200
+@@ -1512,7 +1512,6 @@
+ if(NOT USE_SYSTEM_ONNX)
+ add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/../third_party/onnx
EXCLUDE_FROM_ALL)
+ endif()
+- add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/../third_party/foxi
EXCLUDE_FROM_ALL)
+
+ add_definitions(-DONNX_NAMESPACE=${ONNX_NAMESPACE})
+ if(NOT USE_SYSTEM_ONNX)
+@@ -1810,7 +1809,6 @@
+ #
+ set(TEMP_BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS})
+ set(BUILD_SHARED_LIBS OFF CACHE BOOL "Build shared libs" FORCE)
+-add_subdirectory(${PROJECT_SOURCE_DIR}/third_party/fmt)
+
+ # Disable compiler feature checks for `fmt`.
+ #
+@@ -1819,9 +1817,7 @@
+ # CMAKE_CXX_FLAGS in ways that break feature checks. Since we already know
+ #
