public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/rccl/, dev-libs/rccl/files/
@ 2022-05-02  2:57 Benda XU
  0 siblings, 0 replies; 5+ messages in thread
From: Benda XU @ 2022-05-02  2:57 UTC (permalink / raw
  To: gentoo-commits

commit:     3b89366daa39042e92cf3a2577c3a3328070f573
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Mon May  2 02:56:49 2022 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Mon May  2 02:56:49 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b89366d

dev-libs/rccl: bump to 5.0.2.

Closes: https://bugs.gentoo.org/831662
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org>

 dev-libs/rccl/Manifest                             |  1 +
 .../files/rccl-5.0.2-change_install_location.patch | 31 ++++++++++++++++
 dev-libs/rccl/rccl-5.0.2.ebuild                    | 41 ++++++++++++++++++++++
 3 files changed, 73 insertions(+)

diff --git a/dev-libs/rccl/Manifest b/dev-libs/rccl/Manifest
index ef9abc099a66..b50fab6d5c7b 100644
--- a/dev-libs/rccl/Manifest
+++ b/dev-libs/rccl/Manifest
@@ -1,2 +1,3 @@
 DIST rccl-4.0.0.tar.gz 741814 BLAKE2B c20178e45fb7787ef7f5e20326f91f11a1b2a575277b5f28591b0be6efa6730c3509b11255372648f1df50e33b5e593dbe9c3334c5001f39423fc70acfa49d07 SHA512 d25754895d7b5695e46031642c2550cf2b6b5c42628d8381a23d6d1a48699a14a4fdf842205a14b96bdd1339341f9e558492ef9366a63036d8a8a7011d2c1b05
 DIST rccl-4.3.0.tar.gz 836631 BLAKE2B c7fede9cf92d3e75b79da2874c0a1e45c5fd4ad9d24b11c9870e9fdef8d571a286cbf54ae0a033f2aec3d21b06cafc2b1c097aaf87ecd628f0c33e9267103be1 SHA512 1a27e6441955f01c853861f83743da2fc9597978c3ff99f238734d4bafb1e277d626811b72c6a12563d69b2b8265960b8a2566df618921557837035b92993f0e
+DIST rccl-5.0.2.tar.gz 888060 BLAKE2B f75d83b0f52487b4f7a2d30763ae4fb0d216fc353e62de981057cb855d5b26c7b846622c76330029c1ed5bd195695308bcef5c67d39526032dfee254084a40f7 SHA512 ee62720926008f67fcae0fc9a6ace23ca593a156f74fce6012ff2a6fcffdc2e2dc70d48cd3830b217e68449ba3e677b4005d20bd4554aeccf17cba56713cb00f

diff --git a/dev-libs/rccl/files/rccl-5.0.2-change_install_location.patch b/dev-libs/rccl/files/rccl-5.0.2-change_install_location.patch
new file mode 100644
index 000000000000..11e3fea312de
--- /dev/null
+++ b/dev-libs/rccl/files/rccl-5.0.2-change_install_location.patch
@@ -0,0 +1,31 @@
+Index: rccl-rocm-5.0.2/CMakeLists.txt
+===================================================================
+--- rccl-rocm-5.0.2.orig/CMakeLists.txt
++++ rccl-rocm-5.0.2/CMakeLists.txt
+@@ -268,16 +268,12 @@ target_link_libraries(rccl INTERFACE hip
+ rocm_set_soversion(rccl "1.0")
+ 
+ rocm_install_targets(TARGETS
+-                     rccl
+-                     PREFIX
+                      rccl)
+ rocm_install(FILES ${PROJECT_BINARY_DIR}/rccl.h
+-        DESTINATION rccl/${CMAKE_INSTALL_INCLUDEDIR})
++        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+ 
+ rocm_export_targets(NAMESPACE
+                     roc::
+-                    PREFIX
+-                    rccl
+                     TARGETS
+                     rccl
+                     DEPENDS
+@@ -329,8 +325,6 @@ rocm_create_package(
+   "RCCL Maintainer <rccl-maintainer@amd.com>"
+   LDCONFIG)
+ 
+-rocm_install_symlink_subdir(rccl)
+-
+ if(BUILD_TESTS)
+   add_subdirectory(test)
+ endif()

diff --git a/dev-libs/rccl/rccl-5.0.2.ebuild b/dev-libs/rccl/rccl-5.0.2.ebuild
new file mode 100644
index 000000000000..045b52b33b0f
--- /dev/null
+++ b/dev-libs/rccl/rccl-5.0.2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="ROCm Communication Collectives Library (RCCL)"
+HOMEPAGE="https://github.com/ROCmSoftwarePlatform/rccl"
+SRC_URI="https://github.com/ROCmSoftwarePlatform/rccl/archive/rocm-${PV}.tar.gz -> rccl-${PV}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64"
+SLOT="0/$(ver_cut 1-2)"
+
+RDEPEND="dev-util/hip:${SLOT}"
+DEPEND="${RDEPEND}"
+BDEPEND=">=dev-util/cmake-3.22
+	>=dev-util/rocm-cmake-5.0.2-r1"
+
+S="${WORKDIR}/rccl-rocm-${PV}"
+
+PATCHES=(
+	"${FILESDIR}/rccl-5.0.2-change_install_location.patch"
+)
+
+src_configure() {
+	addwrite /dev/kfd
+	addpredict /dev/dri/
+
+	export DEVICE_LIB_PATH="${EPREFIX}/usr/lib/amdgcn/bitcode/"
+	export CXX=hipcc
+
+	local mycmakeargs=(
+		-DBUILD_TESTS=OFF
+		-Wno-dev
+		${AMDGPU_TARGETS+-DAMDGPU_TARGETS="${AMDGPU_TARGETS}"}
+	)
+
+	cmake_src_configure
+}


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/rccl/, dev-libs/rccl/files/
@ 2022-09-22  1:08 Benda XU
  0 siblings, 0 replies; 5+ messages in thread
From: Benda XU @ 2022-09-22  1:08 UTC (permalink / raw
  To: gentoo-commits

commit:     9798f1a204499b1c54a58aeaa8fbc962c20590b9
Author:     Yiyang Wu <xgreenlandforwyy <AT> gmail <DOT> com>
AuthorDate: Wed Aug  3 13:32:40 2022 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Thu Sep 22 01:07:56 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9798f1a2

dev-libs/rccl: add 5.1.3, using rocm.eclass

relax SLOT dependency on dev-util/hip, since rccl is also part of high
level ROCm libraries.

This unlocks the exact SLOT dependency of the lower and higher level
ROCm tools to make version bumps easier.

Signed-off-by: Yiyang Wu <xgreenlandforwyy <AT> gmail.com>
Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org>

 dev-libs/rccl/Manifest                             |  1 +
 .../rccl/files/rccl-5.1.3-remove-chrpath.patch     | 32 ++++++++++++++
 dev-libs/rccl/rccl-5.1.3.ebuild                    | 51 ++++++++++++++++++++++
 3 files changed, 84 insertions(+)

diff --git a/dev-libs/rccl/Manifest b/dev-libs/rccl/Manifest
index b50fab6d5c7b..801fbb23f13b 100644
--- a/dev-libs/rccl/Manifest
+++ b/dev-libs/rccl/Manifest
@@ -1,3 +1,4 @@
 DIST rccl-4.0.0.tar.gz 741814 BLAKE2B c20178e45fb7787ef7f5e20326f91f11a1b2a575277b5f28591b0be6efa6730c3509b11255372648f1df50e33b5e593dbe9c3334c5001f39423fc70acfa49d07 SHA512 d25754895d7b5695e46031642c2550cf2b6b5c42628d8381a23d6d1a48699a14a4fdf842205a14b96bdd1339341f9e558492ef9366a63036d8a8a7011d2c1b05
 DIST rccl-4.3.0.tar.gz 836631 BLAKE2B c7fede9cf92d3e75b79da2874c0a1e45c5fd4ad9d24b11c9870e9fdef8d571a286cbf54ae0a033f2aec3d21b06cafc2b1c097aaf87ecd628f0c33e9267103be1 SHA512 1a27e6441955f01c853861f83743da2fc9597978c3ff99f238734d4bafb1e277d626811b72c6a12563d69b2b8265960b8a2566df618921557837035b92993f0e
 DIST rccl-5.0.2.tar.gz 888060 BLAKE2B f75d83b0f52487b4f7a2d30763ae4fb0d216fc353e62de981057cb855d5b26c7b846622c76330029c1ed5bd195695308bcef5c67d39526032dfee254084a40f7 SHA512 ee62720926008f67fcae0fc9a6ace23ca593a156f74fce6012ff2a6fcffdc2e2dc70d48cd3830b217e68449ba3e677b4005d20bd4554aeccf17cba56713cb00f
+DIST rccl-5.1.3.tar.gz 908274 BLAKE2B 46bff7b6e3d60d5884ccd7e19c54b2f47f90a337a8fdc6dca1a3cfee147e3652e1f912642cc134d4a82bf8daabd9f1391edff139d0517ab1078bd3d9650481d7 SHA512 20deb27c7ef3e6b6b73409950ac0d51286b4634f7002ce36a9a02cdd1d5b1f2db51f6decf773af83364c94f58cc96837da25299f5f5494fc15d8559a1b3c7fcc

diff --git a/dev-libs/rccl/files/rccl-5.1.3-remove-chrpath.patch b/dev-libs/rccl/files/rccl-5.1.3-remove-chrpath.patch
new file mode 100644
index 000000000000..26bad572c7d8
--- /dev/null
+++ b/dev-libs/rccl/files/rccl-5.1.3-remove-chrpath.patch
@@ -0,0 +1,32 @@
+Manually chrpath not needed in CMakeLists since CMAKE_SKIP_RPATH=On
+So chrpath dependency is not needed
+===================================================================
+--- rccl-rocm-5.1.3.orig/test/CMakeLists.txt
++++ rccl-rocm-5.1.3/test/CMakeLists.txt
+@@ -5,11 +5,6 @@ if(BUILD_TESTS)
+ 
+   message("Going to build unit tests (Installed in /test/UnitTests)")
+ 
+-  find_program(CHRPATH chrpath)
+-  if(NOT CHRPATH)
+-      message(FATAL_ERROR "chrpath is required for UnitTests. Please install (e.g. sudo apt-get install chrpath)")
+-  endif()
+-
+   include_directories(${GTEST_INCLUDE_DIRS})
+ 
+   if(BUILD_ALLREDUCE_ONLY)
+@@ -88,14 +83,6 @@ if(BUILD_TESTS)
+   # HIPCC adds /opt/rocm/lib as RPATH, even though the install process is supposed to
+   # remove RPATH.  It also occurs before any user-specified rpath, which effectively overrides the user rpath.
+   #  As a work-around, set the correct RPATH for the unit test executable as a post-install step
+-  if (CMAKE_INSTALL_PREFIX MATCHES "${ROCM_PATH}")
+-    # install_prefix/CMAKE_INSTALL_PREFIX was not explicitly specified, so look in build/release
+-    add_custom_command( TARGET UnitTests POST_BUILD COMMAND chrpath ARGS -r ${CMAKE_BINARY_DIR}:${ROCM_PATH}/lib ${CMAKE_BINARY_DIR}/test/UnitTests)
+-    add_custom_command( TARGET UnitTestsMultiProcess POST_BUILD COMMAND chrpath ARGS -r ${CMAKE_BINARY_DIR}:${ROCM_PATH}/lib ${CMAKE_BINARY_DIR}/test/UnitTestsMultiProcess)
+-  else()
+-    add_custom_command( TARGET UnitTests POST_BUILD COMMAND chrpath ARGS -r ${CMAKE_INSTALL_PREFIX}/lib:${ROCM_PATH}/lib ${CMAKE_INSTALL_PREFIX}/test/UnitTests)
+-    add_custom_command( TARGET UnitTestsMultiProcess POST_BUILD COMMAND chrpath ARGS -r ${CMAKE_INSTALL_PREFIX}/lib:${ROCM_PATH}/lib ${CMAKE_INSTALL_PREFIX}/test/UnitTestsMultiProcess)
+-  endif()
+ else()
+   message("Not building unit tests")
+ endif()

diff --git a/dev-libs/rccl/rccl-5.1.3.ebuild b/dev-libs/rccl/rccl-5.1.3.ebuild
new file mode 100644
index 000000000000..b7256c9d8ed4
--- /dev/null
+++ b/dev-libs/rccl/rccl-5.1.3.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ROCM_VERSION=${PV}
+
+inherit cmake edo rocm
+
+DESCRIPTION="ROCm Communication Collectives Library (RCCL)"
+HOMEPAGE="https://github.com/ROCmSoftwarePlatform/rccl"
+SRC_URI="https://github.com/ROCmSoftwarePlatform/rccl/archive/rocm-${PV}.tar.gz -> rccl-${PV}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64"
+SLOT="0/$(ver_cut 1-2)"
+IUSE="test"
+
+RDEPEND="dev-util/hip
+dev-util/rocm-smi:${SLOT}"
+DEPEND="${RDEPEND}"
+BDEPEND=">=dev-util/cmake-3.22
+	>=dev-util/rocm-cmake-5.0.2-r1
+	test? ( dev-cpp/gtest )"
+
+RESTRICT="!test? ( test )"
+S="${WORKDIR}/rccl-rocm-${PV}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.0.2-change_install_location.patch"
+	"${FILESDIR}/${PN}-5.1.3-remove-chrpath.patch"
+)
+
+src_configure() {
+	addpredict /dev/kfd
+	addpredict /dev/dri/
+
+	local mycmakeargs=(
+		-DSKIP_RPATH=On
+		-DAMDGPU_TARGETS="$(get_amdgpu_flags)"
+		-DBUILD_TESTS=$(usex test ON OFF)
+		-Wno-dev
+	)
+
+	CXX=hipcc cmake_src_configure
+}
+
+src_test() {
+	check_amdgpu
+	LD_LIBRARY_PATH="${BUILD_DIR}" edob test/UnitTests
+}


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/rccl/, dev-libs/rccl/files/
@ 2024-07-20  6:42 Joonas Niilola
  0 siblings, 0 replies; 5+ messages in thread
From: Joonas Niilola @ 2024-07-20  6:42 UTC (permalink / raw
  To: gentoo-commits

commit:     7fe00708844e1eb3e21a415ba3aaff48abc716c9
Author:     NHOrus <jy6x2b32pie9 <AT> yahoo <DOT> com>
AuthorDate: Tue Jun 25 11:16:22 2024 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Jul 20 06:42:41 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7fe00708

dev-libs/rccl: drop 5.1.3

This package is only revdep of dropped rocm-smi, and it's obsolete with new-er
version in the tree and this one having way too many bugs that no one will
ever fix

Closes: https://bugs.gentoo.org/915856
Closes: https://bugs.gentoo.org/914274
Closes: https://bugs.gentoo.org/903965
Closes: https://bugs.gentoo.org/893472
Closes: https://bugs.gentoo.org/872311
Closes: https://bugs.gentoo.org/766848
Signed-off-by: NHOrus <jy6x2b32pie9 <AT> yahoo.com>
Closes: https://github.com/gentoo/gentoo/pull/37289
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 dev-libs/rccl/Manifest                             |  1 -
 .../files/rccl-5.0.2-change_install_location.patch | 31 -------------
 .../rccl/files/rccl-5.1.3-remove-chrpath.patch     | 32 --------------
 dev-libs/rccl/rccl-5.1.3.ebuild                    | 51 ----------------------
 4 files changed, 115 deletions(-)

diff --git a/dev-libs/rccl/Manifest b/dev-libs/rccl/Manifest
index 3150ae9e3339..8ce9b421344b 100644
--- a/dev-libs/rccl/Manifest
+++ b/dev-libs/rccl/Manifest
@@ -1,3 +1,2 @@
-DIST rccl-5.1.3.tar.gz 908274 BLAKE2B 46bff7b6e3d60d5884ccd7e19c54b2f47f90a337a8fdc6dca1a3cfee147e3652e1f912642cc134d4a82bf8daabd9f1391edff139d0517ab1078bd3d9650481d7 SHA512 20deb27c7ef3e6b6b73409950ac0d51286b4634f7002ce36a9a02cdd1d5b1f2db51f6decf773af83364c94f58cc96837da25299f5f5494fc15d8559a1b3c7fcc
 DIST rccl-5.7.1.tar.gz 1425561 BLAKE2B 852c111ad806d5c99f48b3c65c8cf37315c68b969f9544bfa14c1faf1d5557edcc57cdc21705ced6ded4a0288d42b1076e65fb67b3f89b4fa78cfba9d317b23e SHA512 5913b8ff67fa787714713b7d5b571374898be740d56c77db9f04fe7a3e6ca74023fa930a3494d8a6f984ac9e68ee318343835e110049d08700fe773376618af4
 DIST rccl-6.1.1.tar.gz 1679144 BLAKE2B 371d64691dc74f875c49e14df8f3f2d8b9c607376e6c5a889bd2bdb50607e88715d6d75ffed4ba3184a5b9b241cb37b8501e927a5f495632212909e410102490 SHA512 6c6376dd822182bcf28f573c0f3b5c7e52f94f4b670ee7c88519232f51b443d52cd37cbe6c41b5b6e9cb0b93c1124246a989f6e6a2ae74935134135585118002

diff --git a/dev-libs/rccl/files/rccl-5.0.2-change_install_location.patch b/dev-libs/rccl/files/rccl-5.0.2-change_install_location.patch
deleted file mode 100644
index 11e3fea312de..000000000000
--- a/dev-libs/rccl/files/rccl-5.0.2-change_install_location.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Index: rccl-rocm-5.0.2/CMakeLists.txt
-===================================================================
---- rccl-rocm-5.0.2.orig/CMakeLists.txt
-+++ rccl-rocm-5.0.2/CMakeLists.txt
-@@ -268,16 +268,12 @@ target_link_libraries(rccl INTERFACE hip
- rocm_set_soversion(rccl "1.0")
- 
- rocm_install_targets(TARGETS
--                     rccl
--                     PREFIX
-                      rccl)
- rocm_install(FILES ${PROJECT_BINARY_DIR}/rccl.h
--        DESTINATION rccl/${CMAKE_INSTALL_INCLUDEDIR})
-+        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
- 
- rocm_export_targets(NAMESPACE
-                     roc::
--                    PREFIX
--                    rccl
-                     TARGETS
-                     rccl
-                     DEPENDS
-@@ -329,8 +325,6 @@ rocm_create_package(
-   "RCCL Maintainer <rccl-maintainer@amd.com>"
-   LDCONFIG)
- 
--rocm_install_symlink_subdir(rccl)
--
- if(BUILD_TESTS)
-   add_subdirectory(test)
- endif()

diff --git a/dev-libs/rccl/files/rccl-5.1.3-remove-chrpath.patch b/dev-libs/rccl/files/rccl-5.1.3-remove-chrpath.patch
deleted file mode 100644
index 26bad572c7d8..000000000000
--- a/dev-libs/rccl/files/rccl-5.1.3-remove-chrpath.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Manually chrpath not needed in CMakeLists since CMAKE_SKIP_RPATH=On
-So chrpath dependency is not needed
-===================================================================
---- rccl-rocm-5.1.3.orig/test/CMakeLists.txt
-+++ rccl-rocm-5.1.3/test/CMakeLists.txt
-@@ -5,11 +5,6 @@ if(BUILD_TESTS)
- 
-   message("Going to build unit tests (Installed in /test/UnitTests)")
- 
--  find_program(CHRPATH chrpath)
--  if(NOT CHRPATH)
--      message(FATAL_ERROR "chrpath is required for UnitTests. Please install (e.g. sudo apt-get install chrpath)")
--  endif()
--
-   include_directories(${GTEST_INCLUDE_DIRS})
- 
-   if(BUILD_ALLREDUCE_ONLY)
-@@ -88,14 +83,6 @@ if(BUILD_TESTS)
-   # HIPCC adds /opt/rocm/lib as RPATH, even though the install process is supposed to
-   # remove RPATH.  It also occurs before any user-specified rpath, which effectively overrides the user rpath.
-   #  As a work-around, set the correct RPATH for the unit test executable as a post-install step
--  if (CMAKE_INSTALL_PREFIX MATCHES "${ROCM_PATH}")
--    # install_prefix/CMAKE_INSTALL_PREFIX was not explicitly specified, so look in build/release
--    add_custom_command( TARGET UnitTests POST_BUILD COMMAND chrpath ARGS -r ${CMAKE_BINARY_DIR}:${ROCM_PATH}/lib ${CMAKE_BINARY_DIR}/test/UnitTests)
--    add_custom_command( TARGET UnitTestsMultiProcess POST_BUILD COMMAND chrpath ARGS -r ${CMAKE_BINARY_DIR}:${ROCM_PATH}/lib ${CMAKE_BINARY_DIR}/test/UnitTestsMultiProcess)
--  else()
--    add_custom_command( TARGET UnitTests POST_BUILD COMMAND chrpath ARGS -r ${CMAKE_INSTALL_PREFIX}/lib:${ROCM_PATH}/lib ${CMAKE_INSTALL_PREFIX}/test/UnitTests)
--    add_custom_command( TARGET UnitTestsMultiProcess POST_BUILD COMMAND chrpath ARGS -r ${CMAKE_INSTALL_PREFIX}/lib:${ROCM_PATH}/lib ${CMAKE_INSTALL_PREFIX}/test/UnitTestsMultiProcess)
--  endif()
- else()
-   message("Not building unit tests")
- endif()

diff --git a/dev-libs/rccl/rccl-5.1.3.ebuild b/dev-libs/rccl/rccl-5.1.3.ebuild
deleted file mode 100644
index 92092f7946cf..000000000000
--- a/dev-libs/rccl/rccl-5.1.3.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ROCM_VERSION=${PV}
-
-inherit cmake edo rocm
-
-DESCRIPTION="ROCm Communication Collectives Library (RCCL)"
-HOMEPAGE="https://github.com/ROCmSoftwarePlatform/rccl"
-SRC_URI="https://github.com/ROCmSoftwarePlatform/rccl/archive/rocm-${PV}.tar.gz -> rccl-${PV}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="~amd64"
-SLOT="0/$(ver_cut 1-2)"
-IUSE="test"
-
-RDEPEND="dev-util/hip
-dev-util/rocm-smi:${SLOT}"
-DEPEND="${RDEPEND}"
-BDEPEND=">=dev-build/cmake-3.22
-	>=dev-build/rocm-cmake-5.0.2-r1
-	test? ( dev-cpp/gtest )"
-
-RESTRICT="!test? ( test )"
-S="${WORKDIR}/rccl-rocm-${PV}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.0.2-change_install_location.patch"
-	"${FILESDIR}/${PN}-5.1.3-remove-chrpath.patch"
-)
-
-src_configure() {
-	addpredict /dev/kfd
-	addpredict /dev/dri/
-
-	local mycmakeargs=(
-		-DSKIP_RPATH=On
-		-DAMDGPU_TARGETS="$(get_amdgpu_flags)"
-		-DBUILD_TESTS=$(usex test ON OFF)
-		-Wno-dev
-	)
-
-	CXX=hipcc cmake_src_configure
-}
-
-src_test() {
-	check_amdgpu
-	LD_LIBRARY_PATH="${BUILD_DIR}" edob test/UnitTests
-}


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/rccl/, dev-libs/rccl/files/
@ 2025-01-05 21:49 Sam James
  0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2025-01-05 21:49 UTC (permalink / raw
  To: gentoo-commits

commit:     8f2f5e1cf90b1b0d0d418355e16bf7e967df3482
Author:     Sv. Lockal <lockalsash <AT> gmail <DOT> com>
AuthorDate: Mon Dec  9 21:10:54 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jan  5 21:46:41 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f2f5e1c

dev-libs/rccl: add 6.3.0

Signed-off-by: Sv. Lockal <lockalsash <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-libs/rccl/Manifest                             |   1 +
 dev-libs/rccl/files/rccl-6.3.0-headers-fix.patch   |  12 +
 .../rccl/files/rccl-6.3.0-same-rank-sendrecv.patch | 250 +++++++++++++++++++++
 dev-libs/rccl/rccl-6.3.0.ebuild                    |  75 +++++++
 4 files changed, 338 insertions(+)

diff --git a/dev-libs/rccl/Manifest b/dev-libs/rccl/Manifest
index 8ce9b421344b..a40a8eb250b1 100644
--- a/dev-libs/rccl/Manifest
+++ b/dev-libs/rccl/Manifest
@@ -1,2 +1,3 @@
 DIST rccl-5.7.1.tar.gz 1425561 BLAKE2B 852c111ad806d5c99f48b3c65c8cf37315c68b969f9544bfa14c1faf1d5557edcc57cdc21705ced6ded4a0288d42b1076e65fb67b3f89b4fa78cfba9d317b23e SHA512 5913b8ff67fa787714713b7d5b571374898be740d56c77db9f04fe7a3e6ca74023fa930a3494d8a6f984ac9e68ee318343835e110049d08700fe773376618af4
 DIST rccl-6.1.1.tar.gz 1679144 BLAKE2B 371d64691dc74f875c49e14df8f3f2d8b9c607376e6c5a889bd2bdb50607e88715d6d75ffed4ba3184a5b9b241cb37b8501e927a5f495632212909e410102490 SHA512 6c6376dd822182bcf28f573c0f3b5c7e52f94f4b670ee7c88519232f51b443d52cd37cbe6c41b5b6e9cb0b93c1124246a989f6e6a2ae74935134135585118002
+DIST rccl-6.3.0.tar.gz 1828647 BLAKE2B 8c312fc51e7d600bb62fa059e1af53e153955b79b2ba2e8a6b6b52228b9217b7df6dc815c3a48c0800aaa9387f645070e079d04e99c0e8ebdfe41d5ebe0bda06 SHA512 a068b4a21786176638d108c8c85d5e5a8b0413335b555c2602f2a2e0b9f291f6872dbf68fbb5a17a6a0af9d9b5a90b1b37cce63b655a867b68fc9e20d49931ea

diff --git a/dev-libs/rccl/files/rccl-6.3.0-headers-fix.patch b/dev-libs/rccl/files/rccl-6.3.0-headers-fix.patch
new file mode 100644
index 000000000000..297627819f2c
--- /dev/null
+++ b/dev-libs/rccl/files/rccl-6.3.0-headers-fix.patch
@@ -0,0 +1,12 @@
+gtest 1.14 included iomanip, gtest 1.15 does not anymore.
+Upstream bug: https://github.com/ROCm/rccl/issues/1455
+--- a/test/common/TestBed.cpp
++++ b/test/common/TestBed.cpp
+@@ -4,6 +4,7 @@
+  * See LICENSE.txt for license information
+  ************************************************************************/
+ #include <unistd.h>
++#include <iomanip>
+ #include "TestBed.hpp"
+ #include <rccl/rccl.h>
+ 

diff --git a/dev-libs/rccl/files/rccl-6.3.0-same-rank-sendrecv.patch b/dev-libs/rccl/files/rccl-6.3.0-same-rank-sendrecv.patch
new file mode 100644
index 000000000000..435d6ac57b0f
--- /dev/null
+++ b/dev-libs/rccl/files/rccl-6.3.0-same-rank-sendrecv.patch
@@ -0,0 +1,250 @@
+Enable UT sendrecv to same rank. Fixes test failure.
+Backports commit: https://github.com/ROCm/rccl/commit/fd9924cfe7afbb94b1f157972ba001865481480a
+--- a/test/SendRecvTests.cpp
++++ b/test/SendRecvTests.cpp
+@@ -16,7 +16,6 @@ namespace RcclUnitTesting
+     std::vector<int>            const  numElements     = {1048576, 53327, 1024, 0};
+     bool                        const  inPlace         = false;
+     bool                        const  useManagedMem   = false;
+-    int                         const  groupCallId     = 0;
+ 
+     OptionalColArgs options;
+     bool isCorrect = true;
+@@ -28,7 +27,10 @@ namespace RcclUnitTesting
+       int ranksPerGpu = rpg == 0 ? 1 : testBed.ev.maxRanksPerGpu;
+       int totalRanks = numGpus * ranksPerGpu;
+       int const numProcesses = isMultiProcess ? numGpus : 1;
+-      testBed.InitComms(TestBed::GetDeviceIdsList(numProcesses, numGpus, ranksPerGpu), 1);
++      testBed.InitComms(TestBed::GetDeviceIdsList(numProcesses, numGpus, ranksPerGpu),
++                        {1,2}, //two group, second group sendrecv to self, has 2 coll
++                        testBed.GetNumStreamsPerGroup(1,2),
++                        2);
+ 
+       for (int dataIdx = 0; dataIdx < dataTypes.size() && isCorrect; ++dataIdx)
+       for (int numIdx = 0; numIdx < numElements.size() && isCorrect; ++numIdx)
+@@ -37,6 +39,8 @@ namespace RcclUnitTesting
+         for (int recvRank = 0; recvRank  < totalRanks; ++recvRank)
+         {
+           options.root = recvRank;
++          int groupCallId = sendRank == recvRank; //self sendrecv group has two coll
++          int recvId      = sendRank == recvRank; //where recv will be second coll
+           testBed.SetCollectiveArgs(ncclCollSend,
+                                     dataTypes[dataIdx],
+                                     numElements[numIdx],
+@@ -47,36 +51,46 @@ namespace RcclUnitTesting
+                                     sendRank);
+           if (recvRank == 0)
+           {
+-            testBed.AllocateMem(inPlace, useManagedMem, groupCallId, 0, sendRank);
+-            testBed.PrepareData(groupCallId, 0, sendRank);
+-          }
+-          if (recvRank  != sendRank)
+-          {
+-            if (testBed.ev.showNames) // Show test names
+-              INFO("%s Datatype: %s SendReceive test Rank %d -> Rank %d for %d Elements\n",
+-                  isMultiProcess ? "MP" : "SP",
+-                  ncclDataTypeNames[dataTypes[dataIdx]],
+-                  sendRank,
+-                  recvRank,
+-                  numElements[numIdx]);
+-
+-            options.root = sendRank;
+-            testBed.SetCollectiveArgs(ncclCollRecv,
++            //set up the collArg slot to make sure AllocateMem is called once and correctly
++            testBed.SetCollectiveArgs(ncclCollSend,
+                                       dataTypes[dataIdx],
+                                       numElements[numIdx],
+                                       numElements[numIdx],
+                                       options,
+                                       0,
+-                                      groupCallId,
+-                                      recvRank);
+-            testBed.AllocateMem(inPlace, useManagedMem, groupCallId, 0, recvRank);
+-            testBed.PrepareData(groupCallId, 0, recvRank);
+-            testBed.ExecuteCollectives({sendRank, recvRank});
+-            testBed.ValidateResults(isCorrect, groupCallId, 0, recvRank);
+-            testBed.DeallocateMem(groupCallId, 0, recvRank);
++                                      !groupCallId,
++                                      sendRank);
++            testBed.AllocateMem(inPlace, useManagedMem, 0, 0, sendRank);
++            testBed.PrepareData(0, 0, sendRank);
++            testBed.AllocateMem(inPlace, useManagedMem, 1, 0, sendRank);
++            testBed.PrepareData(1, 0, sendRank);
+           }
++
++          if (testBed.ev.showNames) // Show test names
++            INFO("%s Datatype: %s SendReceive test Rank %d -> Rank %d for %d Elements\n",
++                 isMultiProcess ? "MP" : "SP",
++                 ncclDataTypeNames[dataTypes[dataIdx]],
++                 sendRank,
++                 recvRank,
++                 numElements[numIdx]);
++          options.root = sendRank;
++
++          testBed.SetCollectiveArgs(ncclCollRecv,
++                                    dataTypes[dataIdx],
++                                    numElements[numIdx],
++                                    numElements[numIdx],
++                                    options,
++                                    recvId,
++                                    groupCallId,
++                                    recvRank);
++          testBed.AllocateMem(inPlace, useManagedMem, groupCallId, recvId, recvRank);
++          testBed.PrepareData(groupCallId, recvId, recvRank);
++          testBed.ExecuteCollectives({sendRank, recvRank}, groupCallId);
++          testBed.ValidateResults(isCorrect, groupCallId, recvId, recvRank);
++          testBed.DeallocateMem(groupCallId, recvId, recvRank);
+         }
+-        testBed.DeallocateMem(groupCallId, 0, sendRank);
++        testBed.DeallocateMem(0, 0, sendRank);
++        testBed.DeallocateMem(1, 0, sendRank);
+       }
+       testBed.DestroyComms();
+     }
+@@ -94,7 +108,6 @@ namespace RcclUnitTesting
+     bool                        const  inPlace         = false;
+     bool                        const  useManagedMem   = false;
+     bool                        const  userRegistered  = true;
+-    int                         const  groupCallId     = 0;
+ 
+     OptionalColArgs options;
+     bool isCorrect = true;
+@@ -106,7 +119,10 @@ namespace RcclUnitTesting
+       int ranksPerGpu = rpg == 0 ? 1 : testBed.ev.maxRanksPerGpu;
+       int totalRanks = numGpus * ranksPerGpu;
+       int const numProcesses = isMultiProcess ? numGpus : 1;
+-      testBed.InitComms(TestBed::GetDeviceIdsList(numProcesses, numGpus, ranksPerGpu), 1);
++      testBed.InitComms(TestBed::GetDeviceIdsList(numProcesses, numGpus, ranksPerGpu),
++                        {1,2}, //two group, second group sendrecv to self, has 2 coll
++                        testBed.GetNumStreamsPerGroup(1,2),
++                        2);
+ 
+       for (int dataIdx = 0; dataIdx < dataTypes.size() && isCorrect; ++dataIdx)
+       for (int numIdx = 0; numIdx < numElements.size() && isCorrect; ++numIdx)
+@@ -115,6 +131,8 @@ namespace RcclUnitTesting
+         for (int recvRank = 0; recvRank  < totalRanks; ++recvRank)
+         {
+           options.root = recvRank;
++          int groupCallId = sendRank == recvRank;
++          int recvId      = sendRank == recvRank;
+           testBed.SetCollectiveArgs(ncclCollSend,
+                                     dataTypes[dataIdx],
+                                     numElements[numIdx],
+@@ -125,36 +143,45 @@ namespace RcclUnitTesting
+                                     sendRank);
+           if (recvRank == 0)
+           {
+-            testBed.AllocateMem(inPlace, useManagedMem, groupCallId, 0, sendRank, userRegistered);
+-            testBed.PrepareData(groupCallId, 0, sendRank);
+-          }
+-          if (recvRank  != sendRank)
+-          {
+-            if (testBed.ev.showNames) // Show test names
+-              INFO("%s Datatype: %s SendReceive test Rank %d -> Rank %d for %d Elements\n",
+-                  isMultiProcess ? "MP" : "SP",
+-                  ncclDataTypeNames[dataTypes[dataIdx]],
+-                  sendRank,
+-                  recvRank,
+-                  numElements[numIdx]);
+-
+-            options.root = sendRank;
+-            testBed.SetCollectiveArgs(ncclCollRecv,
++            testBed.SetCollectiveArgs(ncclCollSend,
+                                       dataTypes[dataIdx],
+                                       numElements[numIdx],
+                                       numElements[numIdx],
+                                       options,
+                                       0,
+-                                      groupCallId,
+-                                      recvRank);
+-            testBed.AllocateMem(inPlace, useManagedMem, groupCallId, 0, recvRank, userRegistered);
+-            testBed.PrepareData(groupCallId, 0, recvRank);
+-            testBed.ExecuteCollectives({sendRank, recvRank});
+-            testBed.ValidateResults(isCorrect, groupCallId, 0, recvRank);
+-            testBed.DeallocateMem(groupCallId, 0, recvRank);
++                                      !groupCallId,
++                                      sendRank);
++            testBed.AllocateMem(inPlace, useManagedMem, 0, 0, sendRank, userRegistered);
++            testBed.PrepareData(0, 0, sendRank);
++            testBed.AllocateMem(inPlace, useManagedMem, 1, 0, sendRank, userRegistered);
++            testBed.PrepareData(1, 0, sendRank);
+           }
++
++          if (testBed.ev.showNames) // Show test names
++            INFO("%s Datatype: %s SendReceive test Rank %d -> Rank %d for %d Elements\n",
++                 isMultiProcess ? "MP" : "SP",
++                 ncclDataTypeNames[dataTypes[dataIdx]],
++                 sendRank,
++                 recvRank,
++                 numElements[numIdx]);
++
++          options.root = sendRank;
++          testBed.SetCollectiveArgs(ncclCollRecv,
++                                    dataTypes[dataIdx],
++                                    numElements[numIdx],
++                                    numElements[numIdx],
++                                    options,
++                                    recvId,
++                                    groupCallId,
++                                    recvRank);
++          testBed.AllocateMem(inPlace, useManagedMem, groupCallId, recvId, recvRank, userRegistered);
++          testBed.PrepareData(groupCallId, recvId, recvRank);
++          testBed.ExecuteCollectives({sendRank, recvRank}, groupCallId);
++          testBed.ValidateResults(isCorrect, groupCallId, recvId, recvRank);
++          testBed.DeallocateMem(groupCallId, recvId, recvRank);
+         }
+-        testBed.DeallocateMem(groupCallId, 0, sendRank);
++        testBed.DeallocateMem(0, 0, sendRank);
++        testBed.DeallocateMem(1, 0, sendRank);
+       }
+       testBed.DestroyComms();
+     }
+--- a/test/common/TestBedChild.cpp
++++ b/test/common/TestBedChild.cpp
+@@ -395,6 +395,8 @@ namespace RcclUnitTesting
+       {
+         CollectiveArgs& collArg = this->collArgs[groupId][localRank][collIdx];
+         CHECK_CALL(collArg.AllocateMem(inPlace, useManagedMem, userRegistered));
++        if (collArg.userRegistered && (collArg.funcType == ncclCollSend || collArg.funcType == ncclCollRecv))
++          CHILD_NCCL_CALL(ncclCommRegister(this->comms[localRank], collArg.inputGpu.ptr, collArg.numInputBytesAllocated, &(collArg.commRegHandle)),"ncclCommRegister");
+         if (this->verbose) INFO("Rank %d on child %d allocates memory for collective %d in group %d on device %d (%s,%s,%s) Input: %p Output %p\n",
+                                 globalRank, this->childId, collIdx, groupId, this->deviceIds[localRank],
+                                 inPlace ? "in-place" : "out-of-place",
+@@ -646,8 +648,6 @@ namespace RcclUnitTesting
+                           "ncclAllToAllv");
+           break;
+         case ncclCollSend:
+-          if (collArg.userRegistered)
+-            CHILD_NCCL_CALL_RANK(errCode, ncclCommRegister(this->comms[localRank], collArg.inputGpu.ptr, collArg.numInputBytesAllocated, &(collArg.commRegHandle)),"ncclCommRegister");
+           CHILD_NCCL_CALL_RANK(errCode, ncclSend(
+                                    collArg.inputGpu.ptr,
+                                    collArg.numInputElements,
+@@ -658,8 +658,6 @@ namespace RcclUnitTesting
+                           "ncclSend");
+           break;
+         case ncclCollRecv:
+-          if (collArg.userRegistered)
+-            CHILD_NCCL_CALL_RANK(errCode, ncclCommRegister(this->comms[localRank], collArg.outputGpu.ptr, collArg.numOutputBytesAllocated, &(collArg.commRegHandle)), "ncclCommRegister");
+           CHILD_NCCL_CALL_RANK(errCode, ncclRecv(
+                                    collArg.outputGpu.ptr,
+                                    collArg.numOutputElements,
+@@ -891,8 +889,6 @@ namespace RcclUnitTesting
+     for (int collIdx = 0; collIdx < collArgs[groupId][localRank].size(); ++collIdx)
+     {
+       CollectiveArgs& collArg = this->collArgs[groupId][localRank][collIdx];
+-      if (collArg.userRegistered && (collArg.funcType == ncclCollSend || collArg.funcType == ncclCollRecv))
+-        CHILD_NCCL_CALL(ncclCommDeregister(this->comms[localRank], collArg.commRegHandle), "ncclCommDeregister");
+       if (collId == -1 || collId == collIdx)
+       {
+         if (this->verbose)
+@@ -900,6 +896,10 @@ namespace RcclUnitTesting
+           INFO("Child %d release memory for collective %d in group %d (Input: %p Output %p\n",
+                this->childId, collIdx, groupId, collArg.inputGpu.ptr, collArg.outputGpu.ptr);
+         }
++        if (collArg.userRegistered && (collArg.funcType == ncclCollSend || collArg.funcType == ncclCollRecv))
++        {
++          CHILD_NCCL_CALL(ncclCommDeregister(this->comms[localRank], collArg.commRegHandle), "ncclCommDeregister");
++        }
+ 
+         CHECK_CALL(collArg.DeallocateMem());
+       }

diff --git a/dev-libs/rccl/rccl-6.3.0.ebuild b/dev-libs/rccl/rccl-6.3.0.ebuild
new file mode 100644
index 000000000000..d610f7eb139c
--- /dev/null
+++ b/dev-libs/rccl/rccl-6.3.0.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ROCM_VERSION=${PV}
+
+inherit cmake edo rocm flag-o-matic
+
+DESCRIPTION="ROCm Communication Collectives Library (RCCL)"
+HOMEPAGE="https://github.com/ROCm/rccl"
+SRC_URI="https://github.com/ROCm/rccl/archive/rocm-${PV}.tar.gz -> rccl-${PV}.tar.gz"
+S="${WORKDIR}/rccl-rocm-${PV}"
+
+LICENSE="BSD"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND="
+	dev-util/hip:${SLOT}
+	dev-util/rocm-smi:${SLOT}"
+DEPEND="${RDEPEND}
+	sys-libs/binutils-libs"
+BDEPEND="
+	>=dev-build/cmake-3.22
+	>=dev-build/rocm-cmake-5.7.1
+	dev-util/hipify-clang:${SLOT}
+	test? ( dev-cpp/gtest )"
+
+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"
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	# https://reviews.llvm.org/D69582 - clang does not support parallel jobs
+	sed '/parallel-jobs/d' -i CMakeLists.txt || die
+
+	# complete fix-version-check patch
+	sed "s/@rocm_version@/${PV}/" -i CMakeLists.txt || die
+
+	# don't install tests
+	sed "/rocm_install(TARGETS rccl-UnitTests/d" -i test/CMakeLists.txt || die
+}
+
+src_configure() {
+	rocm_use_hipcc
+
+	# lto flags make compilation fail with "undefined hidden symbol"
+	filter-lto
+
+	local mycmakeargs=(
+		-DCMAKE_SKIP_RPATH=ON
+		-DAMDGPU_TARGETS="$(get_amdgpu_flags)"
+		-DBUILD_TESTS=$(usex test ON OFF)
+		-DROCM_SYMLINK_LIBS=OFF
+		-DROCM_PATH="${EPREFIX}/usr"
+		-DRCCL_ROCPROFILER_REGISTER=OFF
+		-Wno-dev
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	check_amdgpu
+	cd "${BUILD_DIR}" || die
+	LD_LIBRARY_PATH="${BUILD_DIR}" edob test/rccl-UnitTests
+}


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/rccl/, dev-libs/rccl/files/
@ 2025-01-10  0:31 Sam James
  0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2025-01-10  0:31 UTC (permalink / raw
  To: gentoo-commits

commit:     b761d8281f96ed7e40e8455d274a58417967435d
Author:     Sv. Lockal <lockalsash <AT> gmail <DOT> com>
AuthorDate: Tue Jan  7 15:20:04 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> 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 <lockalsash <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/40026
Signed-off-by: Sam James <sam <AT> 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
 }


^ permalink raw reply related	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2025-01-10  0:32 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-05-02  2:57 [gentoo-commits] repo/gentoo:master commit in: dev-libs/rccl/, dev-libs/rccl/files/ Benda XU
  -- strict thread matches above, loose matches on Subject: below --
2022-09-22  1:08 Benda XU
2024-07-20  6:42 Joonas Niilola
2025-01-05 21:49 Sam James
2025-01-10  0:31 Sam James

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox