From 3b89366daa39042e92cf3a2577c3a3328070f573 Mon Sep 17 00:00:00 2001 From: Benda Xu Date: Mon, 2 May 2022 10:56:49 +0800 Subject: [PATCH] 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 --- dev-libs/rccl/Manifest | 1 + .../rccl-5.0.2-change_install_location.patch | 31 ++++++++++++++ dev-libs/rccl/rccl-5.0.2.ebuild | 41 +++++++++++++++++++ 3 files changed, 73 insertions(+) create mode 100644 dev-libs/rccl/files/rccl-5.0.2-change_install_location.patch create mode 100644 dev-libs/rccl/rccl-5.0.2.ebuild diff --git a/dev-libs/rccl/Manifest b/dev-libs/rccl/Manifest index ef9abc099a66e..b50fab6d5c7b9 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 0000000000000..11e3fea312de0 --- /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 " + 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 0000000000000..045b52b33b0f9 --- /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 +}