Changeset 14825 for utils/CI/sette/prepare_job.sh

Timestamp:

2021-05-10T16:42:39+02:00 (3 years ago)

Author:

acc

Message:

Update sette for ARCHER2 and remove support for the de-commissioned ARCHER platform. Also fixed reporting for tracer.stat files in sette_rpt.sh and added reporting of average cpu timings from timing.output (if available). Uses red/green highlighting for increases/decreases from the reference.

File:

• utils/CI/sette/prepare_job.sh (modified) (1 diff)

utils/CI/sette/prepare_job.sh

@@ -200 +200 @@
             ;;
          X86_ARCHER2*)
-                                OSPACE=2
-                                SSPACE=4
-                                NB_REM=$( echo $NB_PROC $OSPACE $NXIO_PROC $SSPACE | awk '{print ( $1 * $2 + $3 * $4 ) % 128}')
-                                echo "NB_REM= "$NB_REM
-               if [ ${NB_REM} == 0 ] ; then
-               # number of processes required is an integer multiple of 128
-               #
-               NB_NODES=$( echo $NB_PROC $OSPACE $NXIO_PROC $SSPACE | awk '{print ( $1 * $2 + $3 * $4 ) / 128}')
-            else
-               #
-               # number of processes required is not an integer multiple of 128
-               # round up the number of nodes required.
-               #
-               NB_NODES=$( echo $NB_PROC $OSPACE $NXIO_PROC $SSPACE | awk '{printf("%d",( $1 * $2 + $3 * $4 ) / 128 + 1 )}')
-                  fi
+                                MK_TEMPLATE=$( /work/n01/shared/acc/mkslurm_settejob -S $NXIO_PROC -s 8 -m 4 -C $NB_PROC -g 2 -a n01-CLASS -j sette_job -t 20:00 > ${SETTE_DIR}/job_batch_template )
             ;;
-                        XC_ARCHER_INTEL)
-                                # ocean cores are packed 24 to a node
-                                NB_REM=$( echo $NB_PROC | awk '{print ( $1 % 24 ) }')
-                                if [ ${NB_REM} == 0 ] ; then
-                                        # number of processes required is an integer multiple of 24
-                                        #
-                                        NB_NODES=$( echo $NB_PROC $NXIO_PROC | awk '{print ($1) / 24}')
-                                else
-                                        #
-                                        # number of processes required is not an integer multiple of 24
-                                        # round up the number of nodes required.
-                                        #
-                                        NB_NODES=$( echo $NB_PROC | awk '{printf("%d",($1) / 24 + 1 )}')
-                                fi
-                                # xios cores are sparsely packed at 4 to a node
-                                # but can not share nodes with the ocean cores
-                                NB_REM=$( echo $NXIO_PROC | awk '{print ( $2 % 4 ) }')
-                                if [ ${NB_REM} == 0 ] ; then
-                                        # number of processes required is an integer multiple of 4                           
-                                        #
-                                        NB_NODES=$( echo $NB_NODES $NXIO_PROC | awk '{print ($1 + ( $2 / 4 ))}')                    
-                                else
-                                        #
-                                        # number of processes required is not an integer multiple of 4                             
-                                        # round up the number of nodes required.
-                                        #
-                                        NB_NODES=$( echo $NB_NODES $NXIO_PROC | awk '{print ($1 + ( $2 / 4 ) + 1)}') 
-                                fi
-                                ;;
                         XC40_METO*) #Setup for Met Office XC40 with any compiler
                                 # ocean cores are packed 32 to a node