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 35E0F158064 for ; Thu, 9 May 2024 18:46:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 71F782BC019; Thu, 9 May 2024 18:46:40 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 pigeon.gentoo.org (Postfix) with ESMTPS id 425042BC019 for ; Thu, 9 May 2024 18:46:40 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 43C7434309D for ; Thu, 9 May 2024 18:46:39 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D44F91A47 for ; Thu, 9 May 2024 18:46:37 +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: <1715280345.27e4c06d52a66978ec41a325468bdd3b756236ba.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.3.0-r2.ebuild sci-libs/caffe2/caffe2-2.3.0-r3.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: 27e4c06d52a66978ec41a325468bdd3b756236ba X-VCS-Branch: master Date: Thu, 9 May 2024 18:46:37 +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: a5ca4de0-04b3-4d1b-9cf8-a757c6fde379 X-Archives-Hash: 5b2d45b8647cadd771a2515ebaef8712 commit: 27e4c06d52a66978ec41a325468bdd3b756236ba Author: Alfredo Tupone gentoo org> AuthorDate: Thu May 9 18:44:58 2024 +0000 Commit: Alfredo Tupone gentoo org> CommitDate: Thu May 9 18:45:45 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27e4c06d sci-libs/caffe2: filtering FLASH ATTENTION by USE flash Bug: https://bugs.gentoo.org/931046 Signed-off-by: Alfredo Tupone gentoo.org> .../caffe2/{caffe2-2.3.0-r2.ebuild => caffe2-2.3.0-r3.ebuild} | 8 ++++++-- sci-libs/caffe2/metadata.xml | 1 + 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/sci-libs/caffe2/caffe2-2.3.0-r2.ebuild b/sci-libs/caffe2/caffe2-2.3.0-r3.ebuild similarity index 97% rename from sci-libs/caffe2/caffe2-2.3.0-r2.ebuild rename to sci-libs/caffe2/caffe2-2.3.0-r3.ebuild index 41630a00aa19..c01e904d8eb0 100644 --- a/sci-libs/caffe2/caffe2-2.3.0-r2.ebuild +++ b/sci-libs/caffe2/caffe2-2.3.0-r3.ebuild @@ -20,7 +20,7 @@ S="${WORKDIR}"/${MYP} LICENSE="BSD" SLOT="0" KEYWORDS="~amd64" -IUSE="cuda distributed fbgemm ffmpeg gloo mkl mpi nnpack +numpy onednn openblas opencl opencv openmp qnnpack rocm xnnpack" +IUSE="cuda distributed fbgemm ffmpeg flash gloo mkl mpi nnpack +numpy onednn openblas opencl opencv openmp qnnpack rocm xnnpack" RESTRICT="test" REQUIRED_USE=" ${PYTHON_REQUIRED_USE} @@ -28,7 +28,10 @@ REQUIRED_USE=" mpi? ( distributed ) gloo? ( distributed ) ?? ( cuda rocm ) - rocm? ( || ( ${ROCM_REQUIRED_USE} ) ) + rocm? ( + || ( ${ROCM_REQUIRED_USE} ) + !flash + ) " # CUDA 12 not supported yet: https://github.com/pytorch/pytorch/issues/91122 @@ -172,6 +175,7 @@ src_configure() { -DUSE_FAKELOWP=OFF -DUSE_FBGEMM=$(usex fbgemm) -DUSE_FFMPEG=$(usex ffmpeg) + -DUSE_FLASH_ATTENTION=$(usex flash) -DUSE_GFLAGS=ON -DUSE_GLOG=ON -DUSE_GLOO=$(usex gloo) diff --git a/sci-libs/caffe2/metadata.xml b/sci-libs/caffe2/metadata.xml index ed1f9fa58993..43aee37ffc47 100644 --- a/sci-libs/caffe2/metadata.xml +++ b/sci-libs/caffe2/metadata.xml @@ -9,6 +9,7 @@ Support distributed applications Use FBGEMM Add support for video processing operators + Enable flash attention Use sci-libs/gloo Use sci-libs/mkl for blas, lapack and sparse blas routines Use NNPACK