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 <[email protected]> Closes: gentoo#40026 Signed-off-by: Sam James <[email protected]>
ceamac · Jan 10, 2025 · b761d82 · b761d82
1 parent f144b20
commit b761d82
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/...s/rccl/files/rccl-6.3.0-headers-fix.patch → ...s/rccl/files/rccl-6.1.1-headers-fix.patch b/...s/rccl/files/rccl-6.3.0-headers-fix.patch → ...s/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
@@ -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
@@ -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
 }