Skip to content

[do not merge] Revert ROCm to version 6.2.4 and include more tools #9844

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
fwyzard wants to merge 2 commits into from
Closed

[do not merge] Revert ROCm to version 6.2.4 and include more tools #9844

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
758b291
ROCm: drop support for Radeon Pro W6800
fwyzard May 9, 2025
876534a
Revert ROCm to version 6.2.4 and include more tools
fwyzard Apr 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmssw-tools.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ Requires: icc
Requires: icx
Requires: intel-vtune
Requires: ruff
%{!?without_rocm:Requires: rocm rocm-rocrand}
%{!?without_rocm:Requires: rocm}
Requires: cmsmon-tools
Requires: dip
%else
Expand Down
2 changes: 1 addition & 1 deletion fwlite-tools.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# tool is added
## INITENV SET CMSSW_TOOL_CONF_ROOT $FWLITE_TOOL_CONF_ROOT

%{!?without_rocm:Requires: rocm rocm-rocrand}
%{!?without_rocm:Requires: rocm}
%{!?without_cuda:Requires: cuda cuda-compatible-runtime}

Requires: alpaka
Expand Down
34 changes: 0 additions & 34 deletions rocm-rocrand.spec
View file
Open in desktop

This file was deleted.

109 changes: 71 additions & 38 deletions rocm.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
### RPM external rocm 6.3.2
### RPM external rocm 6.2.4
## INCLUDE cpp-standard

%if 0%{?rhel} == 7
Expand All @@ -22,44 +22,60 @@
%define rocprofiler_register_tag rocm-%{realversion}
%define rocprofiler_register_pkg rocprofiler-register-%{rocprofiler_register_tag}

Source0: https://%{repository}/%{repoversion}/main/amd-smi-lib-24.7.1.60302-66.el%{rhel}.%{_arch}.rpm
Source1: https://%{repository}/%{repoversion}/main/amd-smi-lib-debuginfo-24.7.1.60302-66.el%{rhel}.%{_arch}.rpm
Source2: https://%{repository}/%{repoversion}/main/comgr-2.8.0.60302-66.el%{rhel}.%{_arch}.rpm
Source3: https://%{repository}/%{repoversion}/main/comgr-debuginfo-2.8.0.60302-66.el%{rhel}.%{_arch}.rpm
Source4: https://%{repository}/%{repoversion}/main/hip-devel-6.3.42134.60302-66.el%{rhel}.%{_arch}.rpm
Source5: https://%{repository}/%{repoversion}/main/hip-runtime-amd-6.3.42134.60302-66.el%{rhel}.%{_arch}.rpm
Source6: https://%{repository}/%{repoversion}/main/hip-runtime-amd-debuginfo-6.3.42134.60302-66.el%{rhel}.%{_arch}.rpm
Source7: https://%{repository}/%{repoversion}/main/hipcc-1.1.1.60302-66.el%{rhel}.%{_arch}.rpm
Source8: https://%{repository}/%{repoversion}/main/hipcc-debuginfo-1.1.1.60302-66.el%{rhel}.%{_arch}.rpm
Source9: https://%{repository}/%{repoversion}/main/hsa-rocr-1.14.0.60302-66.el%{rhel}.%{_arch}.rpm
Source10: https://%{repository}/%{repoversion}/main/hsa-rocr-debuginfo-1.14.0.60302-66.el%{rhel}.%{_arch}.rpm
Source11: https://%{repository}/%{repoversion}/main/openmp-extras-devel-18.63.0.60302-66.el%{rhel}.%{_arch}.rpm
Source12: https://%{repository}/%{repoversion}/main/openmp-extras-runtime-18.63.0.60302-66.el%{rhel}.%{_arch}.rpm
Source13: https://%{repository}/%{repoversion}/main/rocm-core-6.3.2.60302-66.el%{rhel}.%{_arch}.rpm
Source14: https://%{repository}/%{repoversion}/main/rocm-dbgapi-0.77.0.60302-66.el%{rhel}.%{_arch}.rpm
Source15: https://%{repository}/%{repoversion}/main/rocm-dbgapi-debuginfo-0.77.0.60302-66.el%{rhel}.%{_arch}.rpm
Source16: https://%{repository}/%{repoversion}/main/rocm-device-libs-1.0.0.60302-66.el%{rhel}.%{_arch}.rpm
Source17: https://%{repository}/%{repoversion}/main/rocm-llvm-18.0.0.25012.60302-66.el%{rhel}.%{_arch}.rpm
Source18: https://%{repository}/%{repoversion}/main/rocm-smi-lib-7.4.0.60302-66.el%{rhel}.%{_arch}.rpm
Source19: https://%{repository}/%{repoversion}/main/rocm-smi-lib-debuginfo-7.4.0.60302-66.el%{rhel}.%{_arch}.rpm
Source20: https://%{repository}/%{repoversion}/main/rocminfo-1.0.0.60302-66.el%{rhel}.%{_arch}.rpm
Source21: https://%{repository}/%{repoversion}/main/rocminfo-debuginfo-1.0.0.60302-66.el%{rhel}.%{_arch}.rpm
Source22: https://%{repository}/%{repoversion}/main/rocprim-devel-3.3.0.60302-66.el%{rhel}.%{_arch}.rpm
Source23: https://%{repository}/%{repoversion}/main/rocprofiler-2.0.60302.60302-66.el%{rhel}.%{_arch}.rpm
Source24: https://%{repository}/%{repoversion}/main/rocprofiler-compute-3.0.0.60302-66.el%{rhel}.%{_arch}.rpm
Source25: https://%{repository}/%{repoversion}/main/rocprofiler-debuginfo-2.0.60302.60302-66.el%{rhel}.%{_arch}.rpm
Source26: https://%{repository}/%{repoversion}/main/rocprofiler-devel-2.0.60302.60302-66.el%{rhel}.%{_arch}.rpm
Source27: https://%{repository}/%{repoversion}/main/rocprofiler-docs-2.0.60302.60302-66.el%{rhel}.%{_arch}.rpm
Source28: https://%{repository}/%{repoversion}/main/rocprofiler-plugins-2.0.60302.60302-66.el%{rhel}.%{_arch}.rpm
Source29: https://%{repository}/%{repoversion}/main/rocprofiler-plugins-debuginfo-2.0.60302.60302-66.el%{rhel}.%{_arch}.rpm
Source30: https://%{repository}/%{repoversion}/main/rocprofiler-register-0.4.0.60302-66.el%{rhel}.%{_arch}.rpm
Source31: https://%{repository}/%{repoversion}/main/rocprofiler-systems-0.1.1.60302-66.el%{rhel}.%{_arch}.rpm
Source32: https://%{repository}/%{repoversion}/main/rocprofiler-systems-debuginfo-0.1.1.60302-66.el%{rhel}.%{_arch}.rpm
Source33: https://%{repository}/%{repoversion}/main/rocthrust-devel-3.3.0.60302-66.el%{rhel}.%{_arch}.rpm

