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

2024-03-08 Thread Sam James
commit: 2cf5fac5e9a35809a0f2eb7b4b4ad0a8caa0170a
Author: Sv. Lockal  gmail  com>
AuthorDate: Wed Nov  8 21:12:05 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Mar  8 19:21:57 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2cf5fac5

dev-libs/rccl: add 5.7.1

Signed-off-by: Sv. Lockal  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 dev-libs/rccl/Manifest |  1 +
 .../rccl/files/rccl-5.7.1-remove-chrpath.patch | 17 +
 dev-libs/rccl/rccl-5.7.1.ebuild| 78 ++
 3 files changed, 96 insertions(+)

diff --git a/dev-libs/rccl/Manifest b/dev-libs/rccl/Manifest
index 50be3ed5b7b8..baeaa02c7d4e 100644
--- a/dev-libs/rccl/Manifest
+++ b/dev-libs/rccl/Manifest
@@ -1 +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

diff --git a/dev-libs/rccl/files/rccl-5.7.1-remove-chrpath.patch 
b/dev-libs/rccl/files/rccl-5.7.1-remove-chrpath.patch
new file mode 100644
index ..a9184f1c7b98
--- /dev/null
+++ b/dev-libs/rccl/files/rccl-5.7.1-remove-chrpath.patch
@@ -0,0 +1,17 @@
+chrpath is not used in rccl 5.7.1
+
+Upstream fix: https://github.com/ROCmSoftwarePlatform/rccl/pull/811
+--- a/test/CMakeLists.txt
 b/test/CMakeLists.txt
+@@ -7,11 +7,6 @@ if(BUILD_TESTS)
+ 
+   message("Building rccl unit tests (Installed in /test/rccl-UnitTests)")
+ 
+-  find_program(CHRPATH chrpath)
+-  if(NOT CHRPATH)
+-  message(FATAL_ERROR "chrpath is required for rccl-UnitTests. Please 
install (e.g. sudo apt-get install chrpath)")
+-  endif()
+-
+   find_package(hsa-runtime64 PATHS /opt/rocm )
+   if(${hsa-runtime64_FOUND})
+ message("hsa-runtime64 found @  ${hsa-runtime64_DIR} ")

diff --git a/dev-libs/rccl/rccl-5.7.1.ebuild b/dev-libs/rccl/rccl-5.7.1.ebuild
new file mode 100644
index ..1ebf9619a55b
--- /dev/null
+++ b/dev-libs/rccl/rccl-5.7.1.ebuild
@@ -0,0 +1,78 @@
+# 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/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-5*
+   dev-util/rocm-smi:${SLOT}"
+DEPEND="${RDEPEND}
+   sys-libs/binutils-libs"
+BDEPEND="
+   >=dev-build/cmake-3.22
+   >=dev-build/rocm-cmake-5.0.2-r1
+   dev-util/hipify-clang:${SLOT}
+   test? ( dev-cpp/gtest )"
+
+RESTRICT="!test? ( test )"
+S="${WORKDIR}/rccl-rocm-${PV}"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-5.7.1-remove-chrpath.patch"
+)
+
+src_prepare() {
+   cmake_src_prepare
+
+   # https://reviews.llvm.org/D69582 - clang does not support parallel jobs
+   sed -i 's/-parallel-jobs=[0-9][0-9]//g' CMakeLists.txt || die
+
+   # https://github.com/ROCmSoftwarePlatform/rccl/pull/860 - bad escape
+   sed -i 's/\\%/%/' src/include/msccl/msccl_struct.h || die
+
+   # https://github.com/ROCmSoftwarePlatform/rccl/issues/958 - fix 
AMDGPU_TARGETS
+   sed -i '/set(AMDGPU_TARGETS/s/ FORCE//' CMakeLists.txt || die
+}
+
+src_configure() {
+   addpredict /dev/kfd
+   addpredict /dev/dri/
+
+   # https://github.com/llvm/llvm-project/issues/71711 - fix issue of clang
+   append-ldflags -Wl,-z,noexecstack
+
+   local mycmakeargs=(
+   -DCMAKE_SKIP_RPATH=ON
+   -DAMDGPU_TARGETS="$(get_amdgpu_flags)"
+   -DBUILD_TESTS=$(usex test ON OFF)
+   -DROCM_SYMLINK_LIBS=OFF
+   -Wno-dev
+   )
+
+   CXX=hipcc cmake_src_configure
+}
+
+src_test() {
+   CHECK_AMDGPU
+   LD_LIBRARY_PATH="${BUILD_DIR}" edob test/rccl-UnitTests
+}
+
+src_install() {
+   cmake_src_install
+
+   # remove extra copy of headers
+   rm -r "${ED}"/usr/rccl || die
+}



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

2023-02-01 Thread Andreas Sturmlechner
commit: b555d7ab33c1a66a4f93260fbd4207b35fa78ac2
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Jan 24 22:21:21 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Feb  1 09:52:47 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b555d7ab

dev-libs/rccl: drop 5.0.2

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-libs/rccl/Manifest  |  1 -
 dev-libs/rccl/rccl-5.0.2.ebuild | 41 -
 2 files changed, 42 deletions(-)

diff --git a/dev-libs/rccl/Manifest b/dev-libs/rccl/Manifest
index 8f18c69165ae..50be3ed5b7b8 100644
--- a/dev-libs/rccl/Manifest
+++ b/dev-libs/rccl/Manifest
@@ -1,2 +1 @@
-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/rccl-5.0.2.ebuild b/dev-libs/rccl/rccl-5.0.2.ebuild
deleted file mode 100644
index 045b52b33b0f..
--- a/dev-libs/rccl/rccl-5.0.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# 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
-}



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

2022-09-21 Thread Benda XU
commit: 9798f1a204499b1c54a58aeaa8fbc962c20590b9
Author: Yiyang Wu  gmail  com>
AuthorDate: Wed Aug  3 13:32:40 2022 +
Commit: Benda XU  gentoo  org>
CommitDate: Thu Sep 22 01:07:56 2022 +
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  gmail.com>
Signed-off-by: Benda Xu  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 ..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 ..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
 -> 

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

2022-05-01 Thread Benda XU
commit: 3b89366daa39042e92cf3a2577c3a3328070f573
Author: Benda Xu  gentoo  org>
AuthorDate: Mon May  2 02:56:49 2022 +
Commit: Benda XU  gentoo  org>
CommitDate: Mon May  2 02:56:49 2022 +
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  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 ..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 "
+   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 ..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
+}



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

2022-05-01 Thread Benda XU
commit: 9e7734b4708ddeda65a03340ce5708e6be9831c8
Author: Benda Xu  gentoo  org>
AuthorDate: Sun May  1 14:59:25 2022 +
Commit: Benda XU  gentoo  org>
CommitDate: Sun May  1 14:59:25 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e7734b4

dev-libs/rccl: remove unused cmake variable

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

 dev-libs/rccl/{rccl-4.3.0.ebuild => rccl-4.3.0-r1.ebuild} | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-libs/rccl/rccl-4.3.0.ebuild 
b/dev-libs/rccl/rccl-4.3.0-r1.ebuild
similarity index 81%
rename from dev-libs/rccl/rccl-4.3.0.ebuild
rename to dev-libs/rccl/rccl-4.3.0-r1.ebuild
index 532bea5d7dfa..f5615cc20d0e 100644
--- a/dev-libs/rccl/rccl-4.3.0.ebuild
+++ b/dev-libs/rccl/rccl-4.3.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,8 @@ KEYWORDS="~amd64"
 SLOT="0"
 
 RDEPEND="=dev-util/hip-$(ver_cut 1-2)*"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND=">=dev-util/cmake-3.22
dev-util/rocm-cmake"
 
 S="${WORKDIR}/rccl-rocm-${PV}"
@@ -34,7 +35,6 @@ src_configure() {
-DBUILD_TESTS=OFF
-Wno-dev
${AMDGPU_TARGETS+-DAMDGPU_TARGETS="${AMDGPU_TARGETS}"}
-   -D__skip_rocmclang="ON" ## fix cmake-3.21 configuration issue 
caused by officialy support programming language "HIP"
)
 
cmake_src_configure



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

2021-10-10 Thread Benda XU
commit: f197671afb0874983375f391515599f8680b58a5
Author: YiyangWu  gmail  com>
AuthorDate: Tue Oct  5 07:09:42 2021 +
Commit: Benda XU  gentoo  org>
CommitDate: Sun Oct 10 14:55:06 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f197671a

dev-libs/rccl: bump version to 4.3.0

Closes: https://github.com/gentoo/gentoo/pull/22492
Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Yiyang Wu  gmail.com>
Signed-off-by: Benda Xu  gentoo.org>

 dev-libs/rccl/Manifest  |  1 +
 dev-libs/rccl/rccl-4.3.0.ebuild | 41 +
 2 files changed, 42 insertions(+)

diff --git a/dev-libs/rccl/Manifest b/dev-libs/rccl/Manifest
index 19e11e35867..ef9abc099a6 100644
--- a/dev-libs/rccl/Manifest
+++ b/dev-libs/rccl/Manifest
@@ -1 +1,2 @@
 DIST rccl-4.0.0.tar.gz 741814 BLAKE2B 
c20178e45fb7787ef7f5e20326f91f11a1b2a575277b5f28591b0be6efa6730c3509b11255372648f1df50e33b5e593dbe9c3334c5001f39423fc70acfa49d07
 SHA512 
d25754895d7b5695e46031642c2550cf2b6b5c42628d8381a23d6d1a48699a14a4fdf842205a14b96bdd1339341f9e558492ef9366a63036d8a8a7011d2c1b05
+DIST rccl-4.3.0.tar.gz 836631 BLAKE2B 
c7fede9cf92d3e75b79da2874c0a1e45c5fd4ad9d24b11c9870e9fdef8d571a286cbf54ae0a033f2aec3d21b06cafc2b1c097aaf87ecd628f0c33e9267103be1
 SHA512 
1a27e6441955f01c853861f83743da2fc9597978c3ff99f238734d4bafb1e277d626811b72c6a12563d69b2b8265960b8a2566df618921557837035b92993f0e

diff --git a/dev-libs/rccl/rccl-4.3.0.ebuild b/dev-libs/rccl/rccl-4.3.0.ebuild
new file mode 100644
index 000..532bea5d7df
--- /dev/null
+++ b/dev-libs/rccl/rccl-4.3.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 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"
+
+RDEPEND="=dev-util/hip-$(ver_cut 1-2)*"
+DEPEND="${RDEPEND}
+   dev-util/rocm-cmake"
+
+S="${WORKDIR}/rccl-rocm-${PV}"
+
+PATCHES=(
+   "${FILESDIR}/rccl-2.7.0-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}"}
+   -D__skip_rocmclang="ON" ## fix cmake-3.21 configuration issue 
caused by officialy support programming language "HIP"
+   )
+
+   cmake_src_configure
+}



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

2021-02-27 Thread Sam James
commit: b2c67619bbe245badbf806d18ae9ac567e4de1ea
Author: Sam James  gentoo  org>
AuthorDate: Sat Feb 27 19:17:45 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Feb 27 19:21:02 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2c67619

dev-libs/rccl: fix RDEPND typo

Signed-off-by: Sam James  gentoo.org>

 dev-libs/rccl/{rccl-4.0.0-r1.ebuild => rccl-4.0.0-r2.ebuild} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/rccl/rccl-4.0.0-r1.ebuild 
b/dev-libs/rccl/rccl-4.0.0-r2.ebuild
similarity index 97%
rename from dev-libs/rccl/rccl-4.0.0-r1.ebuild
rename to dev-libs/rccl/rccl-4.0.0-r2.ebuild
index 364e12bac66..c909f3d9612 100644
--- a/dev-libs/rccl/rccl-4.0.0-r1.ebuild
+++ b/dev-libs/rccl/rccl-4.0.0-r2.ebuild
@@ -14,7 +14,7 @@ KEYWORDS="~amd64"
 SLOT="0"
 
 RDEPEND="=dev-util/hip-$(ver_cut 1-2)*"
-DEPEND="${RDPEND}
+DEPEND="${RDEPEND}
dev-util/rocm-cmake"
 
 S="${WORKDIR}/rccl-rocm-${PV}"



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

2021-01-23 Thread Benda XU
commit: 48544762ef753e69fc2a4c1e7b3adf9ead209683
Author: Benda Xu  gentoo  org>
AuthorDate: Thu Jan 21 09:12:48 2021 +
Commit: Benda XU  gentoo  org>
CommitDate: Sun Jan 24 07:48:27 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48544762

