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 3421015808B for ; Sat, 17 Feb 2024 22:21:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 63275E2A14; Sat, 17 Feb 2024 22:21:58 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 2F23AE2A14 for ; Sat, 17 Feb 2024 22:21:58 +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 55096341214 for ; Sat, 17 Feb 2024 22:21:57 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B3ADD11CF for ; Sat, 17 Feb 2024 22:21:55 +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: <1708208495.49f65bf6621d8661f608fe3765a90417f53e23fd.tupone@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-libs/caffe2/caffe2-2.1.2-r3.ebuild sci-libs/caffe2/caffe2-2.1.2-r4.ebuild sci-libs/caffe2/metadata.xml X-VCS-Directories: sci-libs/caffe2/ X-VCS-Committer: tupone X-VCS-Committer-Name: Alfredo Tupone X-VCS-Revision: 49f65bf6621d8661f608fe3765a90417f53e23fd X-VCS-Branch: master Date: Sat, 17 Feb 2024 22:21:55 +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: 5809e117-229d-4788-94d8-7d75f00ee5a8 X-Archives-Hash: e7a0c7dfca8e2468ee64e99b14af4e70 commit: 49f65bf6621d8661f608fe3765a90417f53e23fd Author: Alfredo Tupone gentoo org> AuthorDate: Sat Feb 17 22:20:47 2024 +0000 Commit: Alfredo Tupone gentoo 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 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 @@ Use FBGEMM Add support for video processing operators Use sci-libs/gloo + Use sci-libs/mkl for blas, lapack and sparse blas routines Use NNPACK Add support for math operations through numpy Use oneDNN + Use sci-libs/openblas for blas routines Add support for image processing operators Use OpenMP for parallel code Use QNNPACK Use tensorpipe Use XNNPACK - Use sci-libs/mkl for blas, lapack and sparse blas routines pytorch/pytorch