Source0: https://%{repository}/%{repoversion}/main/amd-smi-lib-24.6.3.60204-139.el%{rhel}.%{_arch}.rpm
Source1: https://%{repository}/%{repoversion}/main/comgr-2.8.0.60204-139.el%{rhel}.%{_arch}.rpm
Source2: https://%{repository}/%{repoversion}/main/hip-devel-6.2.41134.60204-139.el%{rhel}.%{_arch}.rpm
Source3: https://%{repository}/%{repoversion}/main/hip-runtime-amd-6.2.41134.60204-139.el%{rhel}.%{_arch}.rpm
Source4: https://%{repository}/%{repoversion}/main/hipcc-1.1.1.60204-139.el%{rhel}.%{_arch}.rpm
Source5: https://%{repository}/%{repoversion}/main/hsa-rocr-1.14.0.60204-139.el%{rhel}.%{_arch}.rpm
Source6: https://%{repository}/%{repoversion}/main/hsa-rocr-devel-1.14.0.60204-139.el%{rhel}.%{_arch}.rpm
Source7: https://%{repository}/%{repoversion}/main/openmp-extras-devel-18.62.0.60204-139.el%{rhel}.%{_arch}.rpm
Source8: https://%{repository}/%{repoversion}/main/openmp-extras-runtime-18.62.0.60204-139.el%{rhel}.%{_arch}.rpm
Source9: https://%{repository}/%{repoversion}/main/rocm-core-6.2.4.60204-139.el%{rhel}.%{_arch}.rpm
Source10: https://%{repository}/%{repoversion}/main/rocm-dbgapi-0.76.0.60204-139.el%{rhel}.%{_arch}.rpm
Source11: https://%{repository}/%{repoversion}/main/rocm-device-libs-1.0.0.60204-139.el%{rhel}.%{_arch}.rpm
Source12: https://%{repository}/%{repoversion}/main/rocm-llvm-18.0.0.24392.60204-139.el%{rhel}.%{_arch}.rpm
Source13: https://%{repository}/%{repoversion}/main/rocm-smi-lib-7.3.0.60204-139.el%{rhel}.%{_arch}.rpm
Source14: https://%{repository}/%{repoversion}/main/rocminfo-1.0.0.60204-139.el%{rhel}.%{_arch}.rpm
Source15: https://%{repository}/%{repoversion}/main/rocprim-devel-3.2.2.60204-139.el%{rhel}.%{_arch}.rpm
Source16: https://%{repository}/%{repoversion}/main/rocprofiler-2.0.60204.60204-139.el%{rhel}.%{_arch}.rpm
Source17: https://%{repository}/%{repoversion}/main/rocprofiler-devel-2.0.60204.60204-139.el%{rhel}.%{_arch}.rpm
Source18: https://%{repository}/%{repoversion}/main/rocprofiler-docs-2.0.60204.60204-139.el%{rhel}.%{_arch}.rpm
Source19: https://%{repository}/%{repoversion}/main/rocprofiler-plugins-2.0.60204.60204-139.el%{rhel}.%{_arch}.rpm
Source20: https://%{repository}/%{repoversion}/main/rocprofiler-register-0.4.0.60204-139.el%{rhel}.%{_arch}.rpm
Source21: https://%{repository}/%{repoversion}/main/hipcub-devel-3.2.1.60204-139.el%{rhel}.%{_arch}.rpm
Source22: https://%{repository}/%{repoversion}/main/rocthrust-devel-3.1.1.60204-139.el%{rhel}.%{_arch}.rpm
Source23: https://%{repository}/%{repoversion}/main/hiprand-2.11.1.60204-139.el%{rhel}.%{_arch}.rpm
Source24: https://%{repository}/%{repoversion}/main/hiprand-devel-2.11.1.60204-139.el%{rhel}.%{_arch}.rpm
Source25: https://%{repository}/%{repoversion}/main/rocrand-3.1.1.60204-139.el%{rhel}.%{_arch}.rpm
Source26: https://%{repository}/%{repoversion}/main/rocrand-devel-3.1.1.60204-139.el%{rhel}.%{_arch}.rpm
Source27: https://%{repository}/%{repoversion}/main/hipblas-2.2.0.60204-139.el%{rhel}.%{_arch}.rpm
Source28: https://%{repository}/%{repoversion}/main/hipblas-devel-2.2.0.60204-139.el%{rhel}.%{_arch}.rpm
Source29: https://%{repository}/%{repoversion}/main/hipblaslt-0.8.0.60204-139.el%{rhel}.%{_arch}.rpm
Source30: https://%{repository}/%{repoversion}/main/hipblaslt-devel-0.8.0.60204-139.el%{rhel}.%{_arch}.rpm
Source31: https://%{repository}/%{repoversion}/main/rocblas-4.2.4.60204-139.el%{rhel}.%{_arch}.rpm
Source32: https://%{repository}/%{repoversion}/main/rocblas-devel-4.2.4.60204-139.el%{rhel}.%{_arch}.rpm
Source33: https://%{repository}/%{repoversion}/main/miopen-hip-3.2.0.60204-139.el%{rhel}.%{_arch}.rpm
Source34: https://%{repository}/%{repoversion}/main/miopen-hip-devel-3.2.0.60204-139.el%{rhel}.%{_arch}.rpm
Source35: https://%{repository}/%{repoversion}/main/hipfft-1.0.16.60204-139.el%{rhel}.%{_arch}.rpm
Source36: https://%{repository}/%{repoversion}/main/hipfft-devel-1.0.16.60204-139.el%{rhel}.%{_arch}.rpm
Source37: https://%{repository}/%{repoversion}/main/rocfft-1.0.30.60204-139.el%{rhel}.%{_arch}.rpm
Source38: https://%{repository}/%{repoversion}/main/rocfft-devel-1.0.30.60204-139.el%{rhel}.%{_arch}.rpm
Source39: https://%{repository}/%{repoversion}/main/hipsparse-3.1.1.60204-139.el%{rhel}.%{_arch}.rpm
Source40: https://%{repository}/%{repoversion}/main/hipsparse-devel-3.1.1.60204-139.el%{rhel}.%{_arch}.rpm
Source41: https://%{repository}/%{repoversion}/main/hipsparselt-0.2.1.60204-139.el%{rhel}.%{_arch}.rpm
Source42: https://%{repository}/%{repoversion}/main/hipsparselt-devel-0.2.1.60204-139.el%{rhel}.%{_arch}.rpm
Source43: https://%{repository}/%{repoversion}/main/rocsparse-3.2.1.60204-139.el%{rhel}.%{_arch}.rpm
Source44: https://%{repository}/%{repoversion}/main/rocsparse-devel-3.2.1.60204-139.el%{rhel}.%{_arch}.rpm
Source45: https://%{repository}/%{repoversion}/main/hipsolver-2.2.0.60204-139.el%{rhel}.%{_arch}.rpm
Source46: https://%{repository}/%{repoversion}/main/hipsolver-devel-2.2.0.60204-139.el%{rhel}.%{_arch}.rpm
Source47: https://%{repository}/%{repoversion}/main/rocsolver-3.26.2.60204-139.el%{rhel}.%{_arch}.rpm
Source48: https://%{repository}/%{repoversion}/main/rocsolver-devel-3.26.2.60204-139.el%{rhel}.%{_arch}.rpm
Source49: https://%{repository}/%{repoversion}/main/rccl-2.20.5.60204-139.el%{rhel}.%{_arch}.rpm
Source50: https://%{repository}/%{repoversion}/main/rccl-devel-2.20.5.60204-139.el%{rhel}.%{_arch}.rpm

# sources for rocprofiler-register
Source34: git+https://github.com/ROCm/rocprofiler-register.git?obj=%{rocprofiler_register_branch}/%{rocprofiler_register_tag}&export=%{rocprofiler_register_pkg}&submodules=1&output=/%{rocprofiler_register_pkg}.tgz
Source99: git+https://github.com/ROCm/rocprofiler-register.git?obj=%{rocprofiler_register_branch}/%{rocprofiler_register_tag}&export=%{rocprofiler_register_pkg}&submodules=1&output=/%{rocprofiler_register_pkg}.tgz

BuildRequires: gmake cmake
Requires: numactl zstd fmt
Expand All @@ -70,7 +86,7 @@ AutoReq: no

# unpack rocprofiler-register
mkdir src
tar xavf %{SOURCE34} -C src
tar xavf %{SOURCE99} -C src

%build
rpm2cpio %{SOURCE0} | cpio -idmv
Expand Down Expand Up @@ -107,6 +123,23 @@ rpm2cpio %{SOURCE30} | cpio -idmv
rpm2cpio %{SOURCE31} | cpio -idmv
rpm2cpio %{SOURCE32} | cpio -idmv
rpm2cpio %{SOURCE33} | cpio -idmv
rpm2cpio %{SOURCE34} | cpio -idmv
rpm2cpio %{SOURCE35} | cpio -idmv
rpm2cpio %{SOURCE36} | cpio -idmv
rpm2cpio %{SOURCE37} | cpio -idmv
rpm2cpio %{SOURCE38} | cpio -idmv
rpm2cpio %{SOURCE39} | cpio -idmv
rpm2cpio %{SOURCE40} | cpio -idmv
rpm2cpio %{SOURCE41} | cpio -idmv
rpm2cpio %{SOURCE42} | cpio -idmv
rpm2cpio %{SOURCE43} | cpio -idmv
rpm2cpio %{SOURCE44} | cpio -idmv
rpm2cpio %{SOURCE45} | cpio -idmv
rpm2cpio %{SOURCE46} | cpio -idmv
rpm2cpio %{SOURCE47} | cpio -idmv
rpm2cpio %{SOURCE48} | cpio -idmv
rpm2cpio %{SOURCE49} | cpio -idmv
rpm2cpio %{SOURCE50} | cpio -idmv

