public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/rccl] rawhide: Update to 7.14
@ 2026-08-13 19:12 Tom Rix
0 siblings, 0 replies; only message in thread
From: Tom Rix @ 2026-08-13 19:12 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/rccl
Branch : rawhide
Commit : 327239c22a1d7cc1ff397f96911ce920e7458895
Author : Tom Rix <Tom.Rix@amd.com>
Date : 2026-08-13T12:12:00-07:00
Stats : +53/-29 in 4 file(s)
URL : https://src.fedoraproject.org/rpms/rccl/c/327239c22a1d7cc1ff397f96911ce920e7458895?branch=rawhide
Log:
Update to 7.14
Signed-off-by: Tom Rix <Tom.Rix@amd.com>
---
diff --git a/.gitignore b/.gitignore
index f138f8d..cf657d7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@
/RCCL-7.1.0.tar.gz
/RCCL-7.1.1.tar.gz
/RCCL-7.2.0.tar.gz
+/rccl-7.14.0.tar.gz
diff --git a/0001-rccl-multiple-nccl_domain.patch b/0001-rccl-multiple-nccl_domain.patch
new file mode 100644
index 0000000..2e97e42
--- /dev/null
+++ b/0001-rccl-multiple-nccl_domain.patch
@@ -0,0 +1,41 @@
+From cb2ffd7081ce6befc5d012c6007ac6e2d93be102 Mon Sep 17 00:00:00 2001
+From: Tom Rix <Tom.Rix@amd.com>
+Date: Tue, 28 Jul 2026 07:59:43 -0700
+Subject: [PATCH] rccl multiple nccl_domain
+
+---
+ projects/rccl/src/include/nvtx.h | 2 ++
+ projects/rccl/src/include/nvtx_stub.h | 2 ++
+ 2 files changed, 4 insertions(+)
+
+diff --git a/projects/rccl/src/include/nvtx.h b/projects/rccl/src/include/nvtx.h
+index 354174d5ef7c..fb9b1eb6eea8 100644
+--- a/projects/rccl/src/include/nvtx.h
++++ b/projects/rccl/src/include/nvtx.h
+@@ -53,7 +53,9 @@
+
+ extern const nvtxDomainHandle_t ncclNvtxDomainHandle;
+
++#ifndef NCCL_NVTX_STUB_H_
+ struct nccl_domain{static constexpr char const* name{"NCCL"};};
++#endif
+
+ extern int64_t ncclParamNvtxDisable();
+
+diff --git a/projects/rccl/src/include/nvtx_stub.h b/projects/rccl/src/include/nvtx_stub.h
+index 442d1cdd72d0..c86ddbd2cffe 100755
+--- a/projects/rccl/src/include/nvtx_stub.h
++++ b/projects/rccl/src/include/nvtx_stub.h
+@@ -9,7 +9,9 @@
+
+ #include <nvtx3/nvToolsExtPayload.h>
+
++#ifndef NCCL_NVTX_H_
+ struct nccl_domain{static constexpr char const* name{"NCCL"};};
++#endif
+
+ #define NVTX3_FUNC_RANGE_IN(domain)
+ #define nvtxNameOsThreadA(syscall, thread)
+--
+2.54.0
+
diff --git a/rccl.spec b/rccl.spec
index 42f2991..ad47a4a 100644
--- a/rccl.spec
+++ b/rccl.spec
@@ -19,19 +19,17 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.
#
+%global upstreamname rccl
+
%bcond_with preview
%if %{with preview}
-%global upstreamname rccl
%global rocm_release 7.14
-%global rocm_patch 0
-%global pkg_src therock-%{rocm_release}
%else
-%global upstreamname RCCL
-%global rocm_release 7.2
-%global rocm_patch 0
-%global pkg_src rocm-%{rocm_release}.%{rocm_patch}
+%global rocm_release 7.14
%endif
+%global rocm_patch 0
+%global pkg_src therock-%{rocm_release}
%global rocm_version %{rocm_release}.%{rocm_patch}
%bcond_with compat
@@ -96,7 +94,7 @@ Version: %{rocm_version}
%if %{with preview}
Release: 0%{?dist}
%else
-Release: 6%{?dist}
+Release: 1%{?dist}
%endif
Summary: ROCm Communication Collectives Library
@@ -107,14 +105,9 @@ License: BSD-3-Clause AND MIT AND Apache-2.0
# src/include/nvtx3/nv*.h and similar
# The URL for NVIDIA in the License.txt https://github.com/NVIDIA/NVTX is Apache-2.0
-%if %{with preview}
URL: https://github.com/ROCm/rocm-systems
Source0: %{url}/releases/download/%{pkg_src}/%{upstreamname}.tar.gz#/%{upstreamname}-%{version}.tar.gz
Patch1: 0001-rccl-multiple-nccl_domain.patch
-%else
-Url: https://github.com/ROCm/rccl
-Source0: %{url}/archive/rocm-%{rocm_version}.tar.gz#/%{upstreamname}-%{rocm_version}.tar.gz
-%endif
BuildRequires: cmake
BuildRequires: hipify%{pkg_suffix}
@@ -190,7 +183,6 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
%endif
%prep
-%if %{with preview}
%autosetup -p3 -n %{upstreamname}
# Missing NCCL_NUM_ALGORITHMS define
@@ -198,10 +190,6 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
# There are other problems after this.
sed -i '/#include "core.h"/a #include "plugin/nccl_tuner.h"' src/include/rccl_common.h
-%else
-%autosetup -p1 -n rccl-rocm-%{version}
-%endif
-
# Allow user to set AMDGPU_TARGETS
sed -i -e '/AMD GPU targets to compile for/d' CMakeLists.txt
@@ -247,7 +235,7 @@ if [ ${COMPILE_JOBS} = 1 ]; then
fi
fi
-# Take into account memmory usage per core, do not thrash real memory
+# Take into account memory usage per core, do not thrash real memory
# inflate this to prevent competing with normal compile jobs
BUILD_MEM=16
MEM_KB=0
@@ -278,21 +266,17 @@ sed -i -e "s@-parallel-jobs=\${num_linker_jobs}@-parallel-jobs=${LINK_JOBS}@" CM
# Switch to bfd
sed -i -e 's@target_link_libraries(rccl PRIVATE -fgpu-rdc)@target_link_libraries(rccl PRIVATE -fgpu-rdc -fuse-ld=bfd)@' CMakeLists.txt
-%if %{with preview}
# need iostream to use std::cerr
sed -i '/#include <cuda_runtime.h>/a #include <iostream>' src/ipc_init.cu
# need std::map
sed -i '/#include <mutex>/a #include <map>' src/transport/net.cc
-%endif
%build
-%if %{with preview}
# to find rocm things, setting -DROCM_PATH broken
export ROCM_PATH=%{pkg_prefix}
# to find amdclang++
export PATH=%rocmllvm_bindir:$PATH
-%endif
%cmake \
-DGPU_TARGETS=%{gpu_list} \
@@ -332,22 +316,20 @@ rm -f %{buildroot}%{pkg_prefix}/share/doc/rccl/LICENSE.txt
%{pkg_prefix}/include/rccl/
%{pkg_prefix}/%{pkg_libdir}/cmake/rccl/
%{pkg_prefix}/%{pkg_libdir}/librccl.so
-%if %{with preview}
%{pkg_prefix}/include/nccl.h
%{pkg_prefix}/include/nccl_device.h
%{pkg_prefix}/include/nccl_device/
-%endif
-
%if %{with test}
%files test
%{pkg_prefix}/bin/rccl-UnitTests*
-%if %{with preview}
%{pkg_prefix}/bin/rccl/*.cmake
%endif
-%endif
%changelog
+* Sun Aug 9 2026 Tom Rix <Tom.Rix@amd.com> - 7.14.0-1
+- Update to 7.14
+
* Thu Jul 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 7.2.0-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
diff --git a/sources b/sources
index 653eb45..f1ec5a7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (RCCL-7.2.0.tar.gz) = 01114060b7bc71580cbc55583121b24b82b449f5a515d4e60000a88f95ca5841d8a68261050eba14faeb090a2e92d164691e97c27f0e9270bcf308a24c656176
+SHA512 (rccl-7.14.0.tar.gz) = e28e324c54d8629321ea99f5e4fbd17d26dc24644e5bcd8cbdf7a0c499601c7cfdb174d4f64dd3d77f4ec242d9712455e08dc7b70b23a858b07fb9b3d2b0caa6
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-08-13 19:12 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-08-13 19:12 [rpms/rccl] rawhide: Update to 7.14 Tom Rix
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox