Gentoo Archives: gentoo-commits

From: Alfredo Tupone <tupone@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
Date: Tue, 28 Feb 2023 07:12:38
Message-Id: 1677568325.70a1cabccd1d81a307686ab693d0443a439b64d1.tupone@gentoo
1 commit: 70a1cabccd1d81a307686ab693d0443a439b64d1
2 Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
3 AuthorDate: Tue Feb 28 07:10:59 2023 +0000
4 Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
5 CommitDate: Tue Feb 28 07:12:05 2023 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70a1cabc
7
8 sci-libs/caffe2: add mpi use flag
9
10 Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
11
12 .../caffe2/{caffe2-1.13.1-r2.ebuild => caffe2-1.13.1-r3.ebuild} | 8 ++++++--
13 sci-libs/caffe2/metadata.xml | 1 +
14 2 files changed, 7 insertions(+), 2 deletions(-)
15
16 diff --git a/sci-libs/caffe2/caffe2-1.13.1-r2.ebuild b/sci-libs/caffe2/caffe2-1.13.1-r3.ebuild
17 similarity index 95%
18 rename from sci-libs/caffe2/caffe2-1.13.1-r2.ebuild
19 rename to sci-libs/caffe2/caffe2-1.13.1-r3.ebuild
20 index d985af6d9995..04521a5c26ef 100644
21 --- a/sci-libs/caffe2/caffe2-1.13.1-r2.ebuild
22 +++ b/sci-libs/caffe2/caffe2-1.13.1-r3.ebuild
23 @@ -17,11 +17,12 @@ SRC_URI="https://github.com/pytorch/${MYPN}/archive/refs/tags/v${PV}.tar.gz
24 LICENSE="BSD"
25 SLOT="0"
26 KEYWORDS="~amd64"
27 -IUSE="cuda ffmpeg nnpack +numpy opencl opencv openmp qnnpack xnnpack"
28 +IUSE="cuda distributed ffmpeg mpi nnpack +numpy opencl opencv openmp qnnpack xnnpack"
29 RESTRICT="test"
30 REQUIRED_USE="
31 ${PYTHON_REQUIRED_USE}
32 ffmpeg? ( opencv )
33 + mpi? ( distributed )
34 " # ?? ( cuda rocm )
35
36 # CUDA 12 not supported yet: https://github.com/pytorch/pytorch/issues/91122
37 @@ -43,6 +44,7 @@ RDEPEND="
38 <dev-util/nvidia-cuda-toolkit-12:=[profiler]
39 )
40 ffmpeg? ( media-video/ffmpeg:= )
41 + mpi? ( sys-cluster/openmpi )
42 nnpack? ( sci-libs/NNPACK )
43 numpy? ( $(python_gen_cond_dep '
44 dev-python/numpy[${PYTHON_USEDEP}]
45 @@ -108,7 +110,8 @@ src_configure() {
46 -DUSE_CUDNN=$(usex cuda)
47 -DUSE_FAST_NVCC=$(usex cuda)
48 -DTORCH_CUDA_ARCH_LIST="${TORCH_CUDA_ARCH_LIST:-3.5 7.0}"
49 - -DUSE_DISTRIBUTED=OFF
50 + -DUSE_DISTRIBUTED=$(usex distributed)
51 + -DUSE_MPI=$(usex mpi)
52 -DUSE_FAKELOWP=OFF
53 -DUSE_FBGEMM=OFF # TODO
54 -DUSE_FFMPEG=$(usex ffmpeg)
55 @@ -132,6 +135,7 @@ src_configure() {
56 -DUSE_ROCM=OFF # TODO
57 -DUSE_SYSTEM_CPUINFO=ON
58 -DUSE_SYSTEM_PYBIND11=ON
59 + -DUSE_UCC=OFF
60 -DUSE_VALGRIND=OFF
61 -DPYBIND11_PYTHON_VERSION="${EPYTHON#python}"
62 -DPYTHON_EXECUTABLE="${PYTHON}"
63
64 diff --git a/sci-libs/caffe2/metadata.xml b/sci-libs/caffe2/metadata.xml
65 index 25a171ff1680..f009baee81bb 100644
66 --- a/sci-libs/caffe2/metadata.xml
67 +++ b/sci-libs/caffe2/metadata.xml
68 @@ -11,6 +11,7 @@
69 </maintainer>
70 <use>
71 <flag name="cuda">Add support for CUDA processing</flag>
72 + <flag name="distributed">Support distributed applications</flag>
73 <flag name="ffmpeg">Add support for video processing operators</flag>
74 <flag name="nnpack">Use NNPACK</flag>
75 <flag name="numpy">Add support for math operations through numpy</flag>