Merge branch 'IB/CMSSW_13_0_X/master' into smuzaffar-patch-1

SCRAMV1.spec

@@ -1,8 +1,8 @@
-### RPM lcg SCRAMV1 V3_00_55
+### RPM lcg SCRAMV1 V3_00_57
 ## NOCOMPILER
 ## NO_VERSION_SUFFIX
 
-%define tag c6ab80558c01d615133391bc725c0e2c7acfb6a9
+%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

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

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

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

rocm.spec

@@ -1,11 +1,16 @@
-### RPM external rocm 5.0.2
+### RPM external rocm 5.4.2
 ## NOCOMPILER
 Source: none
 Provides: libamd_comgr.so.2()(64bit)
 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,59 +22,44 @@ 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 lib64 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"
 
 # Asynchronous Task and Memory Interface (ATMI)
 #DIRECTORIES+=" atmi"
 
 # OpenCL support
-#DIRECTORIES+=" opencl"
+#DIRECTORIES+=" opencl tests"
 
 # ROCm Communication Collectives Library (RCCL)
 #DIRECTORIES+=" rccl"
 
-# iterative sparse solvers for ROCm platform (rocALUTION)
-#DIRECTORIES+=" rocalution"
-
 # Machine Intelligence Libraries
-#DIRECTORIES+=" miopen miopengemm mivisionx"
+#DIRECTORIES+=" miopen miopengemm"
 
 # HIP Fortran interface (hipfort)
 #DIRECTORIES+=" hipfort"

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

scram-project-build.file

@@ -54,7 +54,7 @@ BuildRequires: dwz
 %endif
 
 %if "%{?configtag:set}" != "set"
-%define configtag       V07-03-12
+%define configtag       V07-05-02
 %endif
 
 %if "%{?cvssrc:set}" != "set"

scram-tools.file/tools/rocm/rocm.xml

@@ -6,27 +6,10 @@
     <environment name="HIPCC"     default="$ROCM_BASE/bin/hipcc"/>
     <environment name="BINDIR"    default="$ROCM_BASE/bin"/>
     <environment name="LIBDIR"    default="$ROCM_BASE/lib"/>
-    <environment name="LIBDIR"    default="$ROCM_BASE/lib64"/>
-    <environment name="LIBDIR"    default="$ROCM_BASE/hip/lib"/>
-    <environment name="LIBDIR"    default="$ROCM_BASE/hsa/lib"/>
     <environment name="INCLUDE"   default="$ROCM_BASE/include"/>
-    <environment name="INCLUDE"   default="$ROCM_BASE/hip/include"/>
-    <environment name="INCLUDE"   default="$ROCM_BASE/hsa/include"/>
   </client>
-  <flags ROCM_FLAGS="-fno-gpu-rdc --amdgpu-target=gfx900 --target=@COMPILER_HOST@ --gcc-toolchain=$(COMPILER_PATH) -D__HIP_PLATFORM_HCC__ -D__HIP_PLATFORM_AMD__"/>
-  <!-- REM_CXXFLAGS from llvm/llvm-cxxcompiler.xml -->
-  <flags ROCM_HOST_REM_CXXFLAGS="-Wno-non-template-friend"/>
-  <flags ROCM_HOST_REM_CXXFLAGS="-Werror=format-contains-nul"/>
-  <flags ROCM_HOST_REM_CXXFLAGS="-Werror=maybe-uninitialized"/>
-  <flags ROCM_HOST_REM_CXXFLAGS="-Werror=unused-but-set-variable"/>
-  <flags ROCM_HOST_REM_CXXFLAGS="-Werror=return-local-addr"/>
-  <flags ROCM_HOST_REM_CXXFLAGS="-fipa-pta"/>
-  <flags ROCM_HOST_REM_CXXFLAGS="-frounding-math"/>
-  <flags ROCM_HOST_REM_CXXFLAGS="-mrecip"/>
-  <flags ROCM_HOST_REM_CXXFLAGS="-fno-crossjumping"/>
-  <flags ROCM_HOST_REM_CXXFLAGS="-fno-aggressive-loop-optimizations"/>
-  <flags ROCM_HOST_REM_CXXFLAGS="-funroll-all-loops"/>
-  <flags ROCM_HOST_CXXFLAGS="-D__HIP_PLATFORM_HCC__ -D__HIP_PLATFORM_AMD__"/>
+  <flags CPPDEFINES="__HIP_PLATFORM_HCC__ __HIP_PLATFORM_AMD__"/>
+  <flags ROCM_FLAGS="-fgpu-rdc --offload-arch=gfx900 --offload-arch=gfx906 --offload-arch=gfx908 --target=@COMPILER_HOST@ --gcc-toolchain=$(COMPILER_PATH)"/>
   <runtime name="ROOT_INCLUDE_PATH" value="$INCLUDE" type="path" join="1"/>
   <runtime name="PATH" value="$ROCM_BASE/bin" type="path"/>
 </tool>

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