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 D328C158093 for ; Sat, 2 Jul 2022 21:12:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 16009E0D19; Sat, 2 Jul 2022 21:12:55 +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 E8E05E0D19 for ; Sat, 2 Jul 2022 21:12:54 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 303DE341B76 for ; Sat, 2 Jul 2022 21:12:54 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D6774326 for ; Sat, 2 Jul 2022 21:12:52 +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: <1656796360.0f9a010a044de133417cbd56f63c32692451732c.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.11.0-r1.ebuild sci-libs/caffe2/caffe2-1.11.0-r2.ebuild sci-libs/caffe2/files/caffe2-1.11.0-gentoo.patch sci-libs/caffe2/metadata.xml X-VCS-Directories: sci-libs/caffe2/ sci-libs/caffe2/files/ X-VCS-Committer: tupone X-VCS-Committer-Name: Alfredo Tupone X-VCS-Revision: 0f9a010a044de133417cbd56f63c32692451732c X-VCS-Branch: master Date: Sat, 2 Jul 2022 21:12:52 +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: 36b77228-531b-4b75-a9ee-0b3bf90137bc X-Archives-Hash: 75d0b22f996198781f393ac16b9b3131 commit: 0f9a010a044de133417cbd56f63c32692451732c Author: Alfredo Tupone gentoo org> AuthorDate: Sat Jul 2 21:12:40 2022 +0000 Commit: Alfredo Tupone gentoo org> CommitDate: Sat Jul 2 21:12:40 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f9a010a sci-libs/caffe2: add support for nnpack Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Alfredo Tupone gentoo.org> .../{caffe2-1.11.0-r1.ebuild => caffe2-1.11.0-r2.ebuild} | 5 +++-- sci-libs/caffe2/files/caffe2-1.11.0-gentoo.patch | 11 +++++++++++ sci-libs/caffe2/metadata.xml | 1 + 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/sci-libs/caffe2/caffe2-1.11.0-r1.ebuild b/sci-libs/caffe2/caffe2-1.11.0-r2.ebuild similarity index 96% rename from sci-libs/caffe2/caffe2-1.11.0-r1.ebuild rename to sci-libs/caffe2/caffe2-1.11.0-r2.ebuild index d48fb9082441..c59a498341cd 100644 --- a/sci-libs/caffe2/caffe2-1.11.0-r1.ebuild +++ b/sci-libs/caffe2/caffe2-1.11.0-r2.ebuild @@ -18,7 +18,7 @@ LICENSE="BSD" SLOT="0" KEYWORDS="~amd64" RESTRICT="test" -IUSE="xnnpack" +IUSE="nnpack xnnpack" REQUIRED_USE="${PYTHON_REQUIRED_USE}" RDEPEND=" @@ -30,6 +30,7 @@ RDEPEND=" sci-libs/lapack sci-libs/onnx sci-libs/foxi + nnpack? ( sci-libs/NNPACK ) xnnpack? ( sci-libs/XNNPACK ) " DEPEND="${RDEPEND} @@ -62,7 +63,6 @@ src_configure() { -DUSE_GLOO=OFF -DUSE_SYSTEM_FP16=ON -DUSE_FBGEMM=OFF - -DUSE_NNPACK=OFF -DUSE_PYTORCH_QNNPACK=OFF -DUSE_QNNPACK=OFF -DUSE_SYSTEM_CPUINFO=ON @@ -81,6 +81,7 @@ src_configure() { -DUSE_SYSTEM_FXDIV=ON -DUSE_XNNPACK=$(usex xnnpack ON OFF) -DUSE_SYSTEM_XNNPACK=$(usex xnnpack ON OFF) + -DUSE_NNPACK=$(usex nnpack ON OFF) ) cmake_src_configure } diff --git a/sci-libs/caffe2/files/caffe2-1.11.0-gentoo.patch b/sci-libs/caffe2/files/caffe2-1.11.0-gentoo.patch index f34216ea0970..b6b35e2329e8 100644 --- a/sci-libs/caffe2/files/caffe2-1.11.0-gentoo.patch +++ b/sci-libs/caffe2/files/caffe2-1.11.0-gentoo.patch @@ -110,3 +110,14 @@ endif() # ========================================================== +--- a/cmake/External/nnpack.cmake 2022-07-02 21:56:54.905696921 +0200 ++++ b/cmake/External/nnpack.cmake 2022-07-02 21:57:03.665696739 +0200 +@@ -58,7 +58,7 @@ + set(PTHREADPOOL_SOURCE_DIR "${CAFFE2_THIRD_PARTY_ROOT}/pthreadpool" CACHE STRING "pthreadpool source directory") + set(GOOGLETEST_SOURCE_DIR "${CAFFE2_THIRD_PARTY_ROOT}/googletest" CACHE STRING "Google Test source directory") + +- if(NOT TARGET nnpack) ++ if(FALSE) + if(NOT USE_SYSTEM_PTHREADPOOL AND USE_INTERNAL_PTHREADPOOL_IMPL) + set(NNPACK_CUSTOM_THREADPOOL ON CACHE BOOL "") + endif() diff --git a/sci-libs/caffe2/metadata.xml b/sci-libs/caffe2/metadata.xml index bdd11115f0fe..da10df6e0739 100644 --- a/sci-libs/caffe2/metadata.xml +++ b/sci-libs/caffe2/metadata.xml @@ -6,6 +6,7 @@ Tupone Alfredo + Use NNPACK Use XNNPACK