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

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
@ 2022-06-26 17:30 Alfredo Tupone
  0 siblings, 0 replies; 71+ messages in thread
From: Alfredo Tupone @ 2022-06-26 17:30 UTC (permalink / raw
  To: gentoo-commits

commit:     e47bc4e8204e32b66568bbaf12e0a5fbcf31b1a1
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 26 17:29:53 2022 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Sun Jun 26 17:29:53 2022 +0000
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 <tupone <AT> 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}


^ permalink raw reply related	[flat|nested] 71+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
@ 2022-06-26 18:03 Alfredo Tupone
  0 siblings, 0 replies; 71+ messages in thread
From: Alfredo Tupone @ 2022-06-26 18:03 UTC (permalink / raw
  To: gentoo-commits

commit:     9912dbf841eac00e0b131a2a25c5a252efa8ce2b
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 26 18:03:29 2022 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Sun Jun 26 18:03:29 2022 +0000
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 <tupone <AT> 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}


^ permalink raw reply related	[flat|nested] 71+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
@ 2022-06-26 20:24 Alfredo Tupone
  0 siblings, 0 replies; 71+ messages in thread
From: Alfredo Tupone @ 2022-06-26 20:24 UTC (permalink / raw
  To: gentoo-commits

commit:     6d936c83383bf20d60e5d9289db6f22334df0975
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 26 20:24:46 2022 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Sun Jun 26 20:24:46 2022 +0000
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 <tupone <AT> 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


^ permalink raw reply related	[flat|nested] 71+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
@ 2022-07-02 16:20 Alfredo Tupone
  0 siblings, 0 replies; 71+ messages in thread
From: Alfredo Tupone @ 2022-07-02 16:20 UTC (permalink / raw
  To: gentoo-commits

commit:     f5f020cc9a1d2505c5482637a2a95d85566aaa78
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Sat Jul  2 16:20:27 2022 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Sat Jul  2 16:20:27 2022 +0000
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 <tupone <AT> 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
 }


^ permalink raw reply related	[flat|nested] 71+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
@ 2022-07-03 10:45 Alfredo Tupone
  0 siblings, 0 replies; 71+ messages in thread
From: Alfredo Tupone @ 2022-07-03 10:45 UTC (permalink / raw
  To: gentoo-commits

commit:     1c2af9aa14e6a116c72cc0722948988ccffc65cb
Author:     James Beddek <telans <AT> posteo <DOT> de>
AuthorDate: Sun Jul  3 07:38:50 2022 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Sun Jul  3 10:44:38 2022 +0000
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 <telans <AT> posteo.de>
Signed-off-by: Alfredo Tupone <tupone <AT> 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:=
+	<dev-cpp/glog-0.5.0
 	dev-libs/cpuinfo
 	dev-libs/libfmt
 	dev-libs/protobuf
@@ -34,6 +36,11 @@ RDEPEND="
 	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? ( dev-python/numpy[${PYTHON_USEDEP}] )
@@ -47,6 +54,7 @@ DEPEND="
 	dev-cpp/eigen
 	dev-libs/psimd
 	dev-libs/FP16
+	dev-libs/FXdiv
 	dev-libs/pocketfft
 	dev-libs/flatbuffers
 	dev-python/pyyaml[${PYTHON_USEDEP}]
@@ -68,22 +76,35 @@ src_prepare() {
 }
 
 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
+
 	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:=
+	<dev-cpp/glog-0.5.0
 	dev-libs/cpuinfo
 	dev-libs/libfmt
 	dev-libs/protobuf
@@ -34,6 +36,11 @@ RDEPEND="
 	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? ( dev-python/numpy[${PYTHON_USEDEP}] )
@@ -47,6 +54,7 @@ DEPEND="
 	dev-cpp/eigen
 	dev-libs/psimd
 	dev-libs/FP16
+	dev-libs/FXdiv
 	dev-libs/pocketfft
 	dev-libs/flatbuffers
 	dev-python/pyyaml[${PYTHON_USEDEP}]
@@ -68,22 +76,35 @@ src_prepare() {
 }
 
 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
+
 	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 @@
 		<email>tupone@gentoo.org</email>
 		<name>Tupone Alfredo</name>
 	</maintainer>
+	<maintainer type="person" proxied="yes">
+		<email>telans@posteo.de</email>
+		<name>James Beddek</name>
+	</maintainer>
 	<use>
+		<flag name="cuda">Add support for CUDA processing</flag>
 		<flag name="ffmpeg">Add support for video processing operators</flag>
 		<flag name="nnpack">Use NNPACK</flag>
 		<flag name="numpy">Add support for math operations through numpy</flag>


^ permalink raw reply related	[flat|nested] 71+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
@ 2022-08-04  8:00 Alfredo Tupone
  0 siblings, 0 replies; 71+ messages in thread
From: Alfredo Tupone @ 2022-08-04  8:00 UTC (permalink / raw
  To: gentoo-commits

commit:     7dd94587118b7333242a46b4f97c22ed69d6fc0d
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Thu Aug  4 07:59:56 2022 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Thu Aug  4 07:59:56 2022 +0000
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 <tupone <AT> 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


^ permalink raw reply related	[flat|nested] 71+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
@ 2022-08-29  6:42 Alfredo Tupone
  0 siblings, 0 replies; 71+ messages in thread
From: Alfredo Tupone @ 2022-08-29  6:42 UTC (permalink / raw
  To: gentoo-commits

commit:     63d4f2bfcfd5e696451103703854e9485c381314
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 29 06:41:51 2022 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Mon Aug 29 06:41:51 2022 +0000
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 <tupone <AT> 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


^ permalink raw reply related	[flat|nested] 71+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
@ 2022-09-14 20:52 Alfredo Tupone
  0 siblings, 0 replies; 71+ messages in thread
From: Alfredo Tupone @ 2022-09-14 20:52 UTC (permalink / raw
  To: gentoo-commits

commit:     dfb44a20d723cace8c89d65437c4456bfba39f91
Author:     James Beddek <telans <AT> posteo <DOT> de>
AuthorDate: Wed Sep 14 12:19:47 2022 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Wed Sep 14 20:51:17 2022 +0000
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 <telans <AT> posteo.de>
Closes: https://github.com/gentoo/gentoo/pull/27253
Signed-off-by: Alfredo Tupone <tupone <AT> 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
 }
 


^ permalink raw reply related	[flat|nested] 71+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
@ 2022-11-10 16:51 Alfredo Tupone
  0 siblings, 0 replies; 71+ messages in thread
From: Alfredo Tupone @ 2022-11-10 16:51 UTC (permalink / raw
  To: gentoo-commits

commit:     3f3bd41414e681c097158fd4edadf2461b0b9326
Author:     Marek Behún <kabel <AT> kernel <DOT> org>
AuthorDate: Thu Nov 10 12:47:55 2022 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Thu Nov 10 16:50:21 2022 +0000
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 <kabel <AT> kernel.org>
Closes: https://github.com/gentoo/gentoo/pull/28208
Signed-off-by: Alfredo Tupone <tupone <AT> 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
 }


^ permalink raw reply related	[flat|nested] 71+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
@ 2022-11-30 18:20 Alfredo Tupone
  0 siblings, 0 replies; 71+ messages in thread
From: Alfredo Tupone @ 2022-11-30 18:20 UTC (permalink / raw
  To: gentoo-commits

commit:     3625a2f15847ca2daefbbb7c267840701886507b
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 30 18:19:55 2022 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Wed Nov 30 18:19:55 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3625a2f1

sci-libs/caffe2: drop 1.11.0-r2

Signed-off-by: Alfredo Tupone <tupone <AT> 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..000000000000
--- 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:=
-	<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? ( 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
-	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
-)
-
-src_prepare() {
-	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
-
-	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
-}


^ permalink raw reply related	[flat|nested] 71+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
@ 2022-12-16 15:56 Alfredo Tupone
  0 siblings, 0 replies; 71+ messages in thread
From: Alfredo Tupone @ 2022-12-16 15:56 UTC (permalink / raw
  To: gentoo-commits

commit:     ae6b1d9d546691729c0b154c746260b025db5878
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 16 15:54:39 2022 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Fri Dec 16 15:56:07 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae6b1d9d

sci-libs/caffe2: fix deps

Signed-off-by: Alfredo Tupone <tupone <AT> 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


^ permalink raw reply related	[flat|nested] 71+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
@ 2023-01-03  6:22 Alfredo Tupone
  0 siblings, 0 replies; 71+ messages in thread
From: Alfredo Tupone @ 2023-01-03  6:22 UTC (permalink / raw
  To: gentoo-commits

commit:     4590c8b8fa3b26439ac9336243331863a4ed2c52
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Tue Jan  3 06:16:54 2023 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Tue Jan  3 06:19:58 2023 +0000
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 <tupone <AT> 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
 }


^ permalink raw reply related	[flat|nested] 71+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
@ 2023-02-12  9:09 Alfredo Tupone
  0 siblings, 0 replies; 71+ messages in thread
From: Alfredo Tupone @ 2023-02-12  9:09 UTC (permalink / raw
  To: gentoo-commits

commit:     f068859e8141d769156afc65d354c84adb0d0faf
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 12 09:07:49 2023 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Sun Feb 12 09:08:53 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f068859e

sci-libs/caffe2: add 1.12.1

Signed-off-by: Alfredo Tupone <tupone <AT> 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 000000000000..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)
+		-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_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_GLOO=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)
+	)
+
+	use cuda && addpredict "/dev/nvidiactl" # bug 867706
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	insinto "/var/lib/${PN}"
+	doins "${BUILD_DIR}"/CMakeCache.txt
+
+	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
+	cp torch/version.py python/torch/ || die
+	python_domodule python/caffe2
+	python_domodule python/torch
+}


^ permalink raw reply related	[flat|nested] 71+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
@ 2023-02-15  7:18 Alfredo Tupone
  0 siblings, 0 replies; 71+ messages in thread
From: Alfredo Tupone @ 2023-02-15  7:18 UTC (permalink / raw
  To: gentoo-commits

commit:     076708ac7139e30709bf7cb99d9e82c9bcfaec6d
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 15 07:13:46 2023 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Wed Feb 15 07:18:24 2023 +0000
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 <tupone <AT> 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}]


^ permalink raw reply related	[flat|nested] 71+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
@ 2023-02-15  7:36 Sam James
  0 siblings, 0 replies; 71+ messages in thread
From: Sam James @ 2023-02-15  7:36 UTC (permalink / raw
  To: gentoo-commits

commit:     974a17b47648adf241d5bdba1291f2c2ed9b9592
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 15 07:35:38 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Feb 15 07:35:38 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=974a17b4

sci-libs/caffe2: fix UnknownManifest

Signed-off-by: Sam James <sam <AT> 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


^ permalink raw reply related	[flat|nested] 71+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
@ 2023-02-15 19:40 Alfredo Tupone
  0 siblings, 0 replies; 71+ messages in thread
From: Alfredo Tupone @ 2023-02-15 19:40 UTC (permalink / raw
  To: gentoo-commits

commit:     f62dca7123b6dd4842866afaeba30c16d3e5e64e
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 15 19:38:46 2023 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Wed Feb 15 19:38:46 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f62dca71

sci-libs/caffe2: add 1.13.1

Signed-off-by: Alfredo Tupone <tupone <AT> 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 000000000000..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, 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)
+		-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_SYSTEM_PYBIND11=ON
+		-DUSE_VALGRIND=OFF
+		-DPYBIND11_PYTHON_VERSION="${EPYTHON#python}"
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+		-DUSE_ITT=OFF
+		-DUSE_SYSTEM_EIGEN_INSTALL=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_TENSORPIPE=OFF
+
+		-Wno-dev
+		-DTORCH_INSTALL_LIB_DIR="${EPREFIX}"/usr/$(get_libdir)
+		-DLIBSHM_INSTALL_LIB_SUBDIR="${EPREFIX}"/usr/$(get_libdir)
+	)
+
+	use cuda && addpredict "/dev/nvidiactl" # bug 867706
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	insinto "/var/lib/${PN}"
+	doins "${BUILD_DIR}"/CMakeCache.txt
+
+	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
+	cp torch/version.py python/torch/ || die
+	rm -r "${ED}"/var/tmp || die
+	python_domodule python/caffe2
+	python_domodule python/torch
+}


^ permalink raw reply related	[flat|nested] 71+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
@ 2023-02-20 21:22 Alfredo Tupone
  0 siblings, 0 replies; 71+ messages in thread
From: Alfredo Tupone @ 2023-02-20 21:22 UTC (permalink / raw
  To: gentoo-commits

commit:     39efa04922e0172b9b5f6313022e70d693d9c61e
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 20 21:22:05 2023 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Mon Feb 20 21:22:05 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39efa049

sci-libs/caffe2: enable python 3.11

Signed-off-by: Alfredo Tupone <tupone <AT> 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


^ permalink raw reply related	[flat|nested] 71+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
@ 2023-02-27  7:23 Alfredo Tupone
  0 siblings, 0 replies; 71+ messages in thread
From: Alfredo Tupone @ 2023-02-27  7:23 UTC (permalink / raw
  To: gentoo-commits

commit:     04f1c73d1190c41edc24667ebd0c2505c62a6706
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 27 07:13:55 2023 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Mon Feb 27 07:23:15 2023 +0000
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 <tupone <AT> 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
 }
 


^ permalink raw reply related	[flat|nested] 71+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
@ 2023-02-27 14:16 Alfredo Tupone
  0 siblings, 0 replies; 71+ messages in thread
From: Alfredo Tupone @ 2023-02-27 14:16 UTC (permalink / raw
  To: gentoo-commits

commit:     b2f385739323abaf90da0a967b3cdc3a4f548bb0
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 27 14:16:03 2023 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Mon Feb 27 14:16:03 2023 +0000
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 <tupone <AT> 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


^ permalink raw reply related	[flat|nested] 71+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
@ 2023-02-28  7:12 Alfredo Tupone
  0 siblings, 0 replies; 71+ messages in thread
From: Alfredo Tupone @ 2023-02-28  7:12 UTC (permalink / raw
  To: gentoo-commits

commit:     7a54b4eda38431f1b3cfdd61c9611df8292cba91
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 27 19:13:08 2023 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Tue Feb 28 07:12:00 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a54b4ed

sci-libs/caffe2: CUDA 12 not supported yet

Signed-off-by: Alfredo Tupone <tupone <AT> 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]
+		<dev-util/nvidia-cuda-toolkit-12:=[profiler]
 	)
 	ffmpeg? ( media-video/ffmpeg:= )
 	nnpack? ( sci-libs/NNPACK )


^ permalink raw reply related	[flat|nested] 71+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
@ 2023-02-28  7:12 Alfredo Tupone
  0 siblings, 0 replies; 71+ messages in thread
From: Alfredo Tupone @ 2023-02-28  7:12 UTC (permalink / raw
  To: gentoo-commits

commit:     70a1cabccd1d81a307686ab693d0443a439b64d1
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 28 07:10:59 2023 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Tue Feb 28 07:12:05 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70a1cabc

sci-libs/caffe2: add mpi use flag

Signed-off-by: Alfredo Tupone <tupone <AT> 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="
 		<dev-util/nvidia-cuda-toolkit-12:=[profiler]
 	)
 	ffmpeg? ( media-video/ffmpeg:= )
+	mpi? ( sys-cluster/openmpi )
 	nnpack? ( sci-libs/NNPACK )
 	numpy? ( $(python_gen_cond_dep '
 		dev-python/numpy[${PYTHON_USEDEP}]
@@ -108,7 +110,8 @@ src_configure() {
 		-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_DISTRIBUTED=$(usex distributed)
+		-DUSE_MPI=$(usex mpi)
 		-DUSE_FAKELOWP=OFF
 		-DUSE_FBGEMM=OFF # TODO
 		-DUSE_FFMPEG=$(usex ffmpeg)
@@ -132,6 +135,7 @@ src_configure() {
 		-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}"

diff --git a/sci-libs/caffe2/metadata.xml b/sci-libs/caffe2/metadata.xml
index 25a171ff1680..f009baee81bb 100644
--- a/sci-libs/caffe2/metadata.xml
+++ b/sci-libs/caffe2/metadata.xml
@@ -11,6 +11,7 @@
 	</maintainer>
 	<use>
 		<flag name="cuda">Add support for CUDA processing</flag>
+		<flag name="distributed">Support distributed applications</flag>
 		<flag name="ffmpeg">Add support for video processing operators</flag>
 		<flag name="nnpack">Use NNPACK</flag>
 		<flag name="numpy">Add support for math operations through numpy</flag>


^ permalink raw reply related	[flat|nested] 71+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
@ 2023-03-17 18:47 Alfredo Tupone
  0 siblings, 0 replies; 71+ messages in thread
From: Alfredo Tupone @ 2023-03-17 18:47 UTC (permalink / raw
  To: gentoo-commits

commit:     5569e6c21c3020ed6c15c175063ec5633564b53f
Author:     Larry D. Pyeatt <larry.pyeatt <AT> sdsmt <DOT> edu>
AuthorDate: Fri Mar 17 17:47:50 2023 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Fri Mar 17 18:46:38 2023 +0000
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 <larry.pyeatt <AT> sdsmt.edu>
Closes: https://github.com/gentoo/gentoo/pull/30187
Signed-off-by: Alfredo Tupone <tupone <AT> 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
 }


^ permalink raw reply related	[flat|nested] 71+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
@ 2023-03-26 18:10 Alfredo Tupone
  0 siblings, 0 replies; 71+ messages in thread
From: Alfredo Tupone @ 2023-03-26 18:10 UTC (permalink / raw
  To: gentoo-commits

commit:     de476863a8113542d076564b80f6a06883cbdc1b
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 26 15:46:52 2023 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Sun Mar 26 18:10:30 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de476863

sci-libs/caffe2: avoid the use of MKL

Signed-off-by: Alfredo Tupone <tupone <AT> 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


^ permalink raw reply related	[flat|nested] 71+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
@ 2023-04-06 19:46 Alfredo Tupone
  0 siblings, 0 replies; 71+ messages in thread
From: Alfredo Tupone @ 2023-04-06 19:46 UTC (permalink / raw
  To: gentoo-commits

commit:     6a9a03c380b72076af556055149fc6a203135d4a
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Thu Apr  6 19:44:50 2023 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Thu Apr  6 19:46:08 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a9a03c3

sci-libs/caffe2: depends on a new XNNPACK

Signed-off-by: Alfredo Tupone <tupone <AT> 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}


^ permalink raw reply related	[flat|nested] 71+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
@ 2023-04-08 14:29 Alfredo Tupone
  0 siblings, 0 replies; 71+ messages in thread
From: Alfredo Tupone @ 2023-04-08 14:29 UTC (permalink / raw
  To: gentoo-commits

commit:     2299e56b110834ccc6e8d9a675d1093a4d8559a0
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Sat Apr  8 14:28:31 2023 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Sat Apr  8 14:28:31 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2299e56b

sci-libs/caffe2: enable use of FBGEMM

Signed-off-by: Alfredo Tupone <tupone <AT> 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
 		<dev-util/nvidia-cuda-toolkit-12:=[profiler]
 	)
+	fbgemm? ( dev-libs/FBGEMM )
 	ffmpeg? ( media-video/ffmpeg:= )
 	mpi? ( sys-cluster/openmpi )
 	nnpack? ( sci-libs/NNPACK )
@@ -115,7 +116,7 @@ src_configure() {
 		-DUSE_DISTRIBUTED=$(usex distributed)
 		-DUSE_MPI=$(usex mpi)
 		-DUSE_FAKELOWP=OFF
-		-DUSE_FBGEMM=OFF # TODO
+		-DUSE_FBGEMM=$(usex fbgemm)
 		-DUSE_FFMPEG=$(usex ffmpeg)
 		-DUSE_GFLAGS=ON
 		-DUSE_GLOG=ON

diff --git a/sci-libs/caffe2/metadata.xml b/sci-libs/caffe2/metadata.xml
index 531b9cbf5879..f58d3b5e97ab 100644
--- a/sci-libs/caffe2/metadata.xml
+++ b/sci-libs/caffe2/metadata.xml
@@ -12,6 +12,7 @@
 	<use>
 		<flag name="cuda">Add support for CUDA processing</flag>
 		<flag name="distributed">Support distributed applications</flag>
+		<flag name="fbgemm">Use FBGEMM</flag>
 		<flag name="ffmpeg">Add support for video processing operators</flag>
 		<flag name="nnpack">Use NNPACK</flag>
 		<flag name="numpy">Add support for math operations through numpy</flag>


^ permalink raw reply related	[flat|nested] 71+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
@ 2023-04-23 13:24 Alfredo Tupone
  0 siblings, 0 replies; 71+ messages in thread
From: Alfredo Tupone @ 2023-04-23 13:24 UTC (permalink / raw
  To: gentoo-commits

commit:     aa8428244c620f062a55f86b5b2d7d2bbc15739b
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 23 13:23:33 2023 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Sun Apr 23 13:23:33 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa842824

sci-libs/caffe2: sandbox error

Signed-off-by: Alfredo Tupone <tupone <AT> 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 \")"


^ permalink raw reply related	[flat|nested] 71+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
@ 2023-04-23 17:25 Alfredo Tupone
  0 siblings, 0 replies; 71+ messages in thread
From: Alfredo Tupone @ 2023-04-23 17:25 UTC (permalink / raw
  To: gentoo-commits

commit:     2e4e05aca4cca79904e30cdbc9019043a5261262
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 23 17:24:37 2023 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Sun Apr 23 17:25:05 2023 +0000
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 <tupone <AT> 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


^ permalink raw reply related	[flat|nested] 71+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
@ 2023-05-05  6:00 Alfredo Tupone
  0 siblings, 0 replies; 71+ messages in thread
From: Alfredo Tupone @ 2023-05-05  6:00 UTC (permalink / raw
  To: gentoo-commits

commit:     9c94203f8b64847edab176509c93ebdc5aef7573
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Fri May  5 05:59:11 2023 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Fri May  5 06:00:02 2023 +0000
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 <tupone <AT> 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 \")"


^ permalink raw reply related	[flat|nested] 71+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
@ 2023-05-08 21:00 Alfredo Tupone
  0 siblings, 0 replies; 71+ messages in thread
From: Alfredo Tupone @ 2023-05-08 21:00 UTC (permalink / raw
  To: gentoo-commits

commit:     31ce941c3695409c169e43143b869ae19aae119b
Author:     wangjiezhe <wangjiezhe <AT> gmail <DOT> com>
AuthorDate: Mon May  8 12:58:32 2023 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Mon May  8 21:00:12 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31ce941c

sci-libs/caffe2: fix gloo use with cuda

Signed-off-by: wangjiezhe <wangjiezhe <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/30931
Signed-off-by: Alfredo Tupone <tupone <AT> 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 '


^ permalink raw reply related	[flat|nested] 71+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
@ 2023-05-14  7:59 Alfredo Tupone
  0 siblings, 0 replies; 71+ messages in thread
From: Alfredo Tupone @ 2023-05-14  7:59 UTC (permalink / raw
  To: gentoo-commits

commit:     060541e234fe016898d27600efefc8c93f184cda
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Sun May 14 07:58:04 2023 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Sun May 14 07:58:52 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=060541e2

sci-libs/caffe2: add 2.0.1

Signed-off-by: Alfredo Tupone <tupone <AT> 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 000000000000..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
+		<dev-util/nvidia-cuda-toolkit-12:=[profiler]
+	)
+	fbgemm? ( dev-libs/FBGEMM )
+	ffmpeg? ( media-video/ffmpeg:= )
+	gloo? ( sci-libs/gloo[cuda?] )
+	mpi? ( sys-cluster/openmpi )
+	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 )
+	xnnpack? ( >=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"
+		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)
+		-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
+		-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)
+		-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
+		-DUSE_SYSTEM_ONNX=ON
+		-DUSE_SYSTEM_SLEEF=ON
+
+		-Wno-dev
+		-DTORCH_INSTALL_LIB_DIR="${EPREFIX}"/usr/$(get_libdir)
+		-DLIBSHM_INSTALL_LIB_SUBDIR="${EPREFIX}"/usr/$(get_libdir)
+	)
+
+	if use cuda; then
+		addpredict "/dev/nvidiactl" # bug 867706
+		addpredict "/dev/char"
+
+		mycmakeargs+=(
+			-DCMAKE_CUDA_FLAGS="$(cuda_gccdir -f | tr -d \")"
+		)
+	fi
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	insinto "/var/lib/${PN}"
+	doins "${BUILD_DIR}"/CMakeCache.txt
+
+	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
+	cp torch/version.py python/torch/ || die
+	rm -rf "${ED}"/var/tmp || die
+	python_domodule python/caffe2
+	python_domodule python/torch
+}


^ permalink raw reply related	[flat|nested] 71+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
@ 2023-05-15  6:27 Alfredo Tupone
  0 siblings, 0 replies; 71+ messages in thread
From: Alfredo Tupone @ 2023-05-15  6:27 UTC (permalink / raw
  To: gentoo-commits

commit:     956d531c9b11328f220abea0bdc319ed3ccfe891
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Mon May 15 06:25:19 2023 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Mon May 15 06:26:07 2023 +0000
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 <tupone <AT> 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="


^ permalink raw reply related	[flat|nested] 71+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
@ 2023-06-17 14:02 Alfredo Tupone
  0 siblings, 0 replies; 71+ messages in thread
From: Alfredo Tupone @ 2023-06-17 14:02 UTC (permalink / raw
  To: gentoo-commits

commit:     715a287b389218206948f60a4e848300b56364e3
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 17 14:02:05 2023 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Sat Jun 17 14:02:05 2023 +0000
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 <tupone <AT> 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"


^ permalink raw reply related	[flat|nested] 71+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
@ 2023-08-01  7:30 Alfredo Tupone
  0 siblings, 0 replies; 71+ messages in thread
From: Alfredo Tupone @ 2023-08-01  7:30 UTC (permalink / raw
  To: gentoo-commits

commit:     1155091de323b8ccb618a774460e529688b7f748
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Tue Aug  1 07:26:16 2023 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Tue Aug  1 07:30:08 2023 +0000
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 <tupone <AT> 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() {


^ permalink raw reply related	[flat|nested] 71+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
@ 2023-08-11  7:31 Alfredo Tupone
  0 siblings, 0 replies; 71+ messages in thread
From: Alfredo Tupone @ 2023-08-11  7:31 UTC (permalink / raw
  To: gentoo-commits

commit:     5088a2d38c87926670b7d18f75fc6b91da982caf
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 11 07:26:35 2023 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Fri Aug 11 07:31:10 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5088a2d3

sci-libs/caffe2: build nvfuser for cuda users

Signed-off-by: Alfredo Tupone <tupone <AT> 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
 


^ permalink raw reply related	[flat|nested] 71+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
@ 2023-08-11  8:40 Alfredo Tupone
  0 siblings, 0 replies; 71+ messages in thread
From: Alfredo Tupone @ 2023-08-11  8:40 UTC (permalink / raw
  To: gentoo-commits

commit:     71578f583267ca3847dab44526e40eb0ca171dec
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 11 08:39:37 2023 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Fri Aug 11 08:40:05 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71578f58

sci-libs/caffe2: build nvfuser for cuda users

Signed-off-by: Alfredo Tupone <tupone <AT> 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
 


^ permalink raw reply related	[flat|nested] 71+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
@ 2023-12-01  5:54 Alfredo Tupone
  0 siblings, 0 replies; 71+ messages in thread
From: Alfredo Tupone @ 2023-12-01  5:54 UTC (permalink / raw
  To: gentoo-commits

commit:     564efa91f7fbb739529a10bebe6d17be740cb4d5
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Fri Dec  1 05:54:22 2023 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Fri Dec  1 05:54:22 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=564efa91

sci-libs/caffe2: drop 2.0.1-r4

Signed-off-by: Alfredo Tupone <tupone <AT> 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..000000000000
--- 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
-		<dev-util/nvidia-cuda-toolkit-12:=[profiler]
-	)
-	fbgemm? ( dev-libs/FBGEMM )
-	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 )
-	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)
-		-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)
-		-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)
-		-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
-		-DUSE_SYSTEM_ONNX=ON
-		-DUSE_SYSTEM_SLEEF=ON
-
-		-Wno-dev
-		-DTORCH_INSTALL_LIB_DIR="${EPREFIX}"/usr/$(get_libdir)
-		-DLIBSHM_INSTALL_LIB_SUBDIR="${EPREFIX}"/usr/$(get_libdir)
-	)
-
-	if use cuda; then
-		addpredict "/dev/nvidiactl" # bug 867706
-		addpredict "/dev/char"
-
-		mycmakeargs+=(
-			-DCMAKE_CUDA_FLAGS="$(cuda_gccdir -f | tr -d \")"
-		)
-	fi
-	cmake_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
-
-	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
-	cp torch/version.py python/torch/ || die
-	rm -rf "${ED}"/var/tmp || die
-	python_domodule python/caffe2
-	python_domodule python/torch
-}


^ permalink raw reply related	[flat|nested] 71+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
@ 2023-12-06 19:49 Alfredo Tupone
  0 siblings, 0 replies; 71+ messages in thread
From: Alfredo Tupone @ 2023-12-06 19:49 UTC (permalink / raw
  To: gentoo-commits

commit:     a30ecc1b69628e20faa989943ff1b0dda32d9d69
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Wed Dec  6 19:48:46 2023 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Wed Dec  6 19:49:16 2023 +0000
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 <tupone <AT> 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
 }


^ permalink raw reply related	[flat|nested] 71+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
@ 2023-12-10 10:31 Alfredo Tupone
  0 siblings, 0 replies; 71+ messages in thread
From: Alfredo Tupone @ 2023-12-10 10:31 UTC (permalink / raw
  To: gentoo-commits

commit:     9b75f95a7b2dcec84de8837521815f23bdf93c68
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 10 10:30:28 2023 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Sun Dec 10 10:31:28 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b75f95a

sci-libs/caffe2: nvfuser module belongs to pytorch

Signed-off-by: Alfredo Tupone <tupone <AT> 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
 }


^ permalink raw reply related	[flat|nested] 71+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
@ 2023-12-14 18:30 Alfredo Tupone
  0 siblings, 0 replies; 71+ messages in thread
From: Alfredo Tupone @ 2023-12-14 18:30 UTC (permalink / raw
  To: gentoo-commits

commit:     52575e06cb70d8f89dfbcfa3b40c4b216b4f35db
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 14 18:29:37 2023 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Thu Dec 14 18:30:24 2023 +0000
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 <tupone <AT> 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-util/nvidia-cuda-toolkit-12:=[profiler]
 	)
-	fbgemm? ( dev-libs/FBGEMM )
+	fbgemm? ( >=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


^ permalink raw reply related	[flat|nested] 71+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
@ 2023-12-17  9:30 Alfredo Tupone
  0 siblings, 0 replies; 71+ messages in thread
From: Alfredo Tupone @ 2023-12-17  9:30 UTC (permalink / raw
  To: gentoo-commits

commit:     60b645821036cba6aecb772566881d9df6f8786e
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 17 09:30:11 2023 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Sun Dec 17 09:30:11 2023 +0000
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 <tupone <AT> 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-util/nvidia-cuda-toolkit-12:=[profiler]
+		dev-util/nvidia-cuda-toolkit:=[profiler]
 	)
 	fbgemm? ( >=dev-libs/FBGEMM-2023.11.02 )
 	ffmpeg? ( media-video/ffmpeg:= )


^ permalink raw reply related	[flat|nested] 71+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
@ 2023-12-22 22:27 Alfredo Tupone
  0 siblings, 0 replies; 71+ messages in thread
From: Alfredo Tupone @ 2023-12-22 22:27 UTC (permalink / raw
  To: gentoo-commits

commit:     9623a3e98fc0f8e3658488d31f0708505505fa89
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 22 22:26:06 2023 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Fri Dec 22 22:26:53 2023 +0000
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 <tupone <AT> 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
 }


^ permalink raw reply related	[flat|nested] 71+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
@ 2023-12-23  8:24 Alfredo Tupone
  0 siblings, 0 replies; 71+ messages in thread
From: Alfredo Tupone @ 2023-12-23  8:24 UTC (permalink / raw
  To: gentoo-commits

commit:     2f877a5bb3dd0a90848a2656cae80d5fcdbf1960
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 23 08:23:06 2023 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Sat Dec 23 08:24:00 2023 +0000
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 <tupone <AT> 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


^ permalink raw reply related	[flat|nested] 71+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
@ 2023-12-23 16:05 Alfredo Tupone
  0 siblings, 0 replies; 71+ messages in thread
From: Alfredo Tupone @ 2023-12-23 16:05 UTC (permalink / raw
  To: gentoo-commits

commit:     60f42ca58ef409f2a08c17e6c62fd53b4cc5b87d
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 23 16:04:31 2023 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Sat Dec 23 16:05:09 2023 +0000
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 <tupone <AT> 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


^ permalink raw reply related	[flat|nested] 71+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
@ 2023-12-26 22:14 Alfredo Tupone
  0 siblings, 0 replies; 71+ messages in thread
From: Alfredo Tupone @ 2023-12-26 22:14 UTC (permalink / raw
  To: gentoo-commits

commit:     1edd7df00301f5d108077e9c93daaa11668784eb
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 26 21:03:43 2023 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Tue Dec 26 22:13:51 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1edd7df0

sci-libs/caffe2: add 2.1.2

Signed-off-by: Alfredo Tupone <tupone <AT> 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 000000000000..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() {
+	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)
+		-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
+		-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)
+		-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
+		-DUSE_SYSTEM_ONNX=ON
+		-DUSE_SYSTEM_SLEEF=ON
+
+		-Wno-dev
+		-DTORCH_INSTALL_LIB_DIR="${EPREFIX}"/usr/$(get_libdir)
+		-DLIBSHM_INSTALL_LIB_SUBDIR="${EPREFIX}"/usr/$(get_libdir)
+	)
+
+	if use cuda; then
+		addpredict "/dev/nvidiactl" # bug 867706
+		addpredict "/dev/char"
+
+		mycmakeargs+=(
+			-DCMAKE_CUDA_FLAGS="$(cuda_gccdir -f | tr -d \")"
+		)
+	fi
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	insinto "/var/lib/${PN}"
+	doins "${BUILD_DIR}"/CMakeCache.txt
+
+	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
+	if use cuda; then
+		python_domodule python/nvfuser
+	fi
+	find "${ED}" -empty -delete
+}


^ permalink raw reply related	[flat|nested] 71+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
@ 2023-12-29  9:53 Alfredo Tupone
  0 siblings, 0 replies; 71+ messages in thread
From: Alfredo Tupone @ 2023-12-29  9:53 UTC (permalink / raw
  To: gentoo-commits

commit:     fa5c4f75a2696331b2441f9e110f87c85b5fbbb6
Author:     Andrew Udvare <audvare <AT> gmail <DOT> com>
AuthorDate: Fri Dec 29 08:11:37 2023 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Fri Dec 29 09:53:00 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa5c4f75

sci-libs/caffe2: restrict sci-libs/onnx version

Signed-off-by: Andrew Udvare <audvare <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/34528
Signed-off-by: Alfredo Tupone <tupone <AT> 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.15.0
 	sci-libs/foxi
 	cuda? (
 		=dev-libs/cudnn-8*

diff --git a/sci-libs/caffe2/caffe2-2.0.0-r5.ebuild b/sci-libs/caffe2/caffe2-2.0.0-r5.ebuild
index eaf3e07d46ac..425446a8564d 100644
--- a/sci-libs/caffe2/caffe2-2.0.0-r5.ebuild
+++ b/sci-libs/caffe2/caffe2-2.0.0-r5.ebuild
@@ -39,6 +39,7 @@ RDEPEND="
 	dev-libs/sleef
 	sci-libs/lapack
 	>=sci-libs/onnx-1.12.0
+	<sci-libs/onnx-1.15.0
 	sci-libs/foxi
 	cuda? (
 		=dev-libs/cudnn-8*

diff --git a/sci-libs/caffe2/caffe2-2.0.1-r5.ebuild b/sci-libs/caffe2/caffe2-2.0.1-r5.ebuild
index c062b38f1e86..ca31c211469b 100644
--- a/sci-libs/caffe2/caffe2-2.0.1-r5.ebuild
+++ b/sci-libs/caffe2/caffe2-2.0.1-r5.ebuild
@@ -40,6 +40,7 @@ RDEPEND="
 	dev-libs/sleef
 	sci-libs/lapack
 	>=sci-libs/onnx-1.12.0
+	<sci-libs/onnx-1.15.0
 	sci-libs/foxi
 	cuda? (
 		=dev-libs/cudnn-8*

diff --git a/sci-libs/caffe2/caffe2-2.1.1-r6.ebuild b/sci-libs/caffe2/caffe2-2.1.1-r6.ebuild
index b22e5e52ead5..04833ed73bbc 100644
--- a/sci-libs/caffe2/caffe2-2.1.1-r6.ebuild
+++ b/sci-libs/caffe2/caffe2-2.1.1-r6.ebuild
@@ -40,6 +40,7 @@ RDEPEND="
 	dev-libs/sleef
 	sci-libs/lapack
 	>=sci-libs/onnx-1.12.0
+	<sci-libs/onnx-1.15.0
 	sci-libs/foxi
 	cuda? (
 		=dev-libs/cudnn-8*

diff --git a/sci-libs/caffe2/caffe2-2.1.2.ebuild b/sci-libs/caffe2/caffe2-2.1.2.ebuild
index be2bdb80c02f..aca834318aa5 100644
--- a/sci-libs/caffe2/caffe2-2.1.2.ebuild
+++ b/sci-libs/caffe2/caffe2-2.1.2.ebuild
@@ -40,6 +40,7 @@ RDEPEND="
 	dev-libs/sleef
 	sci-libs/lapack
 	>=sci-libs/onnx-1.12.0
+	<sci-libs/onnx-1.15.0
 	sci-libs/foxi
 	cuda? (
 		=dev-libs/cudnn-8*


^ permalink raw reply related	[flat|nested] 71+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
@ 2024-01-03 18:23 Alfredo Tupone
  0 siblings, 0 replies; 71+ messages in thread
From: Alfredo Tupone @ 2024-01-03 18:23 UTC (permalink / raw
  To: gentoo-commits

commit:     dff61040dd6fbe0cd0c5635ade0e62c5faa52716
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Wed Jan  3 18:23:02 2024 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Wed Jan  3 18:23:19 2024 +0000
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 <tupone <AT> 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..000000000000
--- 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/onnx-1.15.0
-	sci-libs/foxi
-	cuda? (
-		=dev-libs/cudnn-8*
-		dev-libs/cudnn-frontend:0/8
-		<dev-util/nvidia-cuda-toolkit-12:=[profiler]
-	)
-	fbgemm? ( dev-libs/FBGEMM )
-	ffmpeg? ( media-video/ffmpeg:= )
-	gloo? ( sci-libs/gloo[cuda?] )
-	mpi? ( sys-cluster/openmpi )
-	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 )
-	xnnpack? ( >=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 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)
-		-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)
-		-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)
-		-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
-		-DUSE_SYSTEM_ONNX=ON
-		-DUSE_SYSTEM_SLEEF=ON
-
-		-Wno-dev
-		-DTORCH_INSTALL_LIB_DIR="${EPREFIX}"/usr/$(get_libdir)
-		-DLIBSHM_INSTALL_LIB_SUBDIR="${EPREFIX}"/usr/$(get_libdir)
-	)
-
-	if use cuda; then
-		addpredict "/dev/nvidiactl" # bug 867706
-		addpredict "/dev/char"
-
-		mycmakeargs+=(
-			-DCMAKE_CUDA_FLAGS="$(cuda_gccdir -f | tr -d \")"
-		)
-	fi
-	cmake_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
-
-	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
-	cp torch/version.py python/torch/ || die
-	rm -rf "${ED}"/var/tmp || die
-	python_domodule python/caffe2
-	python_domodule python/torch
-}

diff --git a/sci-libs/caffe2/caffe2-2.1.1-r6.ebuild b/sci-libs/caffe2/caffe2-2.1.1-r6.ebuild
deleted file mode 100644
index 04833ed73bbc..000000000000
--- a/sci-libs/caffe2/caffe2-2.1.1-r6.ebuild
+++ /dev/null
@@ -1,220 +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/onnx-1.15.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}"/${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 \
-		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)
-		-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
-		-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)
-		-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
-		-DUSE_SYSTEM_ONNX=ON
-		-DUSE_SYSTEM_SLEEF=ON
-
-		-Wno-dev
-		-DTORCH_INSTALL_LIB_DIR="${EPREFIX}"/usr/$(get_libdir)
-		-DLIBSHM_INSTALL_LIB_SUBDIR="${EPREFIX}"/usr/$(get_libdir)
-	)
-
-	if use cuda; then
-		addpredict "/dev/nvidiactl" # bug 867706
-		addpredict "/dev/char"
-
-		mycmakeargs+=(
-			-DCMAKE_CUDA_FLAGS="$(cuda_gccdir -f | tr -d \")"
-		)
-	fi
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	insinto "/var/lib/${PN}"
-	doins "${BUILD_DIR}"/CMakeCache.txt
-
-	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
-	if use cuda; then
-		python_domodule python/nvfuser
-	fi
-	find "${ED}" -empty -delete
-}


^ permalink raw reply related	[flat|nested] 71+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
@ 2024-01-09  7:17 Alfredo Tupone
  0 siblings, 0 replies; 71+ messages in thread
From: Alfredo Tupone @ 2024-01-09  7:17 UTC (permalink / raw
  To: gentoo-commits

commit:     6726d34ce3203d8f0e693ef749836a527929d52b
Author:     Sv. Lockal <lockalsash <AT> gmail <DOT> com>
AuthorDate: Mon Jan  8 21:09:04 2024 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Tue Jan  9 07:15:31 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6726d34c

sci-libs/caffe2: add support of onednn

Signed-off-by: Sv. Lockal <lockalsash <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/34714
Signed-off-by: Alfredo Tupone <tupone <AT> 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}"
 		-DUSE_ITT=OFF
-		-DUSE_SYSTEM_PTHREADPOOL=ON
-		-DUSE_SYSTEM_FXDIV=ON
-		-DUSE_SYSTEM_FP16=ON
-		-DUSE_SYSTEM_GLOO=ON
-		-DUSE_SYSTEM_ONNX=ON
-		-DUSE_SYSTEM_SLEEF=ON
+		-DUSE_SYSTEM_LIBS=ON
 		-DUSE_METAL=OFF
 
 		-Wno-dev
@@ -198,6 +193,16 @@ src_configure() {
 			-DCMAKE_CUDA_FLAGS="$(cuda_gccdir -f | tr -d \")"
 		)
 	fi
+
+	if use onednn; then
+		mycmakeargs+=(
+			-DUSE_MKLDNN=ON
+			-DMKLDNN_FOUND=ON
+			-DMKLDNN_LIBRARIES=dnnl
+			-DMKLDNN_INCLUDE_DIR="${ESYSROOT}/usr/include/oneapi/dnnl;${WORKDIR}/ideep-${IDEEP_VERSION}/include"
+		)
+	fi
+
 	cmake_src_configure
 }
 

diff --git a/sci-libs/caffe2/metadata.xml b/sci-libs/caffe2/metadata.xml
index eac4c942a88d..e69bb62ba592 100644
--- a/sci-libs/caffe2/metadata.xml
+++ b/sci-libs/caffe2/metadata.xml
@@ -16,6 +16,7 @@
 		<flag name="gloo">Use sci-libs/gloo</flag>
 		<flag name="nnpack">Use NNPACK</flag>
 		<flag name="numpy">Add support for math operations through numpy</flag>
+		<flag name="onednn">Use oneDNN</flag>
 		<flag name="opencv">Add support for image processing operators</flag>
 		<flag name="openmp">Use OpenMP for parallel code</flag>
 		<flag name="qnnpack">Use QNNPACK</flag>


^ permalink raw reply related	[flat|nested] 71+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
@ 2024-01-10 21:15 Alfredo Tupone
  0 siblings, 0 replies; 71+ messages in thread
From: Alfredo Tupone @ 2024-01-10 21:15 UTC (permalink / raw
  To: gentoo-commits

commit:     ba658e30c1e7f2c095391e06d2a77501253dcea2
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 10 21:14:14 2024 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Wed Jan 10 21:14:55 2024 +0000
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 <tupone <AT> 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


^ permalink raw reply related	[flat|nested] 71+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
@ 2024-01-28 22:53 Jonas Stein
  0 siblings, 0 replies; 71+ messages in thread
From: Jonas Stein @ 2024-01-28 22:53 UTC (permalink / raw
  To: gentoo-commits

commit:     443b1fd0d0d3a51e6f9720d1778017f85cf1e277
Author:     Jonas Stein <jstein <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 28 22:52:13 2024 +0000
Commit:     Jonas Stein <jstein <AT> gentoo <DOT> org>
CommitDate: Sun Jan 28 22:52:55 2024 +0000
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 <jstein <AT> 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 @@
 		<email>tupone@gentoo.org</email>
 		<name>Tupone Alfredo</name>
 	</maintainer>
-	<maintainer type="person" proxied="yes">
-		<email>telans@posteo.de</email>
-		<name>James Beddek</name>
-	</maintainer>
 	<use>
 		<flag name="distributed">Support distributed applications</flag>
 		<flag name="fbgemm">Use FBGEMM</flag>


^ permalink raw reply related	[flat|nested] 71+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
@ 2024-02-03  7:22 Michał Górny
  0 siblings, 0 replies; 71+ messages in thread
From: Michał Górny @ 2024-02-03  7:22 UTC (permalink / raw
  To: gentoo-commits

commit:     1f6128143a5f8bb3dd26c112a1269099d7cde9c9
Author:     Sv. Lockal <lockalsash <AT> gmail <DOT> com>
AuthorDate: Mon Jan 29 14:57:18 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Feb  3 07:22:34 2024 +0000
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 <lockalsash <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/35073
Signed-off-by: Michał Górny <mgorny <AT> 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


^ permalink raw reply related	[flat|nested] 71+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
@ 2024-02-17 22:21 Alfredo Tupone
  0 siblings, 0 replies; 71+ messages in thread
From: Alfredo Tupone @ 2024-02-17 22:21 UTC (permalink / raw
  To: gentoo-commits

commit:     49f65bf6621d8661f608fe3765a90417f53e23fd
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 17 22:20:47 2024 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Sat Feb 17 22:21:35 2024 +0000
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 <tupone <AT> 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 @@
 		<flag name="fbgemm">Use FBGEMM</flag>
 		<flag name="ffmpeg">Add support for video processing operators</flag>
 		<flag name="gloo">Use sci-libs/gloo</flag>
+		<flag name="mkl">Use <pkg>sci-libs/mkl</pkg> for blas, lapack and sparse blas routines</flag>
 		<flag name="nnpack">Use NNPACK</flag>
 		<flag name="numpy">Add support for math operations through numpy</flag>
 		<flag name="onednn">Use oneDNN</flag>
+		<flag name="openblas">Use <pkg>sci-libs/openblas</pkg> for blas routines</flag>
 		<flag name="opencv">Add support for image processing operators</flag>
 		<flag name="openmp">Use OpenMP for parallel code</flag>
 		<flag name="qnnpack">Use QNNPACK</flag>
 		<flag name="tensorpipe">Use tensorpipe</flag>
 		<flag name="xnnpack">Use XNNPACK</flag>
-		<flag name="mkl">Use <pkg>sci-libs/mkl</pkg> for blas, lapack and sparse blas routines</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">pytorch/pytorch</remote-id>


^ permalink raw reply related	[flat|nested] 71+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
@ 2024-02-24 21:57 Alfredo Tupone
  0 siblings, 0 replies; 71+ messages in thread
From: Alfredo Tupone @ 2024-02-24 21:57 UTC (permalink / raw
  To: gentoo-commits

commit:     09078aa1cb41455efd84c528b1671ae8de9074ba
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 24 21:56:04 2024 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Sat Feb 24 21:56:40 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09078aa1

sci-libs/caffe2: rm install on /var/tmp

Signed-off-by: Alfredo Tupone <tupone <AT> 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
 }


^ permalink raw reply related	[flat|nested] 71+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
@ 2024-03-01 18:54 Alfredo Tupone
  0 siblings, 0 replies; 71+ messages in thread
From: Alfredo Tupone @ 2024-03-01 18:54 UTC (permalink / raw
  To: gentoo-commits

commit:     d70014d3d47300e21900a29db4ccc95d7bea55cc
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Fri Mar  1 18:54:05 2024 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Fri Mar  1 18:54:05 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d70014d3

sci-libs/caffe2: depends on ideep

Signed-off-by: Alfredo Tupone <tupone <AT> 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
 


^ permalink raw reply related	[flat|nested] 71+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
@ 2024-03-08  7:26 Alfredo Tupone
  0 siblings, 0 replies; 71+ messages in thread
From: Alfredo Tupone @ 2024-03-08  7:26 UTC (permalink / raw
  To: gentoo-commits

commit:     134e80e0686c911283cc4156f72bb4e932ec0647
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Fri Mar  8 07:26:02 2024 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Fri Mar  8 07:26:41 2024 +0000
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 <tupone <AT> 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
 }


^ permalink raw reply related	[flat|nested] 71+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
@ 2024-03-11 19:28 Alfredo Tupone
  0 siblings, 0 replies; 71+ messages in thread
From: Alfredo Tupone @ 2024-03-11 19:28 UTC (permalink / raw
  To: gentoo-commits

commit:     04e14cabcf1361cd6f71cc29eb5787f697cf1b85
Author:     Sv. Lockal <lockalsash <AT> gmail <DOT> com>
AuthorDate: Mon Mar 11 16:34:59 2024 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Mon Mar 11 19:27:44 2024 +0000
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 <lockalsash <AT> gmail.com>
Signed-off-by: Alfredo Tupone <tupone <AT> 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 )


^ permalink raw reply related	[flat|nested] 71+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
@ 2024-03-30 19:36 Alfredo Tupone
  0 siblings, 0 replies; 71+ messages in thread
From: Alfredo Tupone @ 2024-03-30 19:36 UTC (permalink / raw
  To: gentoo-commits

commit:     07e13e6234fcd1c25b5b54a70de4ecaae294b669
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 30 19:35:22 2024 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Sat Mar 30 19:35:53 2024 +0000
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 <tupone <AT> 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


^ permalink raw reply related	[flat|nested] 71+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
@ 2024-03-30 19:40 Alfredo Tupone
  0 siblings, 0 replies; 71+ messages in thread
From: Alfredo Tupone @ 2024-03-30 19:40 UTC (permalink / raw
  To: gentoo-commits

commit:     0cb2f08e6e3fa80ebfa391a0ae95976d2c4f745c
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 30 19:38:22 2024 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Sat Mar 30 19:39:50 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0cb2f08e

sci-libs/caffe2: disable py3.9

Signed-off-by: Alfredo Tupone <tupone <AT> 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
 


^ permalink raw reply related	[flat|nested] 71+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
@ 2024-04-04  9:20 Alfredo Tupone
  0 siblings, 0 replies; 71+ messages in thread
From: Alfredo Tupone @ 2024-04-04  9:20 UTC (permalink / raw
  To: gentoo-commits

commit:     e74afa2c5f42fbc0ff31574a7796c7ee39727e9f
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Thu Apr  4 09:19:35 2024 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Thu Apr  4 09:20:03 2024 +0000
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 <tupone <AT> 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 000000000000..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
+	<sci-libs/onnx-1.15.0
+	sci-libs/foxi
+	cuda? (
+		=dev-libs/cudnn-8*
+		>=dev-libs/cudnn-frontend-0.9.2:0/8
+		<dev-util/nvidia-cuda-toolkit-12.4.0:=[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}]
+	')
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.2.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.2-fix-rpath.patch
+	"${FILESDIR}"/${PN}-2.1.2-fix-openmp-link.patch
+	"${FILESDIR}"/${PN}-2.1.2-rocm-fix-std-cpp17.patch
+)
+
+S="${WORKDIR}"/${MYP}
+
+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
+
+	if use rocm; then
+		sed -e "s:/opt/rocm:/usr:" \
+			-e "s:lib/cmake:$(get_libdir)/cmake: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() {
+	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_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=$(usex onednn)
+		-DUSE_NNPACK=$(usex nnpack)
+		-DUSE_QNNPACK=$(usex qnnpack)
+		-DUSE_XNNPACK=$(usex xnnpack)
+		-DUSE_SYSTEM_XNNPACK=$(usex xnnpack)
+		-DUSE_TENSORPIPE=$(usex distributed)
+		-DUSE_PYTORCH_QNNPACK=OFF
+		-DUSE_NUMPY=$(usex numpy)
+		-DUSE_OPENCL=$(usex opencl)
+		-DUSE_OPENCV=$(usex opencv)
+		-DUSE_OPENMP=$(usex openmp)
+		-DUSE_ROCM=$(usex rocm)
+		-DUSE_SYSTEM_CPUINFO=ON
+		-DUSE_SYSTEM_PYBIND11=ON
+		-DUSE_UCC=OFF
+		-DUSE_VALGRIND=OFF
+		-DPYBIND11_PYTHON_VERSION="${EPYTHON#python}"
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+		-DUSE_ITT=OFF
+		-DUSE_SYSTEM_PTHREADPOOL=ON
+		-DUSE_SYSTEM_FXDIV=ON
+		-DUSE_SYSTEM_FP16=ON
+		-DUSE_SYSTEM_GLOO=ON
+		-DUSE_SYSTEM_ONNX=ON
+		-DUSE_SYSTEM_SLEEF=ON
+		-DUSE_METAL=OFF
+
+		-Wno-dev
+		-DTORCH_INSTALL_LIB_DIR="${EPREFIX}"/usr/$(get_libdir)
+		-DLIBSHM_INSTALL_LIB_SUBDIR="${EPREFIX}"/usr/$(get_libdir)
+	)
+
+	if use mkl; then
+		mycmakeargs+=(-DBLAS=MKL)
+	elif use openblas; then
+		mycmakeargs+=(-DBLAS=OpenBLAS)
+	else
+		mycmakeargs+=(-DBLAS=Generic -DBLAS_LIBRARIES=)
+	fi
+
+	if use cuda; then
+		addpredict "/dev/nvidiactl" # bug 867706
+		addpredict "/dev/char"
+		addpredict "/proc/self/task" # bug 926116
+
+		mycmakeargs+=(
+			-DUSE_CUDNN=ON
+			-DTORCH_CUDA_ARCH_LIST="${TORCH_CUDA_ARCH_LIST:-3.5 7.0}"
+			-DUSE_NCCL=OFF # TODO: NVIDIA Collective Communication Library
+			-DCMAKE_CUDA_FLAGS="$(cuda_gccdir -f | tr -d \")"
+		)
+	elif use rocm; then
+		export PYTORCH_ROCM_ARCH="$(get_amdgpu_flags)"
+
+		mycmakeargs+=(
+			-DUSE_NCCL=ON
+			-DUSE_SYSTEM_NCCL=ON
+		)
+	fi
+
+	if use onednn; then
+		mycmakeargs+=(
+			-DUSE_MKLDNN=ON
+			-DMKLDNN_FOUND=ON
+			-DMKLDNN_LIBRARIES=dnnl
+			-DMKLDNN_INCLUDE_DIR="${ESYSROOT}/usr/include/oneapi/dnnl"
+		)
+	fi
+
+	cmake_src_configure
+
+	# do not rerun cmake and the build process in src_install
+	sed '/RERUN/,+1d' -i "${BUILD_DIR}"/build.ninja || die
+}
+
+src_install() {
+	cmake_src_install
+
+	insinto "/var/lib/${PN}"
+	doins "${BUILD_DIR}"/CMakeCache.txt
+
+	rm -rf python
+	mkdir -p python/torch/include || die
+	mv "${ED}"/usr/lib/python*/site-packages/caffe2 python/ || die
+	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
+}


^ permalink raw reply related	[flat|nested] 71+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
@ 2024-04-04  9:23 Alfredo Tupone
  0 siblings, 0 replies; 71+ messages in thread
From: Alfredo Tupone @ 2024-04-04  9:23 UTC (permalink / raw
  To: gentoo-commits

commit:     9bf81971012ea4d397d135669e9e17e7db9aa33c
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Thu Apr  4 09:22:11 2024 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Thu Apr  4 09:22:51 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9bf81971

sci-libs/caffe2: drop 2.2.1-r1

Signed-off-by: Alfredo Tupone <tupone <AT> 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..000000000000
--- 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
-	<sci-libs/onnx-1.15.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.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
-	"${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
-	"${FILESDIR}"/${PN}-2.1.2-rocm-fix-std-cpp17.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
-
-	if use rocm; then
-		sed -e "s:/opt/rocm:/usr:" \
-			-e "s:lib/cmake:$(get_libdir)/cmake: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() {
-	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_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=$(usex onednn)
-		-DUSE_NNPACK=$(usex nnpack)
-		-DUSE_QNNPACK=$(usex qnnpack)
-		-DUSE_XNNPACK=$(usex xnnpack)
-		-DUSE_SYSTEM_XNNPACK=$(usex xnnpack)
-		-DUSE_TENSORPIPE=$(usex distributed)
-		-DUSE_PYTORCH_QNNPACK=OFF
-		-DUSE_NUMPY=$(usex numpy)
-		-DUSE_OPENCL=$(usex opencl)
-		-DUSE_OPENCV=$(usex opencv)
-		-DUSE_OPENMP=$(usex openmp)
-		-DUSE_ROCM=$(usex rocm)
-		-DUSE_SYSTEM_CPUINFO=ON
-		-DUSE_SYSTEM_PYBIND11=ON
-		-DUSE_UCC=OFF
-		-DUSE_VALGRIND=OFF
-		-DPYBIND11_PYTHON_VERSION="${EPYTHON#python}"
-		-DPYTHON_EXECUTABLE="${PYTHON}"
-		-DUSE_ITT=OFF
-		-DUSE_SYSTEM_PTHREADPOOL=ON
-		-DUSE_SYSTEM_FXDIV=ON
-		-DUSE_SYSTEM_FP16=ON
-		-DUSE_SYSTEM_GLOO=ON
-		-DUSE_SYSTEM_ONNX=ON
-		-DUSE_SYSTEM_SLEEF=ON
-		-DUSE_METAL=OFF
-
-		-Wno-dev
-		-DTORCH_INSTALL_LIB_DIR="${EPREFIX}"/usr/$(get_libdir)
-		-DLIBSHM_INSTALL_LIB_SUBDIR="${EPREFIX}"/usr/$(get_libdir)
-	)
-
-	if use mkl; then
-		mycmakeargs+=(-DBLAS=MKL)
-	elif use openblas; then
-		mycmakeargs+=(-DBLAS=OpenBLAS)
-	else
-		mycmakeargs+=(-DBLAS=Generic -DBLAS_LIBRARIES=)
-	fi
-
-	if use cuda; then
-		addpredict "/dev/nvidiactl" # bug 867706
-		addpredict "/dev/char"
-		addpredict "/proc/self/task" # bug 926116
-
-		mycmakeargs+=(
-			-DUSE_CUDNN=ON
-			-DTORCH_CUDA_ARCH_LIST="${TORCH_CUDA_ARCH_LIST:-3.5 7.0}"
-			-DUSE_NCCL=OFF # TODO: NVIDIA Collective Communication Library
-			-DCMAKE_CUDA_FLAGS="$(cuda_gccdir -f | tr -d \")"
-		)
-	elif use rocm; then
-		export PYTORCH_ROCM_ARCH="$(get_amdgpu_flags)"
-
-		mycmakeargs+=(
-			-DUSE_NCCL=ON
-			-DUSE_SYSTEM_NCCL=ON
-		)
-	fi
-
-	if use onednn; then
-		mycmakeargs+=(
-			-DUSE_MKLDNN=ON
-			-DMKLDNN_FOUND=ON
-			-DMKLDNN_LIBRARIES=dnnl
-			-DMKLDNN_INCLUDE_DIR="${ESYSROOT}/usr/include/oneapi/dnnl"
-		)
-	fi
-
-	cmake_src_configure
-
-	# do not rerun cmake and the build process in src_install
-	sed '/RERUN/,+1d' -i "${BUILD_DIR}"/build.ninja || die
-}
-
-src_install() {
-	cmake_src_install
-
-	insinto "/var/lib/${PN}"
-	doins "${BUILD_DIR}"/CMakeCache.txt
-
-	rm -rf python
-	mkdir -p python/torch/include || die
-	mv "${ED}"/usr/lib/python*/site-packages/caffe2 python/ || die
-	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
-}


^ permalink raw reply related	[flat|nested] 71+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
@ 2024-04-04 16:28 Alfredo Tupone
  0 siblings, 0 replies; 71+ messages in thread
From: Alfredo Tupone @ 2024-04-04 16:28 UTC (permalink / raw
  To: gentoo-commits

commit:     0396599c81e3c642c58fdfee91772c126d9f7060
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Thu Apr  4 16:27:46 2024 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Thu Apr  4 16:27:59 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0396599c

sci-libs/caffe2: disable py3.9

Signed-off-by: Alfredo Tupone <tupone <AT> 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-util/nvidia-cuda-toolkit-12.4.0:=[profiler]
 	)
 	fbgemm? ( >=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 \


^ permalink raw reply related	[flat|nested] 71+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
@ 2024-04-20 19:31 Alfredo Tupone
  0 siblings, 0 replies; 71+ messages in thread
From: Alfredo Tupone @ 2024-04-20 19:31 UTC (permalink / raw
  To: gentoo-commits

commit:     b1d9422115a0e88c478bf837a0758a9fb4dc703a
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 20 19:21:38 2024 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Sat Apr 20 19:30:11 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1d94221

sci-libs/caffe2: VariableOrderWrong

Signed-off-by: Alfredo Tupone <tupone <AT> 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 \


^ permalink raw reply related	[flat|nested] 71+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
@ 2024-05-05 14:15 Alfredo Tupone
  0 siblings, 0 replies; 71+ messages in thread
From: Alfredo Tupone @ 2024-05-05 14:15 UTC (permalink / raw
  To: gentoo-commits

commit:     f8c60f22b1b7f11fc2913496a8e82d7ec8910be9
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Sun May  5 14:14:15 2024 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Sun May  5 14:14:59 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8c60f22

sci-libs/caffe2: remove onnx version limits

Signed-off-by: Alfredo Tupone <tupone <AT> 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
-	<sci-libs/onnx-1.15.0
+	sci-libs/onnx
 	sci-libs/foxi
 	cuda? (
 		=dev-libs/cudnn-8*

diff --git a/sci-libs/caffe2/caffe2-2.3.0.ebuild b/sci-libs/caffe2/caffe2-2.3.0-r1.ebuild
similarity index 99%
rename from sci-libs/caffe2/caffe2-2.3.0.ebuild
rename to sci-libs/caffe2/caffe2-2.3.0-r1.ebuild
index c69c5e8fdb58..749359d26e11 100644
--- a/sci-libs/caffe2/caffe2-2.3.0.ebuild
+++ b/sci-libs/caffe2/caffe2-2.3.0-r1.ebuild
@@ -42,11 +42,10 @@ RDEPEND="
 	dev-libs/pthreadpool
 	dev-libs/sleef
 	virtual/lapack
-	>=sci-libs/onnx-1.12.0
-	<sci-libs/onnx-1.15.0
+	sci-libs/onnx
 	sci-libs/foxi
 	cuda? (
-		=dev-libs/cudnn-8*
+		dev-libs/cudnn
 		>=dev-libs/cudnn-frontend-1.0.3:0/8
 		<dev-util/nvidia-cuda-toolkit-12.4.0:=[profiler]
 	)


^ permalink raw reply related	[flat|nested] 71+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
@ 2024-05-07  6:06 Alfredo Tupone
  0 siblings, 0 replies; 71+ messages in thread
From: Alfredo Tupone @ 2024-05-07  6:06 UTC (permalink / raw
  To: gentoo-commits

commit:     7016eada548b591cdeacaaf50aeca219128835b0
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Tue May  7 06:04:38 2024 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Tue May  7 06:05:21 2024 +0000
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 <tupone <AT> 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() {


^ permalink raw reply related	[flat|nested] 71+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
@ 2024-05-07 20:48 Alfredo Tupone
  0 siblings, 0 replies; 71+ messages in thread
From: Alfredo Tupone @ 2024-05-07 20:48 UTC (permalink / raw
  To: gentoo-commits

commit:     964b3b6e7907dae9b06570354dda1302affc9bdb
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Tue May  7 20:47:28 2024 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Tue May  7 20:48:07 2024 +0000
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 <tupone <AT> 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}]
 	')
 "
 


^ permalink raw reply related	[flat|nested] 71+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
@ 2024-05-09 18:46 Alfredo Tupone
  0 siblings, 0 replies; 71+ messages in thread
From: Alfredo Tupone @ 2024-05-09 18:46 UTC (permalink / raw
  To: gentoo-commits

commit:     27e4c06d52a66978ec41a325468bdd3b756236ba
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Thu May  9 18:44:58 2024 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Thu May  9 18:45:45 2024 +0000
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 <tupone <AT> 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 @@
 		<flag name="distributed">Support distributed applications</flag>
 		<flag name="fbgemm">Use FBGEMM</flag>
 		<flag name="ffmpeg">Add support for video processing operators</flag>
+		<flag name="flash">Enable flash attention</flag>
 		<flag name="gloo">Use sci-libs/gloo</flag>
 		<flag name="mkl">Use <pkg>sci-libs/mkl</pkg> for blas, lapack and sparse blas routines</flag>
 		<flag name="nnpack">Use NNPACK</flag>


^ permalink raw reply related	[flat|nested] 71+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
@ 2024-06-06 19:07 Alfredo Tupone
  0 siblings, 0 replies; 71+ messages in thread
From: Alfredo Tupone @ 2024-06-06 19:07 UTC (permalink / raw
  To: gentoo-commits

commit:     2fa3ad65f0c827f1a91ed2557d91fd938362581f
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Thu Jun  6 19:06:05 2024 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Thu Jun  6 19:07:00 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2fa3ad65

sci-libs/caffe2: add 2.3.1

Signed-off-by: Alfredo Tupone <tupone <AT> 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 000000000000..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-util/nvidia-cuda-toolkit-12.4.0:=[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.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}]
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	')
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.2.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}"/${P}-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.2.2-musl.patch
+	"${FILESDIR}"/${P}-CMakeFix.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
+
+	if use rocm; then
+		sed -e "s:/opt/rocm:/usr:" \
+			-e "s:lib/cmake:$(get_libdir)/cmake: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() {
+	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_DISTRIBUTED=$(usex distributed)
+		-DUSE_MPI=$(usex mpi)
+		-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)
+		-DUSE_KINETO=OFF # TODO
+		-DUSE_LEVELDB=OFF
+		-DUSE_MAGMA=OFF # TODO: In GURU as sci-libs/magma
+		-DUSE_MKLDNN=$(usex onednn)
+		-DUSE_NNPACK=$(usex nnpack)
+		-DUSE_QNNPACK=$(usex qnnpack)
+		-DUSE_XNNPACK=$(usex xnnpack)
+		-DUSE_SYSTEM_XNNPACK=$(usex xnnpack)
+		-DUSE_TENSORPIPE=$(usex distributed)
+		-DUSE_PYTORCH_QNNPACK=OFF
+		-DUSE_NUMPY=$(usex numpy)
+		-DUSE_OPENCL=$(usex opencl)
+		-DUSE_OPENCV=$(usex opencv)
+		-DUSE_OPENMP=$(usex openmp)
+		-DUSE_ROCM=$(usex rocm)
+		-DUSE_SYSTEM_CPUINFO=ON
+		-DUSE_SYSTEM_PYBIND11=ON
+		-DUSE_UCC=OFF
+		-DUSE_VALGRIND=OFF
+		-DPYBIND11_PYTHON_VERSION="${EPYTHON#python}"
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+		-DUSE_ITT=OFF
+		-DUSE_SYSTEM_PTHREADPOOL=ON
+		-DUSE_SYSTEM_FXDIV=ON
+		-DUSE_SYSTEM_FP16=ON
+		-DUSE_SYSTEM_GLOO=ON
+		-DUSE_SYSTEM_ONNX=ON
+		-DUSE_SYSTEM_SLEEF=ON
+		-DUSE_METAL=OFF
+
+		-Wno-dev
+		-DTORCH_INSTALL_LIB_DIR="${EPREFIX}"/usr/$(get_libdir)
+		-DLIBSHM_INSTALL_LIB_SUBDIR="${EPREFIX}"/usr/$(get_libdir)
+	)
+
+	if use mkl; then
+		mycmakeargs+=(-DBLAS=MKL)
+	elif use openblas; then
+		mycmakeargs+=(-DBLAS=OpenBLAS)
+	else
+		mycmakeargs+=(-DBLAS=Generic -DBLAS_LIBRARIES=)
+	fi
+
+	if use cuda; then
+		addpredict "/dev/nvidiactl" # bug 867706
+		addpredict "/dev/char"
+		addpredict "/proc/self/task" # bug 926116
+
+		mycmakeargs+=(
+			-DUSE_CUDNN=ON
+			-DTORCH_CUDA_ARCH_LIST="${TORCH_CUDA_ARCH_LIST:-3.5 7.0}"
+			-DUSE_NCCL=OFF # TODO: NVIDIA Collective Communication Library
+			-DCMAKE_CUDA_FLAGS="$(cuda_gccdir -f | tr -d \")"
+		)
+	elif use rocm; then
+		export PYTORCH_ROCM_ARCH="$(get_amdgpu_flags)"
+
+		mycmakeargs+=(
+			-DUSE_NCCL=ON
+			-DUSE_SYSTEM_NCCL=ON
+		)
+	fi
+
+	if use onednn; then
+		mycmakeargs+=(
+			-DUSE_MKLDNN=ON
+			-DMKLDNN_FOUND=ON
+			-DMKLDNN_LIBRARIES=dnnl
+			-DMKLDNN_INCLUDE_DIR="${ESYSROOT}/usr/include/oneapi/dnnl"
+		)
+	fi
+
+	cmake_src_configure
+
+	# do not rerun cmake and the build process in src_install
+	sed '/RERUN/,+1d' -i "${BUILD_DIR}"/build.ninja || die
+}
+
+src_install() {
+	cmake_src_install
+
+	insinto "/var/lib/${PN}"
+	doins "${BUILD_DIR}"/CMakeCache.txt
+
+	rm -rf python
+	mkdir -p python/torch/include || die
+	mv "${ED}"/usr/lib/python*/site-packages/caffe2 python/ || die
+	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
+}


^ permalink raw reply related	[flat|nested] 71+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
@ 2024-06-07  8:32 Alfredo Tupone
  0 siblings, 0 replies; 71+ messages in thread
From: Alfredo Tupone @ 2024-06-07  8:32 UTC (permalink / raw
  To: gentoo-commits

commit:     e5dff3ee293c89d0b8b4d38b9273e350286a3eb9
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Fri Jun  7 08:30:21 2024 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Fri Jun  7 08:31:12 2024 +0000
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 <tupone <AT> 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() {


^ permalink raw reply related	[flat|nested] 71+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
@ 2024-07-22 17:14 Alfredo Tupone
  0 siblings, 0 replies; 71+ messages in thread
From: Alfredo Tupone @ 2024-07-22 17:14 UTC (permalink / raw
  To: gentoo-commits

commit:     3176c1b32da0c6f3f9981fc4e606e6a5d9c9fd7e
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 22 17:11:34 2024 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Mon Jul 22 17:13:35 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3176c1b3

sci-libs/caffe2: fix deps

Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>

 sci-libs/caffe2/caffe2-2.3.1.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sci-libs/caffe2/caffe2-2.3.1.ebuild b/sci-libs/caffe2/caffe2-2.3.1.ebuild
index 51bab7c5dac7..6355d0083336 100644
--- a/sci-libs/caffe2/caffe2-2.3.1.ebuild
+++ b/sci-libs/caffe2/caffe2-2.3.1.ebuild
@@ -70,6 +70,7 @@ RDEPEND="
 		=sci-libs/rocThrust-5.7*[${ROCM_USEDEP}]
 		=sci-libs/rocPRIM-5.7*[${ROCM_USEDEP}]
 		=sci-libs/hipBLAS-5.7*[${ROCM_USEDEP}]
+		sci-libs/hipBLASLt
 		=sci-libs/hipFFT-5.7*[${ROCM_USEDEP}]
 		=sci-libs/hipSPARSE-5.7*[${ROCM_USEDEP}]
 		=sci-libs/hipRAND-5.7*[${ROCM_USEDEP}]


^ permalink raw reply related	[flat|nested] 71+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
@ 2024-09-15 17:36 Alfredo Tupone
  0 siblings, 0 replies; 71+ messages in thread
From: Alfredo Tupone @ 2024-09-15 17:36 UTC (permalink / raw
  To: gentoo-commits

commit:     5f25c1e96259f72ba80d6a2bf09de758819dd207
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 15 16:52:09 2024 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Sun Sep 15 17:32:10 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f25c1e9

sci-libs/caffe2: add 2.4.1

Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>

 sci-libs/caffe2/Manifest            |   1 +
 sci-libs/caffe2/caffe2-2.4.1.ebuild | 296 ++++++++++++++++++++++++++++++++++++
 2 files changed, 297 insertions(+)

diff --git a/sci-libs/caffe2/Manifest b/sci-libs/caffe2/Manifest
index d190ba229493..dd1a52237d51 100644
--- a/sci-libs/caffe2/Manifest
+++ b/sci-libs/caffe2/Manifest
@@ -3,3 +3,4 @@ DIST pytorch-2.2.2.tar.gz 116367503 BLAKE2B 0be22f2ec4b9aac6f5e976664cae01facf07
 DIST pytorch-2.3.0.tar.gz 117029829 BLAKE2B 8f9c0d71ee0a9219b495eddccdcc65107f7ad537c43c68100b229f3d27b0e6c01ccb1659c7fffc356a48d80f2adc0a10361305dc8f1df20446de837d380f89f6 SHA512 67f7e9a096c3ffb952206ebf9105bedebb68c24ad82456083adf1d1d210437fcaa9dd52b68484cfc97d408c9eebc9541c76868c34a7c9982494dc3f424cfb07c
 DIST pytorch-2.3.1.tar.gz 117035696 BLAKE2B d419d7fa1342f1fb317ffce09ec9dc1447414627cc83d36578fe60f68c283c620b2b4d49f414cd206d537b90b16432a06cd1941662720db05d5e2b6c493325f5 SHA512 e1bcae44f9939fc7ccb1360a9b1970d92426f25e5de73e36964df3dd15ad5d8d9f5bd2f9a7dda6b8f64e2bba3674005bd869f542489cc442ad0125a02676f587
 DIST pytorch-2.4.0.tar.gz 115031093 BLAKE2B d206477963977011627df284efa01482fbf57e9fcb5f58f51d679c742b8e5dde6aa6affd8745ab817fcd09477d129a81e74e07be576b5d3585eaca1c735b8e01 SHA512 804d25944035f33de6591fd942fbda44d3de037717a4397d38a97474b01775d30eaf93d16dd708a832c0119050d24d73b90990fd3e3773be79d26ada25244d22
+DIST pytorch-2.4.1.tar.gz 115029469 BLAKE2B c2909ff27d527bc57cba56b780d3b8cd07a043ab045caa6c6b27857a16f9ad10aaab2116b26226b1e46ee08ffb44007965d914464418e4ae14ca48c3f3f383bb SHA512 7e9b4485e242eaf0d648765c6621d73d95e7107b766646a098175436d1ab2e2b864badd0757a3bab6b7c318233f2120bad9ac07b39bb9e357897919580c87631

diff --git a/sci-libs/caffe2/caffe2-2.4.1.ebuild b/sci-libs/caffe2/caffe2-2.4.1.ebuild
new file mode 100644
index 000000000000..6af5a5c2e4c4
--- /dev/null
+++ b/sci-libs/caffe2/caffe2-2.4.1.ebuild
@@ -0,0 +1,296 @@
+# 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=6.1
+inherit python-single-r1 cmake cuda flag-o-matic prefix rocm toolchain-funcs
+
+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
+	https://dev.gentoo.org/~tupone/distfiles/${PN}-patches-20240809.tar.gz"
+
+S="${WORKDIR}"/${MYP}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="cuda distributed fbgemm flash gloo mkl mpi nnpack +numpy onednn openblas opencl openmp qnnpack rocm xnnpack"
+RESTRICT="test"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	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-cpp/opentelemetry-cpp
+	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-util/nvidia-cuda-toolkit-12.4.0:=[profiler]
+	)
+	fbgemm? ( >=dev-libs/FBGEMM-2023.12.01 )
+	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 )
+	qnnpack? (
+		!sci-libs/QNNPACK
+		dev-cpp/gemmlowp
+	)
+	rocm? (
+		=dev-util/hip-6.1*
+		=dev-libs/rccl-6.1*[${ROCM_USEDEP}]
+		=sci-libs/rocThrust-6.1*[${ROCM_USEDEP}]
+		=sci-libs/rocPRIM-6.1*[${ROCM_USEDEP}]
+		=sci-libs/hipBLAS-6.1*[${ROCM_USEDEP}]
+		=sci-libs/hipFFT-6.1*[${ROCM_USEDEP}]
+		=sci-libs/hipSPARSE-6.1*[${ROCM_USEDEP}]
+		=sci-libs/hipRAND-6.1*[${ROCM_USEDEP}]
+		=sci-libs/hipCUB-6.1*[${ROCM_USEDEP}]
+		=sci-libs/hipSOLVER-6.1*[${ROCM_USEDEP}]
+		=sci-libs/miopen-6.1*[${ROCM_USEDEP}]
+		=dev-util/roctracer-6.1*[${ROCM_USEDEP}]
+
+		=sci-libs/hipBLASLt-6.1*
+		amdgpu_targets_gfx90a? ( =sci-libs/hipBLASLt-6.1*[amdgpu_targets_gfx90a] )
+		amdgpu_targets_gfx940? ( =sci-libs/hipBLASLt-6.1*[amdgpu_targets_gfx940] )
+		amdgpu_targets_gfx941? ( =sci-libs/hipBLASLt-6.1*[amdgpu_targets_gfx941] )
+		amdgpu_targets_gfx942? ( =sci-libs/hipBLASLt-6.1*[amdgpu_targets_gfx942] )
+	)
+	distributed? (
+		sci-libs/tensorpipe[cuda?]
+		dev-cpp/cpp-httplib
+	)
+	xnnpack? ( >=sci-libs/XNNPACK-2024.02.29 )
+	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_p20240525
+	$(python_gen_cond_dep '
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/pybind11[${PYTHON_USEDEP}]
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	')
+"
+
+PATCHES=(
+	../patches/${PN}-2.4.0-gentoo.patch
+	../patches/${PN}-2.4.0-install-dirs.patch
+	../patches/${PN}-1.12.0-glog-0.6.0.patch
+	../patches/${PN}-1.13.1-tensorpipe.patch
+	../patches/${PN}-2.3.0-cudnn_include_fix.patch
+	../patches/${PN}-2.1.2-fix-rpath.patch
+	../patches/${PN}-2.4.0-fix-openmp-link.patch
+	../patches/${PN}-2.4.0-rocm-fix-std-cpp17.patch
+	../patches/${PN}-2.2.2-musl.patch
+	../patches/${PN}-2.4.0-exclude-aotriton.patch
+	../patches/${PN}-2.3.0-fix-rocm-gcc14-clamp.patch
+	../patches/${PN}-2.3.0-fix-libcpp.patch
+	"${FILESDIR}"/${PN}-2.4.0-libfmt-11.patch
+	"${FILESDIR}"/${PN}-2.4.0-cpp-httplib.patch
+	"${FILESDIR}"/${PN}-2.4.0-cstdint.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
+
+	if use rocm; then
+		sed -e "s:/opt/rocm:/usr:" \
+			-e "s:lib/cmake:$(get_libdir)/cmake: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() {
+	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_DISTRIBUTED=$(usex distributed)
+		-DUSE_MPI=$(usex mpi)
+		-DUSE_FAKELOWP=OFF
+		-DUSE_FBGEMM=$(usex fbgemm)
+		-DUSE_FLASH_ATTENTION=$(usex flash)
+		-DUSE_MEM_EFF_ATTENTION=OFF
+		-DUSE_GFLAGS=ON
+		-DUSE_GLOG=ON
+		-DUSE_GLOO=$(usex gloo)
+		-DUSE_KINETO=OFF # TODO
+		-DUSE_MAGMA=OFF # TODO: In GURU as sci-libs/magma
+		-DUSE_MKLDNN=$(usex onednn)
+		-DUSE_NNPACK=$(usex nnpack)
+		-DUSE_XNNPACK=$(usex xnnpack)
+		-DUSE_SYSTEM_XNNPACK=$(usex xnnpack)
+		-DUSE_TENSORPIPE=$(usex distributed)
+		-DUSE_PYTORCH_QNNPACK=$(usex qnnpack)
+		-DUSE_NUMPY=$(usex numpy)
+		-DUSE_OPENCL=$(usex opencl)
+		-DUSE_OPENMP=$(usex openmp)
+		-DUSE_ROCM=$(usex rocm)
+		-DUSE_SYSTEM_CPUINFO=ON
+		-DUSE_SYSTEM_PYBIND11=ON
+		-DUSE_UCC=OFF
+		-DUSE_VALGRIND=OFF
+		-DPython_EXECUTABLE="${PYTHON}"
+		-DUSE_ITT=OFF
+		-DUSE_SYSTEM_PTHREADPOOL=ON
+		-DUSE_SYSTEM_PSIMD=ON
+		-DUSE_SYSTEM_FXDIV=ON
+		-DUSE_SYSTEM_FP16=ON
+		-DUSE_SYSTEM_GLOO=ON
+		-DUSE_SYSTEM_ONNX=ON
+		-DUSE_SYSTEM_SLEEF=ON
+		-DUSE_PYTORCH_METAL=OFF
+		-DUSE_XPU=OFF
+
+		-Wno-dev
+		-DTORCH_INSTALL_LIB_DIR="${EPREFIX}"/usr/$(get_libdir)
+		-DLIBSHM_INSTALL_LIB_SUBDIR="${EPREFIX}"/usr/$(get_libdir)
+	)
+
+	if use mkl; then
+		mycmakeargs+=(-DBLAS=MKL)
+	elif use openblas; then
+		mycmakeargs+=(-DBLAS=OpenBLAS)
+	else
+		mycmakeargs+=(-DBLAS=Generic -DBLAS_LIBRARIES=)
+	fi
+
+	if use cuda; then
+		addpredict "/dev/nvidiactl" # bug 867706
+		addpredict "/dev/char"
+		addpredict "/proc/self/task" # bug 926116
+
+		mycmakeargs+=(
+			-DUSE_CUDNN=ON
+			-DTORCH_CUDA_ARCH_LIST="${TORCH_CUDA_ARCH_LIST:-3.5 7.0}"
+			-DUSE_NCCL=OFF # TODO: NVIDIA Collective Communication Library
+			-DCMAKE_CUDA_FLAGS="$(cuda_gccdir -f | tr -d \")"
+		)
+	elif use rocm; then
+		export PYTORCH_ROCM_ARCH="$(get_amdgpu_flags)"
+
+		mycmakeargs+=(
+			-DUSE_NCCL=ON
+			-DUSE_SYSTEM_NCCL=ON
+		)
+
+		# ROCm libraries produce too much warnings
+		append-cxxflags -Wno-deprecated-declarations -Wno-unused-result
+
+		if tc-is-clang; then
+			# fix mangling in LLVM: https://github.com/llvm/llvm-project/issues/85656
+			append-cxxflags -fclang-abi-compat=17
+		fi
+	fi
+
+	if use onednn; then
+		mycmakeargs+=(
+			-DUSE_MKLDNN=ON
+			-DMKLDNN_FOUND=ON
+			-DMKLDNN_LIBRARIES=dnnl
+			-DMKLDNN_INCLUDE_DIR="${ESYSROOT}/usr/include/oneapi/dnnl"
+		)
+	fi
+
+	cmake_src_configure
+
+	# do not rerun cmake and the build process in src_install
+	sed '/RERUN/,+1d' -i "${BUILD_DIR}"/build.ninja || die
+}
+
+src_install() {
+	cmake_src_install
+
+	insinto "/var/lib/${PN}"
+	doins "${BUILD_DIR}"/CMakeCache.txt
+
+	rm -rf python
+	mkdir -p python/torch/include || die
+	mv "${ED}"/usr/lib/python*/site-packages/caffe2 python/ || die
+	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
+}


^ permalink raw reply related	[flat|nested] 71+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
@ 2024-09-15 18:43 Alfredo Tupone
  0 siblings, 0 replies; 71+ messages in thread
From: Alfredo Tupone @ 2024-09-15 18:43 UTC (permalink / raw
  To: gentoo-commits

commit:     c301811bfd857e80951713b04f3074f8d11fe037
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 15 17:54:07 2024 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Sun Sep 15 18:38:31 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c301811b

sci-libs/caffe2: drop 2.2.2-r1

Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>

 sci-libs/caffe2/Manifest               |   1 -
 sci-libs/caffe2/caffe2-2.2.2-r1.ebuild | 270 ---------------------------------
 2 files changed, 271 deletions(-)

diff --git a/sci-libs/caffe2/Manifest b/sci-libs/caffe2/Manifest
index dd1a52237d51..8233a46783dc 100644
--- a/sci-libs/caffe2/Manifest
+++ b/sci-libs/caffe2/Manifest
@@ -1,5 +1,4 @@
 DIST caffe2-patches-20240809.tar.gz 15242 BLAKE2B 77503c61487e7d85cca5afcab9a6e638f9833a70861845638cf1b62bc492d7b6650e6db81d53ebb2f39c6313509250d339f725f04d03ec6dd23dd0cf70843d8c SHA512 74b3b0b6671b655ecac93f7436c4ed7cb0157a83aafbf6afcc0811e11cef341cd8f638db1a111bcbb01e1a6dd4daf3a36b96d7a8ce90f04c2fa091bd6e3a142b
-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
 DIST pytorch-2.4.0.tar.gz 115031093 BLAKE2B d206477963977011627df284efa01482fbf57e9fcb5f58f51d679c742b8e5dde6aa6affd8745ab817fcd09477d129a81e74e07be576b5d3585eaca1c735b8e01 SHA512 804d25944035f33de6591fd942fbda44d3de037717a4397d38a97474b01775d30eaf93d16dd708a832c0119050d24d73b90990fd3e3773be79d26ada25244d22

diff --git a/sci-libs/caffe2/caffe2-2.2.2-r1.ebuild b/sci-libs/caffe2/caffe2-2.2.2-r1.ebuild
deleted file mode 100644
index 773808bc4f76..000000000000
--- a/sci-libs/caffe2/caffe2-2.2.2-r1.ebuild
+++ /dev/null
@@ -1,270 +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
-	https://dev.gentoo.org/~tupone/distfiles/${PN}-patches-20240809.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
-	sci-libs/foxi
-	cuda? (
-		=dev-libs/cudnn-8*
-		>=dev-libs/cudnn-frontend-0.9.2:0/8
-		<dev-util/nvidia-cuda-toolkit-12.4.0:=[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}]
-	')
-"
-
-PATCHES=(
-	../patches/${PN}-2.2.1-gentoo.patch
-	../patches/${PN}-1.13.0-install-dirs.patch
-	../patches/${PN}-1.12.0-glog-0.6.0.patch
-	../patches/${PN}-1.13.1-tensorpipe.patch
-	../patches/${PN}-2.0.0-gcc13.patch
-	../patches/${PN}-2.0.0-cudnn_include_fix.patch
-	../patches/${PN}-2.1.2-fix-rpath.patch
-	../patches/${PN}-2.1.2-fix-openmp-link.patch
-	../patches/${PN}-2.1.2-rocm-fix-std-cpp17.patch
-	../patches/${P}-musl.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
-
-	if use rocm; then
-		sed -e "s:/opt/rocm:/usr:" \
-			-e "s:lib/cmake:$(get_libdir)/cmake: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() {
-	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_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=$(usex onednn)
-		-DUSE_NNPACK=$(usex nnpack)
-		-DUSE_QNNPACK=$(usex qnnpack)
-		-DUSE_XNNPACK=$(usex xnnpack)
-		-DUSE_SYSTEM_XNNPACK=$(usex xnnpack)
-		-DUSE_TENSORPIPE=$(usex distributed)
-		-DUSE_PYTORCH_QNNPACK=OFF
-		-DUSE_NUMPY=$(usex numpy)
-		-DUSE_OPENCL=$(usex opencl)
-		-DUSE_OPENCV=$(usex opencv)
-		-DUSE_OPENMP=$(usex openmp)
-		-DUSE_ROCM=$(usex rocm)
-		-DUSE_SYSTEM_CPUINFO=ON
-		-DUSE_SYSTEM_PYBIND11=ON
-		-DUSE_UCC=OFF
-		-DUSE_VALGRIND=OFF
-		-DPYBIND11_PYTHON_VERSION="${EPYTHON#python}"
-		-DPYTHON_EXECUTABLE="${PYTHON}"
-		-DUSE_ITT=OFF
-		-DUSE_SYSTEM_PTHREADPOOL=ON
-		-DUSE_SYSTEM_FXDIV=ON
-		-DUSE_SYSTEM_FP16=ON
-		-DUSE_SYSTEM_GLOO=ON
-		-DUSE_SYSTEM_ONNX=ON
-		-DUSE_SYSTEM_SLEEF=ON
-		-DUSE_METAL=OFF
-
-		-Wno-dev
-		-DTORCH_INSTALL_LIB_DIR="${EPREFIX}"/usr/$(get_libdir)
-		-DLIBSHM_INSTALL_LIB_SUBDIR="${EPREFIX}"/usr/$(get_libdir)
-	)
-
-	if use mkl; then
-		mycmakeargs+=(-DBLAS=MKL)
-	elif use openblas; then
-		mycmakeargs+=(-DBLAS=OpenBLAS)
-	else
-		mycmakeargs+=(-DBLAS=Generic -DBLAS_LIBRARIES=)
-	fi
-
-	if use cuda; then
-		addpredict "/dev/nvidiactl" # bug 867706
-		addpredict "/dev/char"
-		addpredict "/proc/self/task" # bug 926116
-
-		mycmakeargs+=(
-			-DUSE_CUDNN=ON
-			-DTORCH_CUDA_ARCH_LIST="${TORCH_CUDA_ARCH_LIST:-3.5 7.0}"
-			-DUSE_NCCL=OFF # TODO: NVIDIA Collective Communication Library
-			-DCMAKE_CUDA_FLAGS="$(cuda_gccdir -f | tr -d \")"
-		)
-	elif use rocm; then
-		export PYTORCH_ROCM_ARCH="$(get_amdgpu_flags)"
-
-		mycmakeargs+=(
-			-DUSE_NCCL=ON
-			-DUSE_SYSTEM_NCCL=ON
-		)
-	fi
-
-	if use onednn; then
-		mycmakeargs+=(
-			-DUSE_MKLDNN=ON
-			-DMKLDNN_FOUND=ON
-			-DMKLDNN_LIBRARIES=dnnl
-			-DMKLDNN_INCLUDE_DIR="${ESYSROOT}/usr/include/oneapi/dnnl"
-		)
-	fi
-
-	cmake_src_configure
-
-	# do not rerun cmake and the build process in src_install
-	sed '/RERUN/,+1d' -i "${BUILD_DIR}"/build.ninja || die
-}
-
-src_install() {
-	cmake_src_install
-
-	insinto "/var/lib/${PN}"
-	doins "${BUILD_DIR}"/CMakeCache.txt
-
-	rm -rf python
-	mkdir -p python/torch/include || die
-	mv "${ED}"/usr/lib/python*/site-packages/caffe2 python/ || die
-	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
-}


^ permalink raw reply related	[flat|nested] 71+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
@ 2024-09-16 17:42 Alfredo Tupone
  0 siblings, 0 replies; 71+ messages in thread
From: Alfredo Tupone @ 2024-09-16 17:42 UTC (permalink / raw
  To: gentoo-commits

commit:     580d02432beaed6af819f89437de5fe5597b399a
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 16 17:35:45 2024 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Mon Sep 16 17:38:15 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=580d0243

sci-libs/caffe2: require sleef with avx512

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

 sci-libs/caffe2/caffe2-2.4.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/caffe2/caffe2-2.4.1.ebuild b/sci-libs/caffe2/caffe2-2.4.1.ebuild
index 6af5a5c2e4c4..f9d7151d0a06 100644
--- a/sci-libs/caffe2/caffe2-2.4.1.ebuild
+++ b/sci-libs/caffe2/caffe2-2.4.1.ebuild
@@ -44,7 +44,7 @@ RDEPEND="
 	dev-cpp/opentelemetry-cpp
 	dev-libs/protobuf:=
 	dev-libs/pthreadpool
-	dev-libs/sleef
+	dev-libs/sleef[cpu_flags_x86_avx512f(+)]
 	virtual/lapack
 	sci-libs/onnx
 	sci-libs/foxi


^ permalink raw reply related	[flat|nested] 71+ messages in thread

end of thread, other threads:[~2024-09-16 17:42 UTC | newest]

Thread overview: 71+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-07-02 16:20 [gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/ Alfredo Tupone
  -- strict thread matches above, loose matches on Subject: below --
2024-09-16 17:42 Alfredo Tupone
2024-09-15 18:43 Alfredo Tupone
2024-09-15 17:36 Alfredo Tupone
2024-07-22 17:14 Alfredo Tupone
2024-06-07  8:32 Alfredo Tupone
2024-06-06 19:07 Alfredo Tupone
2024-05-09 18:46 Alfredo Tupone
2024-05-07 20:48 Alfredo Tupone
2024-05-07  6:06 Alfredo Tupone
2024-05-05 14:15 Alfredo Tupone
2024-04-20 19:31 Alfredo Tupone
2024-04-04 16:28 Alfredo Tupone
2024-04-04  9:23 Alfredo Tupone
2024-04-04  9:20 Alfredo Tupone
2024-03-30 19:40 Alfredo Tupone
2024-03-30 19:36 Alfredo Tupone
2024-03-11 19:28 Alfredo Tupone
2024-03-08  7:26 Alfredo Tupone
2024-03-01 18:54 Alfredo Tupone
2024-02-24 21:57 Alfredo Tupone
2024-02-17 22:21 Alfredo Tupone
2024-02-03  7:22 Michał Górny
2024-01-28 22:53 Jonas Stein
2024-01-10 21:15 Alfredo Tupone
2024-01-09  7:17 Alfredo Tupone
2024-01-03 18:23 Alfredo Tupone
2023-12-29  9:53 Alfredo Tupone
2023-12-26 22:14 Alfredo Tupone
2023-12-23 16:05 Alfredo Tupone
2023-12-23  8:24 Alfredo Tupone
2023-12-22 22:27 Alfredo Tupone
2023-12-17  9:30 Alfredo Tupone
2023-12-14 18:30 Alfredo Tupone
2023-12-10 10:31 Alfredo Tupone
2023-12-06 19:49 Alfredo Tupone
2023-12-01  5:54 Alfredo Tupone
2023-08-11  8:40 Alfredo Tupone
2023-08-11  7:31 Alfredo Tupone
2023-08-01  7:30 Alfredo Tupone
2023-06-17 14:02 Alfredo Tupone
2023-05-15  6:27 Alfredo Tupone
2023-05-14  7:59 Alfredo Tupone
2023-05-08 21:00 Alfredo Tupone
2023-05-05  6:00 Alfredo Tupone
2023-04-23 17:25 Alfredo Tupone
2023-04-23 13:24 Alfredo Tupone
2023-04-08 14:29 Alfredo Tupone
2023-04-06 19:46 Alfredo Tupone
2023-03-26 18:10 Alfredo Tupone
2023-03-17 18:47 Alfredo Tupone
2023-02-28  7:12 Alfredo Tupone
2023-02-28  7:12 Alfredo Tupone
2023-02-27 14:16 Alfredo Tupone
2023-02-27  7:23 Alfredo Tupone
2023-02-20 21:22 Alfredo Tupone
2023-02-15 19:40 Alfredo Tupone
2023-02-15  7:36 Sam James
2023-02-15  7:18 Alfredo Tupone
2023-02-12  9:09 Alfredo Tupone
2023-01-03  6:22 Alfredo Tupone
2022-12-16 15:56 Alfredo Tupone
2022-11-30 18:20 Alfredo Tupone
2022-11-10 16:51 Alfredo Tupone
2022-09-14 20:52 Alfredo Tupone
2022-08-29  6:42 Alfredo Tupone
2022-08-04  8:00 Alfredo Tupone
2022-07-03 10:45 Alfredo Tupone
2022-06-26 20:24 Alfredo Tupone
2022-06-26 18:03 Alfredo Tupone
2022-06-26 17:30 Alfredo Tupone

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox