Changeset 520 for configs/testing/bash/X64_CURIE.sh

Timestamp:

01/15/17 01:03:04 (7 years ago)

Author:

dubos

Message:

Update to testing

File:

• configs/testing/bash/X64_CURIE.sh (modified) (8 diffs)

configs/testing/bash/X64_CURIE.sh

@@ -5 +5 @@
 # create_runs.sh and submit.sh
 
-# NB : we must the queue 'normal' because there seems to be a limit
+# NB : we must use the queue 'normal' because there seems to be a limit
 # on the number of jobs that can be submitted to queue 'test'
 
@@ -18 +18 @@
 function split_mpi_80() {
     setvar nbp 81 nsplit_i 4 nsplit_j 2
+}
+function split_mpi_omp_40() {
+    setvar nbp 41 nsplit_i 2 nsplit_j 2 omp_level_size 4
 }
 
@@ -33 +36 @@
 #------------------------------ job_XXX -----------------------------
 
+# Serial jobs
 function job_serial() { # EXP_NAME
-    job_X64_CURIE $1 1 "" 
+    job_X64_CURIE $1 1 1 "./gcm.exe"
 }
 function job_serial_40() { # EXP_NAME
@@ -40 +44 @@
 }
 
+# MPI jobs
 function job_mpi() { #EXP_NAME NB_MPI
-    job_X64_CURIE $1 $2 ccc_mprun
+    job_X64_CURIE $1 $2 1 "ccc_mprun ./gcm.exe"
 }
 function job_mpi_40() { # EXP_NAME
@@ -50 +55 @@
 }
 
-function job_X64_CURIE() { # EXP_NAME MPI_TASKS MPIRUN
+# MPI-OMP jobs
+function job_mpi_omp() { #EXP_NAME NB_MPI NB_OMP
+    job_X64_CURIE $1 $2 $3 "ccc_mprun ./gcm.exe"
+}
+function job_mpi_omp_40() { # EXP_NAME
+    job_mpi_omp $1 40 4
+}
+
+# Generic
+function job_X64_CURIE() { # EXP_NAME MPI_TASKS OMP_TASKS MPIRUN
     cat <<EOF
 #!/bin/bash
@@ -60 +74 @@
 ## Number of tasks (=MPI processes) to use
 #MSUB -n $2
+## Number of OpenMP threads
+#MSUB -c $3
 ## Elapsed time limit in seconds
 #MSUB -T 600
@@ -65 +81 @@
 #MSUB -Q normal
 
-export OMP_NUM_THREADS=1
+export OMP_NUM_THREADS=$3
 cd \${BRIDGE_MSUB_PWD} 
 
@@ -73 +89 @@
 date > gcm.log
 ulimit -s unlimited
-$3 ./gcm.exe >> gcm.log
+$4 ./gcm.exe >> gcm.log
 date >> gcm.log