Adding Gadi singularity test scripts

Author: julesghub

gadi_container_go.sh

@@ -0,0 +1,19 @@
+#!/bin/bash -l
+ 
+# load Singularity
+module load singularity
+module load openmpi/4.1.4
+ 
+
+export singularityDir=/g/data/m18/software/underworld/
+
+# Define the container to use
+export containerImage=$singularityDir/underworld-215.sif
+ 
+env
+cat timed_model.py
+echo ""
+echo "---------- Running Job ----------"
+echo ""
+export TIME_LAUNCH_MPI=`date +%s%N | cut -b1-13`
+mpiexec -n $PBS_NCPUS singularity exec $containerImage bash -c "TIME_LAUNCH_PYTHON=\`date +%s%N | cut -b1-13\` python3 timed_model.py"

params.sh

@@ -1,16 +1,16 @@
 #!/bin/bash
-#export JOBS="1 2"
+export JOBS="1 2 4 6 8"
 #export JOBS="1 2 4 6 8 10 12 14 16 18 20 22"
-export JOBS="22 22"
-export UW_NAME="2.14.2_WeakScaling"
+#export JOBS="22 22"
+export UW_NAME="2.15.0_WeakScaling"
 export SCALING_TYPE=1  # 1=weak, 2=strong
 
 export UW_MODEL="SolDB3d"  #  "SolDB3d" for dim3, though penalty method probably needed for q1.
 export PICKLENAME=None   #"SolDB3d_Gadi_1e-11.pickle" #"conv_test_results_high_res_tighter_take2.pickle"  # set to "None" to disable conv testing
 export UW_ENABLE_IO="0"
 
-export WALLTIME="00:25:00"
-export ACCOUNT="pawsey0407"
+export WALLTIME="00:10:00"
+export ACCOUNT="m18"
 export QUEUE="normal" # normal or express  
 
 export UW_ORDER=1

scaling_test_job_launcher.sh

@@ -43,10 +43,10 @@ do
    export NTASKS="$((${i}*${i}*${i}))"
    export EXPORTVARS="UW_RESOLUTION,NTASKS,UW_ENABLE_IO,UW_ORDER,UW_DIM,UW_SOL_TOLERANCE,UW_MAX_ITS,UW_PENALTY,UW_MODEL,PICKLENAME"
    if [ $BATCH_SYS == "PBS" ] ; then
-      # memory requirement guess: 3GB * nprocs
-      MEMORY="$((4*${NTASKS}))GB"
       PBSTASKS=`python3 <<<"print((int(${NTASKS}/48) + (${NTASKS} % 48 > 0))*48)"`  # round up to nearest 48 as required by nci
-      CMD="qsub -v ${EXPORTVARS} -N ${NAME} -l storage=gdata/m18,ncpus=${PBSTASKS},mem=${MEMORY},walltime=${WALLTIME},wd -P ${ACCOUNT} -q ${QUEUE} gadi_baremetal_go.sh"
+      # memory requirement guess: 3GB * nprocs
+      MEMORY="$((3*${PBSTASKS}))GB"
+      CMD="qsub -v ${EXPORTVARS} -N ${NAME} -l storage=gdata/m18+gdata/q97,ncpus=${PBSTASKS},mem=${MEMORY},walltime=${WALLTIME},wd -P ${ACCOUNT} -q ${QUEUE} gadi_container_go.sh"
       echo ${CMD}
       ${CMD}
    else