Merge c965703 into sapling-pr-archive-ktf

Author: ktf

Utilities/Tools/jobutils2.sh

@@ -395,8 +395,11 @@ getNumberOfPhysicalCPUCores() {
     fi
   else
     # Do something under GNU/Linux platform
-    CORESPERSOCKET=`lscpu | grep "Core(s) per socket" | awk '{print $4}'`
-    SOCKETS=`lscpu | grep "Socket(s)" | awk '{print $2}'`
+    #
+    # Notice the human readable output of lscpu depends on the version and wether or not you
+    # are inside a container. The following should be more stable.
+    CORESPERSOCKET=$(lscpu -p=cpu,socket | grep ,0 | sort | uniq | wc -l)
+    SOCKETS=$(lscpu -p=socket | grep -e "^[0-9]" | sort | uniq | wc -l)
   fi
   N=$((${CORESPERSOCKET}*${SOCKETS}))
   echo "${N}"