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 (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B7FA815813A for ; Fri, 10 Jan 2025 00:32:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8E165E077C; Fri, 10 Jan 2025 00:32:00 +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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AAB99E070D for ; Fri, 10 Jan 2025 00:31:59 +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 A88B2342FE7 for ; Fri, 10 Jan 2025 00:31:58 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DCEA211AC for ; Fri, 10 Jan 2025 00:31:56 +0000 (UTC) From: "Sam James" 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" Message-ID: <1736468950.b761d8281f96ed7e40e8455d274a58417967435d.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/rccl/, dev-libs/rccl/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/rccl/files/rccl-6.1.1-headers-fix.patch dev-libs/rccl/files/rccl-6.3.0-headers-fix.patch dev-libs/rccl/rccl-6.1.1.ebuild dev-libs/rccl/rccl-6.3.0.ebuild X-VCS-Directories: dev-libs/rccl/ dev-libs/rccl/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: b761d8281f96ed7e40e8455d274a58417967435d X-VCS-Branch: master Date: Fri, 10 Jan 2025 00:31:56 +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: 3171d325-d6c4-43b0-8cca-852a670aa2dc X-Archives-Hash: f885366ee1db4369b23c42ecc5c7151b commit: b761d8281f96ed7e40e8455d274a58417967435d Author: Sv. Lockal gmail com> AuthorDate: Tue Jan 7 15:20:04 2025 +0000 Commit: Sam James gentoo org> CommitDate: Fri Jan 10 00:29:10 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b761d828 dev-libs/rccl: fix tests compilation/execution with dev-cpp/gtest-1.15.2 Applied the same patch as in 6.3.0. Masked secondary device, as multiple devices with different capabilities break tests per https://rocm.docs.amd.com/projects/radeon/en/latest/docs/prerequisites.html#disable-igpu No change in built object -> no revbump. Closes: https://bugs.gentoo.org/947600 Signed-off-by: Sv. Lockal gmail.com> Closes: https://github.com/gentoo/gentoo/pull/40026 Signed-off-by: Sam James gentoo.org> .../{rccl-6.3.0-headers-fix.patch => rccl-6.1.1-headers-fix.patch} | 0 dev-libs/rccl/rccl-6.1.1.ebuild | 6 ++++-- dev-libs/rccl/rccl-6.3.0.ebuild | 7 ++++--- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dev-libs/rccl/files/rccl-6.3.0-headers-fix.patch b/dev-libs/rccl/files/rccl-6.1.1-headers-fix.patch similarity index 100% rename from dev-libs/rccl/files/rccl-6.3.0-headers-fix.patch rename to dev-libs/rccl/files/rccl-6.1.1-headers-fix.patch diff --git a/dev-libs/rccl/rccl-6.1.1.ebuild b/dev-libs/rccl/rccl-6.1.1.ebuild index 8b583cb22096..a3838aa9d4a2 100644 --- a/dev-libs/rccl/rccl-6.1.1.ebuild +++ b/dev-libs/rccl/rccl-6.1.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -32,6 +32,7 @@ RESTRICT="!test? ( test )" PATCHES=( "${FILESDIR}/${PN}-6.0.2-fix-version-check.patch" + "${FILESDIR}/${PN}-6.1.1-headers-fix.patch" ) src_prepare() { @@ -67,5 +68,6 @@ src_configure() { src_test() { check_amdgpu cd "${BUILD_DIR}" || die - LD_LIBRARY_PATH="${BUILD_DIR}" edob test/rccl-UnitTests + # APU (as second device, if any) expectedly breaks tests + HIP_VISIBLE_DEVICES=0 LD_LIBRARY_PATH="${BUILD_DIR}" edob test/rccl-UnitTests } diff --git a/dev-libs/rccl/rccl-6.3.0.ebuild b/dev-libs/rccl/rccl-6.3.0.ebuild index d610f7eb139c..13edd47c89de 100644 --- a/dev-libs/rccl/rccl-6.3.0.ebuild +++ b/dev-libs/rccl/rccl-6.3.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -33,7 +33,7 @@ RESTRICT="!test? ( test )" PATCHES=( "${FILESDIR}/${PN}-6.0.2-fix-version-check.patch" "${FILESDIR}/${PN}-6.3.0-same-rank-sendrecv.patch" - "${FILESDIR}/${PN}-6.3.0-headers-fix.patch" + "${FILESDIR}/${PN}-6.1.1-headers-fix.patch" ) src_prepare() { @@ -71,5 +71,6 @@ src_configure() { src_test() { check_amdgpu cd "${BUILD_DIR}" || die - LD_LIBRARY_PATH="${BUILD_DIR}" edob test/rccl-UnitTests + # APU (as second device, if any) expectedly breaks tests + HIP_VISIBLE_DEVICES=0 LD_LIBRARY_PATH="${BUILD_DIR}" edob test/rccl-UnitTests }