public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/gloo] rawhide: Update to a recent gloo, enable rocm
@ 2026-08-18 19:18 Tom Rix
  0 siblings, 0 replies; only message in thread
From: Tom Rix @ 2026-08-18 19:18 UTC (permalink / raw)
  To: git-commits

            A new commit has been pushed.

            Repo   : rpms/gloo
            Branch : rawhide
            Commit : 523bb817b6d642592f0148b6daecbc763bd895ee
            Author : Tom Rix <Tom.Rix@amd.com>
            Date   : 2026-08-18T12:17:47-07:00
            Stats  : +47/-5 in 3 file(s)
            URL    : https://src.fedoraproject.org/rpms/gloo/c/523bb817b6d642592f0148b6daecbc763bd895ee?branch=rawhide

            Log:
            Update to a recent gloo, enable rocm

Signed-off-by: Tom Rix <Tom.Rix@amd.com>

---
diff --git a/.gitignore b/.gitignore
index fcd39a2..aa274c3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /gloo-01a0c81.tar.gz
 /gloo-dc507d1.tar.gz
+/gloo-08fcb29.tar.gz

diff --git a/gloo.spec b/gloo.spec
index 4a3f31f..ec577f1 100644
--- a/gloo.spec
+++ b/gloo.spec
@@ -1,11 +1,21 @@
-%global commit0 dc507d1eb822c4396aaca284efff498aba33c7dc
+%global commit0 08fcb290a89871a2d1175d655a34b7674b1dcc4b
 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
-%global date0 20241203
+%global date0 20260801
+%global so_date0 260801
 # MPI build based on spec file dbcsr by Orion
 %global mpi_list openmpi mpich
 # $mpi will be evaluated in the loops below
 %global _vpath_builddir %{_vendor}-%{_target_os}-build-${mpi:-serial}
 
+%ifarch x86_64
+%bcond_without rocm
+%endif
+%if %{with rocm}
+%global build_rocm ON
+%else
+%global build_rocm OFF
+%endif
+
 Summary:        Communications library for AI/ML
 Name:           gloo
 License:        BSD-3-Clause
@@ -15,8 +25,8 @@ Release:        %autorelease
 URL:            https://github.com/facebookincubator/%{name}
 Source0:        %{url}/archive/%{commit0}/%{name}-%{shortcommit0}.tar.gz
 Patch0:         0001-gloo-fedora-cmake-changes.patch
-Patch1:         0002-gloo-fedora-cmake-libuv.patch
-Patch2:         0001-gloo-gcc-15-cstdint.patch
+#Patch1:         0002-gloo-fedora-cmake-libuv.patch
+#Patch2:         0001-gloo-gcc-15-cstdint.patch
 # See CMakeLists, gloo only builds on 64 bit systems
 ExcludeArch:    i686
 
@@ -31,6 +41,16 @@ BuildRequires:  openmpi-devel
 BuildRequires:  rdma-core-devel
 BuildRequires:  redis-devel
 
+%if %{with rocm}
+BuildRequires:  hipify
+BuildRequires:  rccl-devel
+BuildRequires:  rocm-comgr-devel
+BuildRequires:  rocm-compilersupport-macros
+BuildRequires:  rocm-hip-devel
+BuildRequires:  rocm-runtime-devel
+BuildRequires:  rocm-rpm-macros
+%endif
+
 Requires:       %{name}-docs
 
 %global base_description \
@@ -110,11 +130,25 @@ that use %{name}-mpich.
 # cmake version change
 sed -i -e 's@cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)@cmake_minimum_required(VERSION 3.5 FATAL_ERROR)@' CMakeLists.txt
 
+# change YYMMDD to match commit0 date and get a fake so version
+sed -i -e 's@YYMMDD@%{so_date0}@' gloo/CMakeLists.txt
+sed -i -e 's@POSITION_INDEPENDENT_CODE ON@POSITION_INDEPENDENT_CODE ON VERSION 0.0.%{so_date0} SOVERSION 0.0.%{so_date0}@' cmake/Hip.cmake
+
+# some help with installing headers
+sed -i -e 's@${CMAKE_INSTALL_PREFIX}/include/${DIR}@${CMAKE_INSTALL_PREFIX}/include/gloo/@' gloo/CMakeLists.txt
+
 %build
 %define gloo_cmake_options -DUSE_IBVERBS=ON -DUSE_LIBUV=OFF -DUSE_REDIS=ON
 
+%if %{with rocm}
+ROCM_PATH=%{_prefix}
+GLOO_ROCM_ARCH=%{rocm_gpu_list_rccl}
+%endif
+
 %cmake %gloo_cmake_options \
        -DUSE_MPI=OFF \
+       -DUSE_ROCM=%{build_rocm} \
+       -DUSE_RCCL=%{build_rocm} \
        -DCMAKE_INSTALL_PREFIX=%{_prefix} \
        -DCMAKE_INSTALL_LIBDIR=lib64
 
@@ -125,6 +159,7 @@ do
   module load mpi/$mpi-%{_arch}
   %cmake %gloo_cmake_options \
          -DUSE_MPI=ON \
+	 -DUSE_ROCM=OFF \
          -DCMAKE_INSTALL_PREFIX=$MPI_HOME \
 	 -DCMAKE_INSTALL_LIBDIR=lib
 
@@ -151,11 +186,17 @@ done
 
 %files
 %{_libdir}/lib%{name}.so.*
+%if %{with rocm}
+%{_libdir}/lib%{name}_hip.so.*
+%endif
 
 %files devel
 %{_includedir}/%{name}/
 %{_libdir}/cmake/Gloo/
 %{_libdir}/lib%{name}.so
+%if %{with rocm}
+%{_libdir}/lib%{name}_hip.so
+%endif
 
 %files mpich
 %{_libdir}/mpich/lib/lib%{name}.so.*

diff --git a/sources b/sources
index a0f9c93..2ee3f20 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (gloo-dc507d1.tar.gz) = 77a14129821cb69ff678012141ba4d71350de3b12eb3362045ad76b40882434bdbe02abd912391819b93ca7168ca99bd5c2a7436913bdc9ec571bfc2332198fc
+SHA512 (gloo-08fcb29.tar.gz) = 7517afba0233fbdd1223e3444c131cda93fd4f8e189b052ab0a2b6a13019ede64922871ac904a6cef435a8a30edc24332a598fad139c0ccd38357de13e0aec3e

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-08-18 19:18 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-08-18 19:18 [rpms/gloo] rawhide: Update to a recent gloo, enable rocm Tom Rix

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox