Skip to content

Fixes for M1 #6542

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

Merged
pzhristov merged 2 commits into from
Jun 29, 2021
Merged

Fixes for M1 #6542

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
3870ad3
Resolve conflicts with PR #6492
Jun 29, 2021
b6d847f
Fixes for the space checker
Jun 29, 2021
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
10 changes: 7 additions & 3 deletions Utilities/Tools/jobutils.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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}'`
Expand Down
2 changes: 1 addition & 1 deletion prodtests/full_system_test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ..
Expand Down