Changeset 1816 for XIOS

Timestamp:

12/20/19 10:25:34 (4 years ago)

Author:

ymipsl

Message:

XIOS test suite : adapt script for jean-zay
YM

Location:

XIOS/trunk/xios_test_suite/COMPILE

Files:

• compile_irene (modified) (1 diff)
• compile_jeanzay (added)
• config_compile.py (modified) (1 diff)
• job_compile_irene.sh (modified) (1 diff)
• job_compile_jeanzay.sh (modified) (2 diffs)

XIOS/trunk/xios_test_suite/COMPILE/compile_irene

@@ -1 +1 @@
 #!/bin/bash
-ccc_msub job_compile_irene.sh
+
+set -x 
+
+export revision=$(svn info --show-item revision .. 2>&1)
+
+python config_compile.py
+
+ccc_msub -E "--wait" job_compile_irene.sh
+
+build_dir=${xios_test_suite_repository}/BUILD
+mkdir -p $build_dir ; CHMOD $build_dir
+mkdir -p ${build_dir}/build_${xios_machine_name}
+
+cp build_*.txt ${build_dir}/build_${xios_machine_name}
+CHMOD -R ${build_dir}/build_${xios_machine_name}
+
+bash -c "python ./generate_compile.py"
+
+copy_to_thredds compile_${xios_machine_name}_info.js

XIOS/trunk/xios_test_suite/COMPILE/config_compile.py

@@ -67 +67 @@
             
             f.write("add_test( NAME "+build_dir_name+'\n')
-            f.write("          COMMAND bash -c \"source ../ARCH/arch-"+configs_arg[0][i]+".env && module load cmake && cd ../.. && ./make_xios --arch_dir xios_test_suite/ARCH --arch "+configs_arg[0][i]+" --"+configs_arg[1][j]+" --job 16 --build_dir xios_test_suite/BUILD/build_"+build_dir_name+" | tail -n 1 >> xios_test_suite/COMPILE/build_"+revision+"_"+machine+"_"+build_dir_name+".txt\")\n\n")
+            f.write("          COMMAND bash -c \"source ../ARCH/arch-"+configs_arg[0][i]+".env  && cd ../.. && ./make_xios --arch_path `pwd`/xios_test_suite/ARCH --arch "+configs_arg[0][i]+" --"+configs_arg[1][j]+" --job 16 --build_dir xios_test_suite/BUILD/build_"+build_dir_name+" | tail -n 1 >> xios_test_suite/COMPILE/build_"+revision+"_"+machine+"_"+build_dir_name+".txt\")\n\n")
             f.write("set_tests_properties( "+build_dir_name+" PROPERTIES\n")
             f.write("                      FAIL_REGULAR_EXPRESSION \"failed\")\n\n")

XIOS/trunk/xios_test_suite/COMPILE/job_compile_irene.sh

@@ -21 +21 @@
 cd $BRIDGE_MSUB_PWD
 
-set -x 
-
-export revision=$(svn info --show-item revision .. 2>&1)
-
-python config_compile.py
-
 cmake .
 ctest -V
 
-build_dir=${xios_test_suite_repository}/BUILD
-mkdir -p $build_dir
-chmod --quiet ug+rwX $build_dir
-mkdir -p ${build_dir}/build_${xios_machine_name}
-
-cp build_*.txt ${build_dir}/build_${xios_machine_name}
-chmod -R ug+rwX ${build_dir}/build_${xios_machine_name}
-
-bash -c "python ./generate_compile.py"
-
-copy_to_thredds compile_${xios_machine_name}_info.js
-
 exit

XIOS/trunk/xios_test_suite/COMPILE/job_compile_jeanzay.sh

@@ -7 +7 @@
 #SBATCH -o output.out     # Nom du fichier de sortie
 #SBATCH -e error.err     # Nom du fichier d'erreur
-#SBATCH --account=psl@cpu
+##SBATCH --account=psl@cpu
+#SBATCH -A psl@cpu
 
 #----------------- Compile job for Jean-Zay --------------
@@ -14 +15 @@
 cd ${SLURM_SUBMIT_DIR}
 
-module load cmake
-
-ulimit -c 0
-
-export machine=jeanzay
-export revision=$(svn info --show-item revision .. 2>&1)
-
-python config_compile.py
-
 cmake .
 ctest -V
 
-mkdir -p ../html
-mkdir -p ../html/build_${machine}
-
-mv build_*.txt ../html/build_${machine}/
-
-bash -c "cd ../html && python generate_compile.py"
-
-
+exit