Merge branch '2.7-changes' into '2.7'

2.7 changes See merge request !669
bsc-wdc · Aug 31, 2020 · b2e235f · b2e235f
2 parents 53d0e01 + 112b913
commit b2e235f
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 16 deletions.
diff --git a/builders/scs/salomon/buildSalomon_aux b/builders/scs/salomon/buildSalomon_aux
@@ -26,7 +26,7 @@
 
   # SET SCRIPT VARIABLES
   targetDir=$1
-  scriptDir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+  SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
   #Old Configuration
   # DEFINE MODULES
   #modules="GCCcore/6.3.0 libxml2/2.9.9 binutils/2.27-GCCcore-6.3.0 icc/2017.7.259-GCC-6.3.0-2.27 ifort/2017.7.259-GCC-6.3.0-2.27 iccifort/2017.7.259-GCC-6.3.0-2.27 impi/2017.4.239-iccifort-2017.7.259-GCC-6.3.0-2.27 iimpi/2017c imkl/2017.4.239-iimpi-2017c intel/2017c bzip2/1.0.6 zlib/1.2.11 Boost/1.68.0-intel-2017c-serial Java/1.8.0_144"

diff --git a/compss/programming_model/bindings/python/src/exaqute/ExaquteTaskLocal.py b/compss/programming_model/bindings/python/src/exaqute/ExaquteTaskLocal.py
@@ -14,7 +14,7 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 #
-from ExaquteTask import *
+from exaqute.ExaquteTask import *
 
 
 class ExaquteTask(object):

diff --git a/compss/runtime/scripts/queues/queue_systems/tcs.cfg b/compss/runtime/scripts/queues/queue_systems/tcs.cfg
@@ -2,7 +2,7 @@
 ## SUBMISSION VARIABLES
 ################################
 QUEUE_CMD="PJM"
-SUBMISSION_CMD="pjsub"
+SUBMISSION_CMD="pjsub -X"
 #SUBMISSION_PIPE=" "
 SUBMISSION_HET_SEPARATOR=' : '
 SUBMISSION_HET_PIPE=" "
@@ -20,10 +20,11 @@ QARG_JOB_NAME="--name="
 
 QARG_JOB_OUT="-o "     # OK
 QARG_JOB_ERROR="-e "   # OK
-#QARG_WD="--workdir="
+QARG_WD=""
 QARG_WALLCLOCK="-L elapse="  # OK 
 
-QARG_NUM_NODES="-L node="  # OK
+#QARG_NUM_NODES="-L node="  # OK
+QARG_NUM_NODES="-L proc-core=unlimited,node="  # OK
 QARG_NUM_PROCESSES="--mpi proc="
 QNUM_PROCESSES_VALUE="\$(expr \${num_nodes} \* \${req_cpus_per_node})"
 #QARG_EXCLUSIVE_NODES="--exclusive"
@@ -48,7 +49,7 @@ QJOB_ID="%j"
 LAUNCH_CMD="pjrsh"  # OK
 LAUNCH_PARAMS="" # this parameters were for srun. Are they the same for pjrsh?  
 LAUNCH_SEPARATOR=""
-CMD_SEPARATOR=""
+CMD_SEPARATOR="'"
 HOSTLIST_CMD="pjshowip"
 HOSTLIST_TREATMENT="| awk '!a[\$0]++' | tr \"\n\" \" \""
 

diff --git a/compss/runtime/scripts/queues/supercomputers/fujitsu.cfg b/compss/runtime/scripts/queues/supercomputers/fujitsu.cfg
@@ -10,23 +10,23 @@ DEFAULT_EXEC_TIME=10
 DEFAULT_NUM_NODES=1
 DEFAULT_NUM_SWITCHES=0
 MAX_NODES_SWITCH=18
+DEFAULT_FPGAS_PER_NODE=0
 MIN_NODES_REQ_SWITCH=4
 DEFAULT_QUEUE=all
 DEFAULT_MAX_TASKS_PER_NODE=-1
 DEFAULT_CPUS_PER_NODE=48
 DEFAULT_IO_EXECUTORS=0
 DEFAULT_GPUS_PER_NODE=0
-DEFAULT_FPGAS_PER_NODE=0
 DEFAULT_WORKER_IN_MASTER_CPUS=24
-DEFAULT_WORKER_IN_MASTER_MEMORY=disabled
-DEFAULT_MASTER_WORKING_DIR=.
-DEFAULT_WORKER_WORKING_DIR=.
+DEFAULT_WORKER_IN_MASTER_MEMORY=16
+DEFAULT_MASTER_WORKING_DIR=$PWD
+DEFAULT_WORKER_WORKING_DIR=$PWD
 DEFAULT_NETWORK=ethernet
 DEFAULT_DEPENDENCY_JOB=None
 DEFAULT_RESERVATION=disabled
 DEFAULT_NODE_MEMORY=disabled
-DEFAULT_JVM_MASTER=""
-DEFAULT_JVM_WORKERS="-Xms24800m,-Xmx24800m,-Xmn1600m"
+DEFAULT_JVM_MASTER="-Xms2480m,-Xmx24800m,-Xmn1600m"
+DEFAULT_JVM_WORKERS="-Xms2480m,-Xmx24800m,-Xmn1600m"
 DEFAULT_JVM_WORKER_IN_MASTER=""
 
 ################################
@@ -51,12 +51,13 @@ HETEROGENEOUS_MULTIJOB=false
 ################################
 ## LAUNCH VARIABLES
 ################################
-SCRATCH_DIR="."
+SCRATCH_DIR="/tmp"
+#SCRATCH_DIR=$PWD
 REMOTE_EXECUTOR="none"
 NETWORK_INFINIBAND_SUFFIX="-tofu1"
 NETWORK_DATA_SUFFIX=""
-GPFS_PREFIX="/work_TMP/"
+GPFS_PREFIX=""
 GPFS2_PREFIX=""
 DEFAULT_NODE_MEMORY_SIZE=28
-DEFAULT_NODE_STORAGE_BANDWIDTH=""
-MASTER_NAME_CMD="hostname -I"
+DEFAULT_NODE_STORAGE_BANDWITH=""
+MASTER_NAME_CMD="hostname -i | awk '{print \$4}'"