diff options
Diffstat (limited to 'dev-libs/rccl')
| -rw-r--r-- | dev-libs/rccl/Manifest | 6 | ||||
| -rw-r--r-- | dev-libs/rccl/files/rccl-5.0.2-change_install_location.patch | 31 | ||||
| -rw-r--r-- | dev-libs/rccl/files/rccl-5.1.3-remove-chrpath.patch | 32 | ||||
| -rw-r--r-- | dev-libs/rccl/rccl-5.1.3.ebuild | 51 | ||||
| -rw-r--r-- | dev-libs/rccl/rccl-6.1.1.ebuild | 4 |
5 files changed, 4 insertions, 120 deletions
diff --git a/dev-libs/rccl/Manifest b/dev-libs/rccl/Manifest index bf5a6f7fd9a4..340cf2d171cd 100644 --- a/dev-libs/rccl/Manifest +++ b/dev-libs/rccl/Manifest @@ -1,11 +1,7 @@ -AUX rccl-5.0.2-change_install_location.patch 936 BLAKE2B bd9feabfdeb0e6098e25baca8dd20a512b8761ab6d5b7ee4e723c268dec9b7200d125d4cb36fe540aedca396da51c094123f778d695f644788804e2f890d0697 SHA512 0fb0fadef6137d1a60dff8ae7e44df5a0769ea7142e182b86d2e4acee5a76397424b67ee73f25697494ad5d6e6ef60b71e889208775e6abf6f05f1c0d1b4b2b0 -AUX rccl-5.1.3-remove-chrpath.patch 1852 BLAKE2B 255a295ffe34301c3926fbff412bef9ef7e6625a69a7e3dba2e3c7cc281640f3e4bc30dbaa25c916edf71f6b23e801e9f56a6c06cdb9221f470881a9d1291793 SHA512 05fc9c20c76195f45daba5c4a3612a6d2572ba1ae0028a0710c8c92e55f7c70b03ab7722363942d05d8e3c89a40edaa0364c0aff64f9d712e0739954650a6bae AUX rccl-5.7.1-remove-chrpath.patch 592 BLAKE2B 8510698259154be9138c136c87c3650276140ac500a235049cdd1f8ea9dcc969ac6cd16b13ce628c448f1d5aa8c49818c455e761e96c24a0abc3aa0d3d431320 SHA512 7df69e5293edb3021f57caf9fa6ec12fd3c6a2841f62de4d6358092ec8f5c11f18d2f6434704e64c225327b3a55a4e64710cb07a82ebee103e4faa3865baa72d AUX rccl-6.0.2-fix-version-check.patch 552 BLAKE2B fb1230b262a959c783e6f796e83621c3b32f69cc81ab94c07a9596a8fa37bf2d496aebfe4bec97adf2873d3dc946e690d64f51b4d578528470436b9949cfa432 SHA512 efd6343ffd9b5dee9152787f993621e7bbd5a6d46d4b33d1c0c47ded4fd1a5da9dc753c956c646f48bde5dd6b61876a633d89810ba33861734ec2b2c0040d0ec -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 -EBUILD rccl-5.1.3.ebuild 1091 BLAKE2B 0506cc6607a280c97d934ba9037289f8c06678efe6bd4f5c0501d855b1e765181c1273e4918cfed72a19e235ad5b182eb901eb97401419d57319282ef4134e07 SHA512 c3be588fe12ef890fd74ee6bd6a09ba1f0b461a7daef14efa9ebabdcea7f1b9a3bb1389e3eed8856c231b0bf05674939f952ebcd0f522fcbe6284d4aa2e8f583 EBUILD rccl-5.7.1.ebuild 1836 BLAKE2B 3286a92c9d08f9e0baac3ad3fbf0a9782109788b999bab8ac4864fa0ab47a6fcd53a73eee2d34a7cb5400998e60f246ec64df6f4a3f8bb07c38405e7f0b4417b SHA512 dd4dfeecdd908eeddba9d0450eba831ccc4778accbcab6023d4d47bac218d2e5d92a967744796b7c8854a579c5df16d8253795dd294183b2054dcf725a0372ae -EBUILD rccl-6.1.1.ebuild 1605 BLAKE2B c819ea45053d9a2a46396b2c280e24620947addb1a3074c63c364c3b3669cdfd7d7995a7cf401eda8b3d296fa4529cf0a1b367ff58d24eae2746424f4cd4e209 SHA512 9238cf17ea6c21de22babd70d9639fdc20b4446cb3d5f6faf8dd6795cd5b0ef37db92b7e300df9977c788355ba8a9a603bf12db7fb8a476065559fa5074fb800 +EBUILD rccl-6.1.1.ebuild 1612 BLAKE2B e175a46484a37e31f0fc0ab3db662a2faaa1ff72cd21f6cbf4540245bc7be012baa9c6c0dc40bdfde39674a0f08ea898b33673db395de3288879ebd778a94ff0 SHA512 2ae7ea089fbac169fe09aed8d82dadb0bd343bee2e525470965987068ea364999e29022298468dfc91d9c625bcfd06e0ea695550275604a4d211d3e30cd322fe MISC metadata.xml 695 BLAKE2B 7d52b2606665aebfade0d15c339f04fe9ac743d1ef402437adefa6a1ab710ae8e0367172cfa3bae8876609d40d26356cc9a93f555fd28f887cff957e38192416 SHA512 6b1d2a88fb7f88bc2bd1fd7126ba33a7d63b6e323cf43072a6c56fad3a5b8cde4262bc7ed7c9485a650544d562377b146d52088e2ecdd8c0e65d0b91addea57c 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 -} diff --git a/dev-libs/rccl/rccl-6.1.1.ebuild b/dev-libs/rccl/rccl-6.1.1.ebuild index 35783657a50d..8b583cb22096 100644 --- a/dev-libs/rccl/rccl-6.1.1.ebuild +++ b/dev-libs/rccl/rccl-6.1.1.ebuild @@ -48,6 +48,8 @@ src_prepare() { } src_configure() { + rocm_use_hipcc + # https://github.com/llvm/llvm-project/issues/71711 - fix issue of clang append-ldflags -Wl,-z,noexecstack @@ -59,7 +61,7 @@ src_configure() { -Wno-dev ) - CXX=hipcc cmake_src_configure + cmake_src_configure } src_test() { |