From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1646960-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (unknown [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 4E1781580CF
for <garchives@archives.gentoo.org>; Wed, 26 Jun 2024 09:21:37 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id B01492BC0EB;
Wed, 26 Jun 2024 09:21:30 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.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))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 9564E2BC0EA
for <gentoo-commits@lists.gentoo.org>; Wed, 26 Jun 2024 09:21:30 +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 A4874343014
for <gentoo-commits@lists.gentoo.org>; Wed, 26 Jun 2024 09:21:29 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 186F41D64
for <gentoo-commits@lists.gentoo.org>; Wed, 26 Jun 2024 09:21:26 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1719393567.e7c753b648efded4b65fa85f70bdefb47aebbc35.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/Tensile/, sci-libs/rocBLAS/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-util/Tensile/Tensile-6.1.1.ebuild sci-libs/rocBLAS/rocBLAS-6.1.1.ebuild
X-VCS-Directories: sci-libs/rocBLAS/ dev-util/Tensile/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: e7c753b648efded4b65fa85f70bdefb47aebbc35
X-VCS-Branch: master
Date: Wed, 26 Jun 2024 09:21:26 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: fada39cc-e167-4d9f-aa76-3d8eab99bc70
X-Archives-Hash: 4889ab0f075d45ed43513b7b7b0e4976
commit: e7c753b648efded4b65fa85f70bdefb47aebbc35
Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com>
AuthorDate: Tue Jun 25 20:42:19 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jun 26 09:19:27 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7c753b6
sci-libs/rocBLAS: 6.1.1 make Tensile dependency optional
Building with Tensile requires actual hardware present, to avoid breaking CI
make this optional.
Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-util/Tensile/Tensile-6.1.1.ebuild | 1 +
sci-libs/rocBLAS/rocBLAS-6.1.1.ebuild | 34 ++++++++++++++++++++--------------
2 files changed, 21 insertions(+), 14 deletions(-)
diff --git a/dev-util/Tensile/Tensile-6.1.1.ebuild b/dev-util/Tensile/Tensile-6.1.1.ebuild
index fcb77f77972d..c8debc3456c3 100644
--- a/dev-util/Tensile/Tensile-6.1.1.ebuild
+++ b/dev-util/Tensile/Tensile-6.1.1.ebuild
@@ -28,6 +28,7 @@ RDEPEND="${PYTHON_DEPS}
>=dev-cpp/msgpack-cxx-6.0.0
dev-python/pyyaml[${PYTHON_USEDEP}]
dev-python/msgpack[${PYTHON_USEDEP}]
+ dev-python/joblib[${PYTHON_USEDEP}]
=dev-util/hip-6*
>=dev-util/rocm-smi-4.3.0
$(llvm_gen_dep '
diff --git a/sci-libs/rocBLAS/rocBLAS-6.1.1.ebuild b/sci-libs/rocBLAS/rocBLAS-6.1.1.ebuild
index fed17e82b14e..26bfc2ada24d 100644
--- a/sci-libs/rocBLAS/rocBLAS-6.1.1.ebuild
+++ b/sci-libs/rocBLAS/rocBLAS-6.1.1.ebuild
@@ -17,14 +17,15 @@ S="${WORKDIR}/${PN}-rocm-${PV}"
LICENSE="BSD"
SLOT="0/$(ver_cut 1-2)"
KEYWORDS="~amd64"
-IUSE="benchmark test"
+IUSE="benchmark test video_cards_amdgpu"
RESTRICT="!test? ( test )"
REQUIRED_USE="${ROCM_REQUIRED_USE}"
BDEPEND="
>=dev-build/rocm-cmake-5.3
- dev-util/Tensile:${SLOT}
- dev-python/joblib
+ video_cards_amdgpu? (
+ dev-util/Tensile:${SLOT}
+ )
test? ( dev-cpp/gtest )
"
@@ -66,20 +67,25 @@ src_configure() {
-DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF
-DROCM_SYMLINK_LIBS=OFF
-DAMDGPU_TARGETS="$(get_amdgpu_flags)"
- -DTensile_LOGIC="asm_full"
- -DTensile_COMPILER="hipcc"
- -DTensile_LIBRARY_FORMAT="msgpack"
- -DTensile_CODE_OBJECT_VERSION="default"
- -DTensile_ROOT="${EPREFIX}/usr/share/Tensile"
- -DBUILD_WITH_TENSILE=ON
+ -DBUILD_WITH_TENSILE="$(usex video_cards_amdgpu)"
-DCMAKE_INSTALL_INCLUDEDIR="include/rocblas"
-DBUILD_CLIENTS_SAMPLES=OFF
- -DBUILD_CLIENTS_TESTS=$(usex test ON OFF)
- -DBUILD_CLIENTS_BENCHMARKS=$(usex benchmark ON OFF)
- -DTensile_CPU_THREADS=$(makeopts_jobs)
+ -DBUILD_CLIENTS_TESTS="$(usex test)"
+ -DBUILD_CLIENTS_BENCHMARKS="$(usex benchmark)"
-DBUILD_WITH_PIP=OFF
)
+ if usex video_cards_amdgpu; then
+ mycmakeargs+=(
+ -DTensile_LOGIC="asm_full"
+ -DTensile_COMPILER="hipcc"
+ -DTensile_LIBRARY_FORMAT="msgpack"
+ -DTensile_CODE_OBJECT_VERSION="default"
+ -DTensile_ROOT="${EPREFIX}/usr/share/Tensile"
+ -DTensile_CPU_THREADS="$(makeopts_jobs)"
+ )
+ fi
+
CXX=hipcc cmake_src_configure
}
@@ -93,7 +99,7 @@ src_test() {
cd "${BUILD_DIR}"/clients/staging || die
export ROCBLAS_TEST_TIMEOUT=3600 ROCBLAS_TENSILE_LIBPATH="${BUILD_DIR}/Tensile/library"
export LD_LIBRARY_PATH="${BUILD_DIR}/clients:${BUILD_DIR}/library/src"
- edob ./${PN,,}-test
+ edob "./${PN,,}-test"
}
src_install() {
@@ -107,5 +113,5 @@ src_install() {
# Stop llvm-strip from removing .strtab section from *.hsaco files,
# otherwise rocclr/elf/elf.cpp complains with "failed: null sections(STRTAB)" and crashes
- dostrip -x /usr/$(get_libdir)/rocblas/library/
+ dostrip -x "/usr/$(get_libdir)/rocblas/library/"
}