# build rocprofiler-register
sed -i -e 's|add_subdirectory(external)|find_package(fmt REQUIRED)\nadd_subdirectory(external)|' src/%{rocprofiler_register_pkg}/CMakeLists.txt
Expand Down
14 changes: 0 additions & 14 deletions scram-tools.file/tools/rocm-rocrand/rocm-rocrand.xml
View file
Open in desktop

This file was deleted.

5 changes: 5 additions & 0 deletions scram-tools.file/tools/rocm/rocm-miopen.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<tool name="rocm-miopen" version="@TOOL_VERSION@" revision="1">
<info url="https://rocm.docs.amd.com/projects/MIOpen/en/docs-@TOOL_VERSION@/"/>
<use name="rocm"/>
<lib name="MIOpen"/>
</tool>
5 changes: 5 additions & 0 deletions scram-tools.file/tools/rocm/rocm-rccl.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<tool name="rocm-rccl" version="@TOOL_VERSION@" revision="1">
<info url="https://rocm.docs.amd.com/projects/rccl/en/docs-@TOOL_VERSION@/"/>
<use name="rocm"/>
<lib name="rccl"/>
</tool>
7 changes: 7 additions & 0 deletions scram-tools.file/tools/rocm/rocm-rocblas.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<tool name="rocm-rocblas" version="@TOOL_VERSION@" revision="1">
<info url="https://rocm.docs.amd.com/projects/rocBLAS/en/docs-@TOOL_VERSION@/"/>
<use name="rocm"/>
<lib name="hipblas"/>
<lib name="hipblaslt"/>
<lib name="rocblas"/>
</tool>
6 changes: 6 additions & 0 deletions scram-tools.file/tools/rocm/rocm-rocfft.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<tool name="rocm-rocfft" version="@TOOL_VERSION@" revision="1">
<info url="https://rocm.docs.amd.com/projects/rocFFT/en/docs-@TOOL_VERSION@/"/>
<use name="rocm"/>
<lib name="hipfft"/>
<lib name="rocfft"/>
</tool>
6 changes: 6 additions & 0 deletions scram-tools.file/tools/rocm/rocm-rocrand.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<tool name="rocm-rocrand" version="@TOOL_VERSION@" revision="1">
<info url="https://rocm.docs.amd.com/projects/rocRAND/en/docs-@TOOL_VERSION@/"/>
<use name="rocm"/>
<lib name="hiprand"/>
<lib name="rocrand"/>
</tool>
6 changes: 6 additions & 0 deletions scram-tools.file/tools/rocm/rocm-rocsolver.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<tool name="rocm-rocsolver" version="@TOOL_VERSION@" revision="1">
<info url="https://rocm.docs.amd.com/projects/rocSOLVER/en/docs-@TOOL_VERSION@/"/>
<use name="rocm"/>
<lib name="hipsolver"/>
<lib name="rocsolver"/>
</tool>
7 changes: 7 additions & 0 deletions scram-tools.file/tools/rocm/rocm-rocsparse.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<tool name="rocm-rocsparse" version="@TOOL_VERSION@" revision="1">
<info url="https://rocm.docs.amd.com/projects/rocSPARSE/en/docs-@TOOL_VERSION@/"/>
<use name="rocm"/>
<lib name="hipsparse"/>
<lib name="hipsparselt"/>
<lib name="rocsparse"/>
</tool>
5 changes: 2 additions & 3 deletions scram-tools.file/tools/rocm/rocm.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<tool name="rocm" version="@TOOL_VERSION@" revision="3">
<info url="https://docs.amd.com/"/>
<tool name="rocm" version="@TOOL_VERSION@" revision="4">
<info url="https://rocm.docs.amd.com/en/docs-@TOOL_VERSION@/"/>
<lib name="amdhip64"/>
<lib name="hsa-runtime64"/>
<lib name="rocm_smi64"/>
Expand All @@ -14,7 +14,6 @@
<flags ROCM_FLAGS="--offload-arch=gfx908:sramecc+:xnack-"/> <!-- Instinct MI100 -->
<flags ROCM_FLAGS="--offload-arch=gfx90a:sramecc+:xnack-"/> <!-- Instinct MI210/MI250 -->
<flags ROCM_FLAGS="--offload-arch=gfx942:sramecc+:xnack-"/> <!-- Instinct MI300X -->
<flags ROCM_FLAGS="--offload-arch=gfx1030"/> <!-- Radeon Pro W6800 -->
<flags ROCM_FLAGS="--offload-arch=gfx1100"/> <!-- Radeon Pro W7800/W7900 -->
<flags ROCM_FLAGS="--offload-arch=gfx1102"/> <!-- Radeon Pro W7600 -->
<flags ROCM_FLAGS="-fgpu-rdc --target=@COMPILER_HOST@ --gcc-toolchain=$(COMPILER_PATH)"/>
Expand Down