Index: benchmarks/report2html =================================================================== --- benchmarks/report2html (.../trunk) (revision 12000) +++ benchmarks/report2html (.../branches/tech_clustr) (revision 12000) @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/sw/easybuild_milan/software/Python/2.7.18-GCCcore-11.3.0-bare/bin/python """Small script to convert a report in the form of an XML file, as generated in the post processing step of a benchmark, into HTML. Index: benchmarks/benchmarks =================================================================== --- benchmarks/benchmarks (.../trunk) (revision 12000) +++ benchmarks/benchmarks (.../branches/tech_clustr) (revision 12000) @@ -248,7 +249,7 @@ if has_pbs ; then # Submit as a PBS job - qsub -l walltime=$pp_walltime $dependency < /dev/null + qsub -l walltime=$pp_walltime $dependency < /dev/null #!/bin/sh #PBS -N bm_${test_name}_pp cd $workspace @@ -256,11 +257,14 @@ EOF else # Submit as a SLURM job - sbatch -n 1 --time=$pp_walltime $dependency < /dev/null + sbatch -n 1 --time=$pp_walltime $dependency < /dev/null #!/bin/sh #SBATCH -J pp_${test_name} #SBATCH --mail-type=FAIL #SBATCH -o "slurm-%j.log" +$SBATCH_COMPUTEACCOUNT +module purge >/dev/null +module load foss/2022a Ghostscript/9.56.1 Python/2.7.18 $(cat $common_script) EOF fi Index: parallel_version/aurora.tmpl =================================================================== --- parallel_version/aurora.tmpl (.../trunk) (revision 12000) +++ parallel_version/aurora.tmpl (.../branches/tech_clustr) (revision 12000) @@ -145,6 +158,9 @@ #SBATCH --time=$WALLTIME #SBATCH --exclusive #SBATCH -o "slurm-%j.log" +$SBATCH_COMPUTEACCOUNT +module purge >/dev/null +module load foss/2022a netCDF/4.9.0 set -e if ! type -P mpirun &> /dev/null; then