From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id BE280158030 for ; Tue, 28 Feb 2023 20:38:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D6C07E069C; Tue, 28 Feb 2023 20:38:49 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A58E7E069C for ; Tue, 28 Feb 2023 20:38:49 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AC2E133CEF2 for ; Tue, 28 Feb 2023 20:38:48 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BAC448B6 for ; Tue, 28 Feb 2023 20:38:46 +0000 (UTC) From: "Alfredo Tupone" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alfredo Tupone" Message-ID: <1677616704.725ad515274266020396fdae1a5b949b30fdc127.tupone@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/files/, sci-libs/caffe2/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-libs/caffe2/caffe2-1.13.1-r3.ebuild sci-libs/caffe2/caffe2-1.13.1-r4.ebuild sci-libs/caffe2/files/caffe2-1.13.1-tensorpipe.patch sci-libs/caffe2/metadata.xml X-VCS-Directories: sci-libs/caffe2/files/ sci-libs/caffe2/ X-VCS-Committer: tupone X-VCS-Committer-Name: Alfredo Tupone X-VCS-Revision: 725ad515274266020396fdae1a5b949b30fdc127 X-VCS-Branch: master Date: Tue, 28 Feb 2023 20:38:46 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 07e8a7a9-268f-4cd7-9446-1fd0b616c56c X-Archives-Hash: 11c07bad53547161a7729e996d917499 commit: 725ad515274266020396fdae1a5b949b30fdc127 Author: Alfredo Tupone gentoo org> AuthorDate: Tue Feb 28 20:37:40 2023 +0000 Commit: Alfredo Tupone gentoo 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 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 @@ Add support for image processing operators Use OpenMP for parallel code Use QNNPACK + Use tensorpipe Use XNNPACK