commit: 725ad515274266020396fdae1a5b949b30fdc127 Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org> AuthorDate: Tue Feb 28 20:37:40 2023 +0000 Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org> CommitDate: Tue Feb 28 20:38:24 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=725ad515
sci-libs/caffe2: add tensorpipe use flag Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org> .../{caffe2-1.13.1-r3.ebuild => caffe2-1.13.1-r4.ebuild} | 7 +++++-- sci-libs/caffe2/files/caffe2-1.13.1-tensorpipe.patch | 10 ++++++++++ sci-libs/caffe2/metadata.xml | 1 + 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/sci-libs/caffe2/caffe2-1.13.1-r3.ebuild b/sci-libs/caffe2/caffe2-1.13.1-r4.ebuild similarity index 96% rename from sci-libs/caffe2/caffe2-1.13.1-r3.ebuild rename to sci-libs/caffe2/caffe2-1.13.1-r4.ebuild index 04521a5c26ef..9411531dd1ec 100644 --- a/sci-libs/caffe2/caffe2-1.13.1-r3.ebuild +++ b/sci-libs/caffe2/caffe2-1.13.1-r4.ebuild @@ -17,12 +17,13 @@ SRC_URI="https://github.com/pytorch/${MYPN}/archive/refs/tags/v${PV}.tar.gz LICENSE="BSD" SLOT="0" KEYWORDS="~amd64" -IUSE="cuda distributed ffmpeg mpi nnpack +numpy opencl opencv openmp qnnpack xnnpack" +IUSE="cuda distributed ffmpeg mpi nnpack +numpy opencl opencv openmp qnnpack tensorpipe xnnpack" RESTRICT="test" REQUIRED_USE=" ${PYTHON_REQUIRED_USE} ffmpeg? ( opencv ) mpi? ( distributed ) + tensorpipe? ( distributed ) " # ?? ( cuda rocm ) # CUDA 12 not supported yet: https://github.com/pytorch/pytorch/issues/91122 @@ -52,6 +53,7 @@ RDEPEND=" opencl? ( virtual/opencl ) opencv? ( media-libs/opencv:= ) qnnpack? ( sci-libs/QNNPACK ) + tensorpipe? ( sci-libs/tensorpipe ) xnnpack? ( sci-libs/XNNPACK ) " DEPEND=" @@ -77,6 +79,7 @@ PATCHES=( "${FILESDIR}"/${PN}-1.13.0-install-dirs.patch "${FILESDIR}"/${PN}-1.12.0-glog-0.6.0.patch "${FILESDIR}"/${PN}-1.12.0-clang.patch + "${FILESDIR}"/${P}-tensorpipe.patch ) src_prepare() { @@ -127,6 +130,7 @@ src_configure() { -DUSE_QNNPACK=$(usex qnnpack) -DUSE_XNNPACK=$(usex xnnpack) -DUSE_SYSTEM_XNNPACK=$(usex xnnpack) + -DUSE_TENSORPIPE=$(usex tensorpipe) -DUSE_PYTORCH_QNNPACK=OFF -DUSE_NUMPY=$(usex numpy) -DUSE_OPENCL=$(usex opencl) @@ -147,7 +151,6 @@ src_configure() { -DUSE_SYSTEM_GLOO=ON -DUSE_SYSTEM_ONNX=ON -DUSE_SYSTEM_SLEEF=ON - -DUSE_TENSORPIPE=OFF -Wno-dev -DTORCH_INSTALL_LIB_DIR="${EPREFIX}"/usr/$(get_libdir) diff --git a/sci-libs/caffe2/files/caffe2-1.13.1-tensorpipe.patch b/sci-libs/caffe2/files/caffe2-1.13.1-tensorpipe.patch new file mode 100644 index 000000000000..ae0cac9fb947 --- /dev/null +++ b/sci-libs/caffe2/files/caffe2-1.13.1-tensorpipe.patch @@ -0,0 +1,10 @@ +--- a/cmake/Dependencies.cmake 2023-02-28 14:14:49.099057348 +0100 ++++ b/cmake/Dependencies.cmake 2023-02-28 14:15:05.326790806 +0100 +@@ -1404,7 +1404,6 @@ + + # Tensorpipe uses cuda_add_library + torch_update_find_cuda_flags() +- add_subdirectory(${PROJECT_SOURCE_DIR}/third_party/tensorpipe) + + list(APPEND Caffe2_DEPENDENCY_LIBS tensorpipe) + if(USE_CUDA) diff --git a/sci-libs/caffe2/metadata.xml b/sci-libs/caffe2/metadata.xml index f009baee81bb..531b9cbf5879 100644 --- a/sci-libs/caffe2/metadata.xml +++ b/sci-libs/caffe2/metadata.xml @@ -19,6 +19,7 @@ <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> </use> <upstream>