From 545663d288074f1d0daac549c8868f9d2c5619b2 Mon Sep 17 00:00:00 2001 From: Malik Shahzad Muzaffar Date: Wed, 18 Jan 2023 14:54:29 +0100 Subject: [PATCH 01/31] [SCRAM] Properly restore and set the build time env --- SCRAMV1.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SCRAMV1.spec b/SCRAMV1.spec index 6c33409a215..459649093dc 100644 --- a/SCRAMV1.spec +++ b/SCRAMV1.spec @@ -1,8 +1,8 @@ -### RPM lcg SCRAMV1 V3_00_54 +### RPM lcg SCRAMV1 V3_00_55 ## NOCOMPILER ## NO_VERSION_SUFFIX -%define tag a7a459140a32cec5703888017bca8d43a4b7b5f7 +%define tag c6ab80558c01d615133391bc725c0e2c7acfb6a9 %define branch SCRAMV3 %define github_user cms-sw Source: git+https://github.com/%{github_user}/SCRAM.git?obj=%{branch}/%{tag}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}-%{tag}.tgz From 0baa812643330d46eae10ecea0ae4a581abee2ee Mon Sep 17 00:00:00 2001 From: Shahzad Malik Muzaffar Date: Thu, 19 Jan 2023 11:40:30 +0100 Subject: [PATCH 02/31] Update cms-common to fix SCRAM_ARCH --- cms-common.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cms-common.spec b/cms-common.spec index bb17770823a..754f6927849 100644 --- a/cms-common.spec +++ b/cms-common.spec @@ -1,8 +1,8 @@ ### RPM cms cms-common 1.0 -## REVISION 1223 +## REVISION 1224 ## NOCOMPILER -%define tag 27f29b30619af13a2248c5c23ca6acf4fa9f5a99 +%define tag 9c8203bf637b153697b855dfa522d6741379bcc9 Source: git+https://github.com/cms-sw/cms-common.git?obj=master/%{tag}&export=%{n}-%{realversion}-%{tag}&output=/%{n}-%{realversion}-%{tag}.tgz %prep From 6a846bdf13763c75f26d811fb6ee8562e0c32302 Mon Sep 17 00:00:00 2001 From: Malik Shahzad Muzaffar Date: Fri, 20 Jan 2023 19:03:17 +0100 Subject: [PATCH 03/31] BuildRules] Fix alpaka tests command names --- scram-project-build.file | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scram-project-build.file b/scram-project-build.file index 578f412d1a4..8f252fc54cc 100644 --- a/scram-project-build.file +++ b/scram-project-build.file @@ -54,7 +54,7 @@ BuildRequires: dwz %endif %if "%{?configtag:set}" != "set" -%define configtag V07-03-12 +%define configtag V07-03-13 %endif %if "%{?cvssrc:set}" != "set" From 9da3f50d31e1bf964d8b07b8ca28538580bfbcd4 Mon Sep 17 00:00:00 2001 From: Malik Shahzad Muzaffar Date: Fri, 20 Jan 2023 19:40:22 +0100 Subject: [PATCH 04/31] typo --- scram-project-build.file | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scram-project-build.file b/scram-project-build.file index 8f252fc54cc..bf52eddb385 100644 --- a/scram-project-build.file +++ b/scram-project-build.file @@ -54,7 +54,7 @@ BuildRequires: dwz %endif %if "%{?configtag:set}" != "set" -%define configtag V07-03-13 +%define configtag V07-03-14 %endif %if "%{?cvssrc:set}" != "set" From 1fbda9d9c682445ac78d6dbcad56b1e5f8ef4450 Mon Sep 17 00:00:00 2001 From: Malik Shahzad Muzaffar Date: Sat, 21 Jan 2023 01:38:01 +0100 Subject: [PATCH 05/31] Update scram-project-build.file --- scram-project-build.file | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scram-project-build.file b/scram-project-build.file index bf52eddb385..5567d845a8d 100644 --- a/scram-project-build.file +++ b/scram-project-build.file @@ -54,7 +54,7 @@ BuildRequires: dwz %endif %if "%{?configtag:set}" != "set" -%define configtag V07-03-14 +%define configtag V07-03-15 %endif %if "%{?cvssrc:set}" != "set" From 3385e4f2aa81fcd4412b1426e3843769e1f8d82b Mon Sep 17 00:00:00 2001 From: Malik Shahzad Muzaffar Date: Sat, 21 Jan 2023 14:46:31 +0100 Subject: [PATCH 06/31] [BuildRules] USe default compiler for alpaka/serial dev.cc files --- scram-project-build.file | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scram-project-build.file b/scram-project-build.file index 5567d845a8d..a28a2f92a4a 100644 --- a/scram-project-build.file +++ b/scram-project-build.file @@ -54,7 +54,7 @@ BuildRequires: dwz %endif %if "%{?configtag:set}" != "set" -%define configtag V07-03-15 +%define configtag V07-03-16 %endif %if "%{?cvssrc:set}" != "set" From 694be0d7fb4870eca29af0191a35937e1a2558cc Mon Sep 17 00:00:00 2001 From: cmsbuild Date: Sun, 22 Jan 2023 12:14:04 +0100 Subject: [PATCH 07/31] Update tag for RecoTracker-MkFit to V00-11-00 --- data/cmsswdata.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/cmsswdata.txt b/data/cmsswdata.txt index 9edf9021e11..000a3fdb6a1 100644 --- a/data/cmsswdata.txt +++ b/data/cmsswdata.txt @@ -3,10 +3,10 @@ #Once a non-default section is empty then cleanup that section and remove its cmsdist/${PACKAGE_TYPE}.file #If there is no customization for the packae then remove its .spec and .file [default] +RecoTracker-MkFit=V00-11-00 CalibTracker-SiStripDCS=V01-01-00 RecoEgamma-ElectronIdentification=V01-12-00 L1Trigger-TrackFindingTracklet=V00-03-00 -RecoTracker-MkFit=V00-10-00 RecoEgamma-PhotonIdentification=V01-06-00 Alignment-OfflineValidation=V00-03-00 RecoTracker-FinalTrackSelectors=V01-04-00 From b72c2171772ccd75005ab026a6d55816f92d59f9 Mon Sep 17 00:00:00 2001 From: Malik Shahzad Muzaffar Date: Tue, 24 Jan 2023 11:56:11 +0100 Subject: [PATCH 08/31] Bug fix: Added back scram build runtests_TESTNAME support --- scram-project-build.file | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scram-project-build.file b/scram-project-build.file index a28a2f92a4a..26b57beabf1 100644 --- a/scram-project-build.file +++ b/scram-project-build.file @@ -54,7 +54,7 @@ BuildRequires: dwz %endif %if "%{?configtag:set}" != "set" -%define configtag V07-03-16 +%define configtag V07-03-17 %endif %if "%{?cvssrc:set}" != "set" From 21ff999b6c18635b3fc88c274440d84b0063716c Mon Sep 17 00:00:00 2001 From: Dario Mapelli Date: Tue, 24 Jan 2023 15:05:49 +0100 Subject: [PATCH 09/31] crab-dev - crabclient v3.230124, crabserver v3.221205 --- crab-dev.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/crab-dev.spec b/crab-dev.spec index ec82ebc1a1a..33d6b009e07 100644 --- a/crab-dev.spec +++ b/crab-dev.spec @@ -2,10 +2,10 @@ #For new crabclient_version, set the version_suffix to 00 #For any other change, increment version_suffix ########################################## -%define version_suffix 01 -%define crabclient_version v3.221018 +%define version_suffix 00 +%define crabclient_version v3.230124 ### RPM cms crab-dev %{crabclient_version}.%{version_suffix} -%define crabserver_version v3.221027 +%define crabserver_version v3.221205 %define dbs_version 3.16.0 ## IMPORT crab-build From 924ffe3bf9274d9d6e4333188a4edf3c62c449f9 Mon Sep 17 00:00:00 2001 From: Malik Shahzad Muzaffar Date: Tue, 24 Jan 2023 23:25:08 +0100 Subject: [PATCH 10/31] [BuildRules] Allow packages to export lib even if there are no cxx files --- scram-project-build.file | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scram-project-build.file b/scram-project-build.file index 26b57beabf1..fa956acce9b 100644 --- a/scram-project-build.file +++ b/scram-project-build.file @@ -54,7 +54,7 @@ BuildRequires: dwz %endif %if "%{?configtag:set}" != "set" -%define configtag V07-03-17 +%define configtag V07-03-18 %endif %if "%{?cvssrc:set}" != "set" From b952c8c783582dd2742d87b0d6d246d27adb32b6 Mon Sep 17 00:00:00 2001 From: Shahzad Malik Muzaffar Date: Wed, 25 Jan 2023 15:22:44 +0100 Subject: [PATCH 11/31] use python3 for root tools --- root.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/root.spec b/root.spec index 1da82a459b6..ce0a7873aeb 100644 --- a/root.spec +++ b/root.spec @@ -173,10 +173,9 @@ ninja -v %{makeprocesses} install find %{i} -type f -name '*.py' | xargs chmod -x grep -rlI '#!.*python' %{i} | xargs chmod +x -perl -p -i -e "s|#!/bin/perl|#!/usr/bin/env perl|" %{i}/bin/memprobe for p in $(grep -rlI -m1 '^#\!.*python' %i/bin) ; do lnum=$(grep -n -m1 '^#\!.*python' $p | sed 's|:.*||') - sed -i -e "${lnum}c#!/usr/bin/env python" $p + sed -i -e "${lnum}c#!/usr/bin/env python3" $p done #Make sure root build directory is not available after the root install is done From ef6bf5188297578816d2c79f6557bda9e7ed4e0a Mon Sep 17 00:00:00 2001 From: Andrea Bocci Date: Thu, 26 Jan 2023 13:38:15 +0100 Subject: [PATCH 12/31] Set the CXXFLAGS for the host compiler when using ROCm libraries --- scram-tools.file/tools/rocm/rocm.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scram-tools.file/tools/rocm/rocm.xml b/scram-tools.file/tools/rocm/rocm.xml index b13839e820d..c2e69f90805 100644 --- a/scram-tools.file/tools/rocm/rocm.xml +++ b/scram-tools.file/tools/rocm/rocm.xml @@ -13,6 +13,7 @@ + @@ -26,7 +27,6 @@ - From 88cac61f8d65de483f6f9c91c6e5ae1d104cf252 Mon Sep 17 00:00:00 2001 From: Andrea Bocci Date: Thu, 26 Jan 2023 23:13:44 +0100 Subject: [PATCH 13/31] Update ROCm flags --- scram-tools.file/tools/rocm/rocm.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scram-tools.file/tools/rocm/rocm.xml b/scram-tools.file/tools/rocm/rocm.xml index c2e69f90805..02e42ffc84a 100644 --- a/scram-tools.file/tools/rocm/rocm.xml +++ b/scram-tools.file/tools/rocm/rocm.xml @@ -14,7 +14,7 @@ - + From 0ec76ec330353ed40aa4ec368ad124ff9019bdc5 Mon Sep 17 00:00:00 2001 From: Andrea Bocci Date: Thu, 26 Jan 2023 23:56:25 +0100 Subject: [PATCH 14/31] Use CPPDEFINES instead of CXXFLAGS for preprocessor macros --- scram-tools.file/tools/rocm/rocm.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scram-tools.file/tools/rocm/rocm.xml b/scram-tools.file/tools/rocm/rocm.xml index 02e42ffc84a..92d6cf7dd4b 100644 --- a/scram-tools.file/tools/rocm/rocm.xml +++ b/scram-tools.file/tools/rocm/rocm.xml @@ -13,8 +13,8 @@ - - + + From c5e3b19687136179277333c397c8f0df4761a071 Mon Sep 17 00:00:00 2001 From: Malik Shahzad Muzaffar Date: Fri, 27 Jan 2023 15:31:15 +0100 Subject: [PATCH 15/31] [BuildRules] First implementation of RocM build rules --- scram-project-build.file | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scram-project-build.file b/scram-project-build.file index fa956acce9b..236d3842e22 100644 --- a/scram-project-build.file +++ b/scram-project-build.file @@ -54,7 +54,7 @@ BuildRequires: dwz %endif %if "%{?configtag:set}" != "set" -%define configtag V07-03-18 +%define configtag V07-04-00 %endif %if "%{?cvssrc:set}" != "set" From 5be4026d3bffff2dc3f6fbcb8bbdfeb0f0cd1f6a Mon Sep 17 00:00:00 2001 From: Malik Shahzad Muzaffar Date: Fri, 27 Jan 2023 23:15:26 +0100 Subject: [PATCH 16/31] Update scram-project-build.file --- scram-project-build.file | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scram-project-build.file b/scram-project-build.file index 236d3842e22..363e47dfa48 100644 --- a/scram-project-build.file +++ b/scram-project-build.file @@ -54,7 +54,7 @@ BuildRequires: dwz %endif %if "%{?configtag:set}" != "set" -%define configtag V07-04-00 +%define configtag V07-04-01 %endif %if "%{?cvssrc:set}" != "set" From 4242bb039bd06a3ca82816e9bd09417ba29a9d6d Mon Sep 17 00:00:00 2001 From: Malik Shahzad Muzaffar Date: Sat, 28 Jan 2023 10:42:08 +0100 Subject: [PATCH 17/31] use llvm compiler flags for for rocm --- scram-project-build.file | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scram-project-build.file b/scram-project-build.file index 363e47dfa48..0705cf62625 100644 --- a/scram-project-build.file +++ b/scram-project-build.file @@ -54,7 +54,7 @@ BuildRequires: dwz %endif %if "%{?configtag:set}" != "set" -%define configtag V07-04-01 +%define configtag V07-04-02 %endif %if "%{?cvssrc:set}" != "set" From 182825d3cefd9dfe68249eab5422f7bbb462aa15 Mon Sep 17 00:00:00 2001 From: Malik Shahzad Muzaffar Date: Sat, 28 Jan 2023 10:56:35 +0100 Subject: [PATCH 18/31] rocm rules use llvm flags so no need to duplicate these REM_CXXFLAGS --- scram-tools.file/tools/rocm/rocm.xml | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/scram-tools.file/tools/rocm/rocm.xml b/scram-tools.file/tools/rocm/rocm.xml index 92d6cf7dd4b..1ef1d7ca19b 100644 --- a/scram-tools.file/tools/rocm/rocm.xml +++ b/scram-tools.file/tools/rocm/rocm.xml @@ -15,18 +15,6 @@ - - - - - - - - - - - - From 6dbb4e18c3a82b36e8d55a38a8a79cb9e303d86f Mon Sep 17 00:00:00 2001 From: Malik Shahzad Muzaffar Date: Sat, 28 Jan 2023 11:04:46 +0100 Subject: [PATCH 19/31] hip/lib abd hsa/lib are already part of default lib --- scram-tools.file/tools/rocm/rocm.xml | 2 -- 1 file changed, 2 deletions(-) diff --git a/scram-tools.file/tools/rocm/rocm.xml b/scram-tools.file/tools/rocm/rocm.xml index 1ef1d7ca19b..91e9a5c7c02 100644 --- a/scram-tools.file/tools/rocm/rocm.xml +++ b/scram-tools.file/tools/rocm/rocm.xml @@ -7,8 +7,6 @@ - - From 41ddb8695f94afdb5b15ca1809db7b6c8aa36529 Mon Sep 17 00:00:00 2001 From: Malik Shahzad Muzaffar Date: Sat, 28 Jan 2023 22:47:20 +0100 Subject: [PATCH 20/31] hip/hsa includes are also available via main include path --- scram-tools.file/tools/rocm/rocm.xml | 2 -- 1 file changed, 2 deletions(-) diff --git a/scram-tools.file/tools/rocm/rocm.xml b/scram-tools.file/tools/rocm/rocm.xml index 91e9a5c7c02..f644db83482 100644 --- a/scram-tools.file/tools/rocm/rocm.xml +++ b/scram-tools.file/tools/rocm/rocm.xml @@ -8,8 +8,6 @@ - - From dca40716140bb49734323fb5a3a4893b22940c96 Mon Sep 17 00:00:00 2001 From: Malik Shahzad Muzaffar Date: Sun, 29 Jan 2023 15:49:12 +0100 Subject: [PATCH 21/31] [buildrules] disable USE_CMS_DEPRECATED only for cmssw 12 and below --- scram-project-build.file | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scram-project-build.file b/scram-project-build.file index 0705cf62625..32ef0f055b5 100644 --- a/scram-project-build.file +++ b/scram-project-build.file @@ -54,7 +54,7 @@ BuildRequires: dwz %endif %if "%{?configtag:set}" != "set" -%define configtag V07-04-02 +%define configtag V07-04-03 %endif %if "%{?cvssrc:set}" != "set" From a511b623db8224937dbf9d771929370e2ce4710e Mon Sep 17 00:00:00 2001 From: Malik Shahzad Muzaffar Date: Sun, 29 Jan 2023 21:36:18 +0100 Subject: [PATCH 22/31] [Buildrules] Treat ROCM_CXXFLAGS/LDFLAGS as valid compiler flags --- scram-project-build.file | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scram-project-build.file b/scram-project-build.file index 0705cf62625..78eddada0c3 100644 --- a/scram-project-build.file +++ b/scram-project-build.file @@ -54,7 +54,7 @@ BuildRequires: dwz %endif %if "%{?configtag:set}" != "set" -%define configtag V07-04-02 +%define configtag V07-04-04 %endif %if "%{?cvssrc:set}" != "set" From 640c8de4b0a1030da213df352f4cd1fe9de1bd8f Mon Sep 17 00:00:00 2001 From: Malik Shahzad Muzaffar Date: Mon, 30 Jan 2023 10:38:24 +0100 Subject: [PATCH 23/31] [SCRAM] Fix for iftool with !name --- SCRAMV1.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SCRAMV1.spec b/SCRAMV1.spec index 459649093dc..d7dd9d0d728 100644 --- a/SCRAMV1.spec +++ b/SCRAMV1.spec @@ -1,8 +1,8 @@ -### RPM lcg SCRAMV1 V3_00_55 +### RPM lcg SCRAMV1 V3_00_56 ## NOCOMPILER ## NO_VERSION_SUFFIX -%define tag c6ab80558c01d615133391bc725c0e2c7acfb6a9 +%define tag 7c2a9437c0bed43b91855985ae348b2312920ab7 %define branch SCRAMV3 %define github_user cms-sw Source: git+https://github.com/%{github_user}/SCRAM.git?obj=%{branch}/%{tag}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}-%{tag}.tgz From 646f4f0f70e4067a34dd6445e61d7ca8325bb395 Mon Sep 17 00:00:00 2001 From: Andrea Bocci Date: Mon, 30 Jan 2023 11:21:18 +0100 Subject: [PATCH 24/31] Update to ROCm 5.4.2 --- rocm.spec | 8 ++++---- scram-tools.file/tools/rocm/rocm.xml | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/rocm.spec b/rocm.spec index ec929bac94e..1fd6663019a 100644 --- a/rocm.spec +++ b/rocm.spec @@ -1,4 +1,4 @@ -### RPM external rocm 5.0.2 +### RPM external rocm 5.4.2 ## NOCOMPILER Source: none Provides: libamd_comgr.so.2()(64bit) @@ -30,7 +30,7 @@ rm -f %{i}/bin/{aompcc,gputable.txt,mygpu,mymcpu} rm -f %{i}/bin/migraphx-driver # ROCm/HIP core tools -DIRECTORIES="amdgcn hip hipcub hsa hsa-amd-aqlprofile include lib lib64 llvm rocthrust share" +DIRECTORIES="amdgcn hip hipcub hsa hsa-amd-aqlprofile include lib libexec llvm rocthrust share" # rocm-smi DIRECTORIES+=" oam rocm_smi" @@ -60,7 +60,7 @@ DIRECTORIES+=" rocprofiler roctracer" #DIRECTORIES+=" atmi" # OpenCL support -#DIRECTORIES+=" opencl" +#DIRECTORIES+=" opencl tests" # ROCm Communication Collectives Library (RCCL) #DIRECTORIES+=" rccl" @@ -69,7 +69,7 @@ DIRECTORIES+=" rocprofiler roctracer" #DIRECTORIES+=" rocalution" # Machine Intelligence Libraries -#DIRECTORIES+=" miopen miopengemm mivisionx" +#DIRECTORIES+=" miopen miopengemm" # HIP Fortran interface (hipfort) #DIRECTORIES+=" hipfort" diff --git a/scram-tools.file/tools/rocm/rocm.xml b/scram-tools.file/tools/rocm/rocm.xml index f644db83482..ba1c5a0c5ff 100644 --- a/scram-tools.file/tools/rocm/rocm.xml +++ b/scram-tools.file/tools/rocm/rocm.xml @@ -6,7 +6,6 @@ - From 79f45701506fb38d93822d3538e26e665ce1ee88 Mon Sep 17 00:00:00 2001 From: Andrea Bocci Date: Mon, 30 Jan 2023 11:56:59 +0100 Subject: [PATCH 25/31] Enable newer AMD GPUs Add support for - AMD Instinct MI50/MI60 (gfx906) - AMD Instinct MI100/MI210/MI250 (gfx908) --- scram-tools.file/tools/rocm/rocm.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scram-tools.file/tools/rocm/rocm.xml b/scram-tools.file/tools/rocm/rocm.xml index ba1c5a0c5ff..13fd2bfd0d0 100644 --- a/scram-tools.file/tools/rocm/rocm.xml +++ b/scram-tools.file/tools/rocm/rocm.xml @@ -9,7 +9,7 @@ - + From 2a7a9509bd686eae9d3a02b7fcca70d4a8340826 Mon Sep 17 00:00:00 2001 From: Malik Shahzad Muzaffar Date: Mon, 30 Jan 2023 12:02:11 +0100 Subject: [PATCH 26/31] [BuildRules] Use hipcc to link product which has hip.cc sources --- scram-project-build.file | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scram-project-build.file b/scram-project-build.file index 78eddada0c3..992e17c05d0 100644 --- a/scram-project-build.file +++ b/scram-project-build.file @@ -54,7 +54,7 @@ BuildRequires: dwz %endif %if "%{?configtag:set}" != "set" -%define configtag V07-04-04 +%define configtag V07-05-00 %endif %if "%{?cvssrc:set}" != "set" From 6cd190b835916cc38516581e2e118bf55aa0cfad Mon Sep 17 00:00:00 2001 From: Malik Shahzad Muzaffar Date: Mon, 30 Jan 2023 14:58:29 +0100 Subject: [PATCH 27/31] fix for cuda dlink libs --- scram-project-build.file | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scram-project-build.file b/scram-project-build.file index 992e17c05d0..d017b1d4255 100644 --- a/scram-project-build.file +++ b/scram-project-build.file @@ -54,7 +54,7 @@ BuildRequires: dwz %endif %if "%{?configtag:set}" != "set" -%define configtag V07-05-00 +%define configtag V07-05-01 %endif %if "%{?cvssrc:set}" != "set" From 786ab3790482f5592cf4305aaffb7196096963d3 Mon Sep 17 00:00:00 2001 From: Malik Shahzad Muzaffar Date: Mon, 30 Jan 2023 17:31:36 +0100 Subject: [PATCH 28/31] Update scram-project-build.file --- scram-project-build.file | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scram-project-build.file b/scram-project-build.file index d017b1d4255..d800de14307 100644 --- a/scram-project-build.file +++ b/scram-project-build.file @@ -54,7 +54,7 @@ BuildRequires: dwz %endif %if "%{?configtag:set}" != "set" -%define configtag V07-05-01 +%define configtag V07-05-02 %endif %if "%{?cvssrc:set}" != "set" From d4ec6e6d69bfe3097e5847cd5fd2521b4b48cff9 Mon Sep 17 00:00:00 2001 From: Andrea Bocci Date: Mon, 30 Jan 2023 21:25:33 +0100 Subject: [PATCH 29/31] Update file and directory selection for ROCm 5.4.x --- rocm.spec | 48 +++++++++++++++++++----------------------------- 1 file changed, 19 insertions(+), 29 deletions(-) diff --git a/rocm.spec b/rocm.spec index 1fd6663019a..b140347c21d 100644 --- a/rocm.spec +++ b/rocm.spec @@ -6,6 +6,11 @@ Provides: libhsa-runtime64.so.1()(64bit) Provides: librocm-core.so.1()(64bit) Provides: librocm_smi64.so.5()(64bit) +# This rpm packages only symlinks to an installation that is already on CVMFS. +# Configure pkgtools to keep the static libraries, to avoid actually trying to +# delete them from CVMFS. +%define keep_archives true + %prep %build @@ -17,42 +22,30 @@ if ! [ -d $OSDIR ]; then fi BASEDIR=${OSDIR}/amd/%{n}-%{realversion} -# symlink individual files from ${BASEDIR}/bin/ +# Symlink individual files from ${BASEDIR}/bin/ mkdir %{i}/bin test -d ${BASEDIR}/bin test -e ${BASEDIR}/bin/hipcc ln -s ${BASEDIR}/bin/* %{i}/bin/ -# remove the OpenCL extra files -rm -f %{i}/bin/clang-ocl -# remove the OpenMP extra files -rm -f %{i}/bin/{aompcc,gputable.txt,mygpu,mymcpu} -# remove the MIGraphX tools -rm -f %{i}/bin/migraphx-driver +# Remove the OpenCL extra files +rm -f %{i}/bin/{clang-ocl,clinfo} +# Remove the OpenMP extra files +rm -f %{i}/bin/{aompcc,mygpu,mymcpu} +# Remove the Fortran files +rm -f %{i}/bin/hipfc +# Remove the MI tools +rm -f %{i}/bin/{MIOpenDriver,migraphx-driver,runvx} +# Remove the datacenter tools and validation suite binaries +rm -f %{i}/bin/{rdcd,rdci,rvs} +# Remove some of the prebuilt samples +rm -f %{i}/bin/{sgemmv,simple_dlrm,simple_gemm} # ROCm/HIP core tools -DIRECTORIES="amdgcn hip hipcub hsa hsa-amd-aqlprofile include lib libexec llvm rocthrust share" +DIRECTORIES="amdgcn hip hsa hsa-amd-aqlprofile include lib libexec llvm share" # rocm-smi DIRECTORIES+=" oam rocm_smi" -# hipBLAS / rocBLAS -DIRECTORIES+=" hipblas rocblas" - -# hipSOLVER / rocSOLVER -DIRECTORIES+=" hipsolver rocsolver" - -# hipSPARSE / rocSPARSE -DIRECTORIES+=" hipsparse rocsparse" - -# hipFFT / rocFFT -DIRECTORIES+=" hipfft rocfft" - -# hipRAND / rocRAND -DIRECTORIES+=" hiprand rocrand" - -# ROCm Parallel Primitives (rocPRIM) -DIRECTORIES+=" rocprim" - # ROCm Tracer Callback/Activity Library (rocTRACER) and profiler library (ROC-profiler) DIRECTORIES+=" rocprofiler roctracer" @@ -65,9 +58,6 @@ DIRECTORIES+=" rocprofiler roctracer" # ROCm Communication Collectives Library (RCCL) #DIRECTORIES+=" rccl" -# iterative sparse solvers for ROCm platform (rocALUTION) -#DIRECTORIES+=" rocalution" - # Machine Intelligence Libraries #DIRECTORIES+=" miopen miopengemm" From 0be41762647df64db95e06d1e234eb7ea26e67ca Mon Sep 17 00:00:00 2001 From: Andrea Bocci Date: Mon, 30 Jan 2023 23:56:10 +0100 Subject: [PATCH 30/31] Update TBB to v2021.8.0 --- tbb.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tbb.spec b/tbb.spec index 0f71158ddc1..d0b23c2a6eb 100644 --- a/tbb.spec +++ b/tbb.spec @@ -1,4 +1,4 @@ -### RPM external tbb v2021.8.0-rc1 +### RPM external tbb v2021.8.0 %define tag %{realversion} %define branch onetbb_2021 From 6350c20963c7f9cb35105eb02496ebd6dd2a7f6c Mon Sep 17 00:00:00 2001 From: Malik Shahzad Muzaffar Date: Tue, 31 Jan 2023 08:44:45 +0100 Subject: [PATCH 31/31] [SCRAM] Fix iftool/elif filter --- SCRAMV1.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SCRAMV1.spec b/SCRAMV1.spec index d7dd9d0d728..cc89cb6d166 100644 --- a/SCRAMV1.spec +++ b/SCRAMV1.spec @@ -1,8 +1,8 @@ -### RPM lcg SCRAMV1 V3_00_56 +### RPM lcg SCRAMV1 V3_00_57 ## NOCOMPILER ## NO_VERSION_SUFFIX -%define tag 7c2a9437c0bed43b91855985ae348b2312920ab7 +%define tag 5397411835ff6703985694e972c1b4f4c63b691d %define branch SCRAMV3 %define github_user cms-sw Source: git+https://github.com/%{github_user}/SCRAM.git?obj=%{branch}/%{tag}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}-%{tag}.tgz