[gentoo-commits] repo/gentoo:master commit in: dev-libs/rccl/, dev-libs/rccl/files/

["Joonas Niilola" <juippis@gentoo.org>]

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
-}