diff --git a/cmssw-tools.spec b/cmssw-tools.spec index 2933b7ccf87..18b70d655db 100644 --- a/cmssw-tools.spec +++ b/cmssw-tools.spec @@ -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 diff --git a/fwlite-tools.spec b/fwlite-tools.spec index afffbc5a513..216e981a5bb 100644 --- a/fwlite-tools.spec +++ b/fwlite-tools.spec @@ -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 diff --git a/rocm-rocrand.spec b/rocm-rocrand.spec deleted file mode 100644 index d152fe63460..00000000000 --- a/rocm-rocrand.spec +++ /dev/null @@ -1,34 +0,0 @@ -### RPM external rocm-rocrand 6.2.4 -## NOCOMPILER - -%if 0%{?rhel} == 7 -# allow rpm2cpio dependency on the bootstrap bundle -%undefine drop_bootstrap_lib -%define drop_bootstrap_lib true -%define repository repo.radeon.com/rocm/yum -%else -%define repository repo.radeon.com/rocm/rhel%{rhel} -%endif - -# AMD repositories are numbered 6.1, 6.1.1, 6.1.2, ..., 6.2 -# without any .0 in the directory name -%define repoversion %(echo %{realversion} | sed -e's/\.0$//') - -Source0: https://%{repository}/%{repoversion}/main/rocrand-3.1.1.60204-139.el%{rhel}.%{_arch}.rpm -Source1: https://%{repository}/%{repoversion}/main/rocrand-devel-3.1.1.60204-139.el%{rhel}.%{_arch}.rpm -Requires: rocm -AutoReq: no - -%prep - -%build -rpm2cpio %{SOURCE0} | cpio -idmv -rpm2cpio %{SOURCE1} | cpio -idmv - -%install -rmdir %{i} -mv opt/rocm-%{realversion} %{i} -rm -rf opt -rm -rf usr - -%post diff --git a/rocm.spec b/rocm.spec index d26ac00bcc7..dc9e980f1e3 100644 --- a/rocm.spec +++ b/rocm.spec @@ -1,4 +1,4 @@ -### RPM external rocm 6.3.2 +### RPM external rocm 6.2.4 ## INCLUDE cpp-standard %if 0%{?rhel} == 7 @@ -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 @@ -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 @@ -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 diff --git a/scram-tools.file/tools/rocm-rocrand/rocm-rocrand.xml b/scram-tools.file/tools/rocm-rocrand/rocm-rocrand.xml deleted file mode 100644 index 90f03f5451c..00000000000 --- a/scram-tools.file/tools/rocm-rocrand/rocm-rocrand.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - diff --git a/scram-tools.file/tools/rocm/rocm-miopen.xml b/scram-tools.file/tools/rocm/rocm-miopen.xml new file mode 100644 index 00000000000..e32ceed591f --- /dev/null +++ b/scram-tools.file/tools/rocm/rocm-miopen.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/scram-tools.file/tools/rocm/rocm-rccl.xml b/scram-tools.file/tools/rocm/rocm-rccl.xml new file mode 100644 index 00000000000..a8dd9ca4909 --- /dev/null +++ b/scram-tools.file/tools/rocm/rocm-rccl.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/scram-tools.file/tools/rocm/rocm-rocblas.xml b/scram-tools.file/tools/rocm/rocm-rocblas.xml new file mode 100644 index 00000000000..ba38d448499 --- /dev/null +++ b/scram-tools.file/tools/rocm/rocm-rocblas.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/scram-tools.file/tools/rocm/rocm-rocfft.xml b/scram-tools.file/tools/rocm/rocm-rocfft.xml new file mode 100644 index 00000000000..ace18ca61cf --- /dev/null +++ b/scram-tools.file/tools/rocm/rocm-rocfft.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/scram-tools.file/tools/rocm/rocm-rocrand.xml b/scram-tools.file/tools/rocm/rocm-rocrand.xml new file mode 100644 index 00000000000..0dc371077d1 --- /dev/null +++ b/scram-tools.file/tools/rocm/rocm-rocrand.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/scram-tools.file/tools/rocm/rocm-rocsolver.xml b/scram-tools.file/tools/rocm/rocm-rocsolver.xml new file mode 100644 index 00000000000..33da8ce4ed8 --- /dev/null +++ b/scram-tools.file/tools/rocm/rocm-rocsolver.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/scram-tools.file/tools/rocm/rocm-rocsparse.xml b/scram-tools.file/tools/rocm/rocm-rocsparse.xml new file mode 100644 index 00000000000..3631d5d0b57 --- /dev/null +++ b/scram-tools.file/tools/rocm/rocm-rocsparse.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/scram-tools.file/tools/rocm/rocm.xml b/scram-tools.file/tools/rocm/rocm.xml index 067d4f75f04..a30f9fd90c4 100644 --- a/scram-tools.file/tools/rocm/rocm.xml +++ b/scram-tools.file/tools/rocm/rocm.xml @@ -1,5 +1,5 @@ - - + + @@ -14,7 +14,6 @@ -