Fixes for M1 (#6542)

pzhristov · hristov · web-flow · commit d3c828791c3c · 2021-06-29T11:28:50.000+02:00
* Resolve conflicts with PR #6492 * Fixes for the space checker Co-authored-by: hristov <Peter.Hristov@cern.ch>
diff --git a/Utilities/Tools/jobutils.sh b/Utilities/Tools/jobutils.sh
@@ -187,12 +187,12 @@ taskwrapper() {
 
     grepcommand="grep -a -H ${pattern} $logfile ${JOBUTILS_JOB_SUPERVISEDFILES} >> encountered_exceptions_list 2>/dev/null"
     eval ${grepcommand}
-    
+
     grepcommand="grep -a -h --count ${pattern} $logfile ${JOBUTILS_JOB_SUPERVISEDFILES} 2>/dev/null"
     # using eval here since otherwise the pattern is translated to a
     # a weirdly quoted stringlist
     RC=$(eval ${grepcommand})
-    
+
     # if we see an exception we will bring down the DPL workflow
     # after having given it some chance to shut-down itself
     # basically --> send kill to all children
@@ -428,7 +428,11 @@ taskwrapper() {
 getNumberOfPhysicalCPUCores() {
   if [ "$(uname)" == "Darwin" ]; then
     CORESPERSOCKET=`system_profiler SPHardwareDataType | grep "Total Number of Cores:" | awk '{print $5}'`
-    SOCKETS=`system_profiler SPHardwareDataType | grep "Number of Processors:" | awk '{print $4}'`
+    if [ "$(uname -m)" == "arm64" ]; then
+  SOCKETS=1
+    else
+  SOCKETS=`system_profiler SPHardwareDataType | grep "Number of Processors:" | awk '{print $4}'`
+    fi
   else
     # Do something under GNU/Linux platform
     CORESPERSOCKET=`lscpu | grep "Core(s) per socket" | awk '{print $4}'`
diff --git a/prodtests/full_system_test.sh b/prodtests/full_system_test.sh
@@ -74,7 +74,7 @@ ulimit -n 4096 # Make sure we can open sufficiently many files
 mkdir -p qed
 cd qed
 PbPbXSec="8."
-taskwrapper qedsim.log o2-sim --seed $O2SIMSEED -j $NJOBS -n$NEventsQED -m PIPE ITS MFT FT0 FV0 FDD -g extgen -e ${FST_MC_ENGINE} --configKeyValues '"GeneratorExternal.fileName=$O2_ROOT/share/Generators/external/QEDLoader.C;QEDGenParam.yMin=-7;QEDGenParam.yMax=7;QEDGenParam.ptMin=0.001;QEDGenParam.ptMax=1.;Diamond.width[2]=6."'
+taskwrapper qedsim.log o2-sim --seed $O2SIMSEED -j $NJOBS -n $NEventsQED -m PIPE ITS MFT FT0 FV0 FDD -g extgen -e ${FST_MC_ENGINE} --configKeyValues '"GeneratorExternal.fileName=$O2_ROOT/share/Generators/external/QEDLoader.C;QEDGenParam.yMin=-7;QEDGenParam.yMax=7;QEDGenParam.ptMin=0.001;QEDGenParam.ptMax=1.;Diamond.width[2]=6."'
 QED2HAD=$(awk "BEGIN {printf \"%.2f\",`grep xSectionQED qedgenparam.ini | cut -d'=' -f 2`/$PbPbXSec}")
 echo "Obtained ratio of QED to hadronic x-sections = $QED2HAD" >> qedsim.log
 cd ..