dev-libs/rccl: ROCm Communication Collectives Library

Closes: https://github.com/gentoo/gentoo/pull/19143
Bug: https://bugs.gentoo.org/650804
Bug: https://github.com/gentoo/gentoo/pull/10724
Suggested-by: Yiyang Wu  gmail.com>
Suggested-by: Wilfried Holzke  holzke.net>
Package-Manager: Portage-3.0.12, Repoman-3.0.1
Signed-off-by: Benda Xu  gentoo.org>

 dev-libs/rccl/Manifest |  1 +
 .../files/rccl-2.7.0-change_install_location.patch | 33 ++
 dev-libs/rccl/metadata.xml | 19 +++
 dev-libs/rccl/rccl-4.0.0-r1.ebuild | 39 ++
 4 files changed, 92 insertions(+)

diff --git a/dev-libs/rccl/Manifest b/dev-libs/rccl/Manifest
new file mode 100644
index 000..19e11e35867
--- /dev/null
+++ b/dev-libs/rccl/Manifest
@@ -0,0 +1 @@
+DIST rccl-4.0.0.tar.gz 741814 BLAKE2B 
c20178e45fb7787ef7f5e20326f91f11a1b2a575277b5f28591b0be6efa6730c3509b11255372648f1df50e33b5e593dbe9c3334c5001f39423fc70acfa49d07
 SHA512 
d25754895d7b5695e46031642c2550cf2b6b5c42628d8381a23d6d1a48699a14a4fdf842205a14b96bdd1339341f9e558492ef9366a63036d8a8a7011d2c1b05

diff --git a/dev-libs/rccl/files/rccl-2.7.0-change_install_location.patch 
b/dev-libs/rccl/files/rccl-2.7.0-change_install_location.patch
new file mode 100644
index 000..c129e80c62c
--- /dev/null
+++ b/dev-libs/rccl/files/rccl-2.7.0-change_install_location.patch
@@ -0,0 +1,33 @@
+--- a/CMakeLists.txt   2019-09-02 18:19:53.540736052 +0200
 b/CMakeLists.txt   2019-09-02 18:21:14.936735741 +0200
+@@ -162,15 +162,16 @@
+ 
+ rocm_install_targets(TARGETS
+  rccl
+- PREFIX
+- rccl)
++# PREFIX
++# rccl
++  )
+ install(FILES ${PROJECT_BINARY_DIR}/rccl.h
+-DESTINATION rccl/${CMAKE_INSTALL_INCLUDEDIR})
++DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+ 
+ rocm_export_targets(NAMESPACE
+ roc::
+-PREFIX
+-rccl
++#PREFIX
++#rccl
+ TARGETS
+ rccl
+ DEPENDS
+@@ -190,7 +191,7 @@
+   ""
+   LDCONFIG)
+ 
+-rocm_install_symlink_subdir(rccl)
++#rocm_install_symlink_subdir(rccl)
+ 
+ if(BUILD_TESTS)
+   add_subdirectory(test)

diff --git a/dev-libs/rccl/metadata.xml b/dev-libs/rccl/metadata.xml
new file mode 100644
index 000..1e0f4fb686b
--- /dev/null
+++ b/dev-libs/rccl/metadata.xml
@@ -0,0 +1,19 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+  
+s...@gentoo.org
+Gentoo Science Project
+  
+  
+candr...@gentoo.org
+Craig Andrews
+  
+  
+gen...@holzke.net
+Wilfried Holzke
+  
+  
+ROCm-Developer-Tools/rccl
+  
+

diff --git a/dev-libs/rccl/rccl-4.0.0-r1.ebuild 
b/dev-libs/rccl/rccl-4.0.0-r1.ebuild
new file mode 100644
index 000..364e12bac66
--- /dev/null
+++ b/dev-libs/rccl/rccl-4.0.0-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 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"
+
+RDEPEND="=dev-util/hip-$(ver_cut 1-2)*"
+DEPEND="${RDPEND}
+   dev-util/rocm-cmake"
+
+S="${WORKDIR}/rccl-rocm-${PV}"
+
+PATCHES=(
+   "${FILESDIR}/rccl-2.7.0-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
+   )
+
+   cmake_src_configure
+}