Changeset 1947

Timestamp:

10/05/20 11:58:58 (4 years ago)

Author:

yushan

Message:

trunk : modif for check job status

Location:

XIOS/trunk/xios_test_suite

Files:

• COMPILE/config_compile.py (modified) (2 diffs)
• TEST_SUITE/run_test (modified) (4 diffs)

XIOS/trunk/xios_test_suite/COMPILE/config_compile.py

@@ -26 +26 @@
         f.write("#MSUB -e client_error.err\n")
         f.write("#MSUB -eo\n")
-        f.write("#MSUB -c 48\n")
+        f.write("#MSUB -c 16\n")
         f.write("#MSUB -n 1\n")
         f.write("#MSUB -X\n")
@@ -50 +50 @@
         f.write("#=====================================\n")
         f.write("#SBATCH --ntasks=1\n")
-        f.write("#SBATCH --cpus-per-task=40\n")
+        f.write("#SBATCH --cpus-per-task=16\n")
         f.write("#SBATCH --hint=nomultithread\n")
         f.write("#SBATCH -t 00:30:00\n")

XIOS/trunk/xios_test_suite/TEST_SUITE/run_test

@@ -10 +10 @@
   rm -f compile.sh
   echo "#!/bin/bash" >> compile.sh 
-  echo "#SBATCH --ntasks=4 ">> compile.sh
+  echo "#SBATCH --ntasks=1 ">> compile.sh
+  echo "#SBATCH --cpus-per-task=16 ">> compile.sh
   echo "#SBATCH --hint=nomultithread ">> compile.sh
   echo "#SBATCH -t 00:30:00  " >> compile.sh
@@ -19 +20 @@
   echo "ulimit -c 0">> compile.sh
   echo "cd ../.. ">> compile.sh
-  echo "./make_xios --arch_path `pwd`/../ARCH --arch ${arch} --${mode} --build_dir ${build_dir} --job 4" >> compile.sh
-  sbatch --wait compile.sh
+  echo "./make_xios --arch_path `pwd`/../ARCH --arch ${arch} --${mode} --build_dir ${build_dir} --job 16" >> compile.sh
+  cmd=$(sbatch compile.sh)
+  jobid="${cmd//[!0-9]/}"
+  output=$(squeue -u rpsl954 | grep ${jobid})
+  while [ ! -z "$output" ]
+  do
+    echo "compiling job " $jobid "pending/running for about" ${i} seconds
+    sleep 30
+    ((i+=30))
+    output=$(squeue -u rpsl954 | grep ${jobid})
+  done
+
 fi
 
@@ -30 +41 @@
   echo "#MSUB -e compile.err" >> compile.sh
   echo "#MSUB -eo" >> compile.sh
-  echo "#MSUB -c 4" >> compile.sh
+  echo "#MSUB -c 16" >> compile.sh
   echo "#MSUB -n 1" >> compile.sh
   echo "#MSUB -X" >> compile.sh
@@ -40 +51 @@
   echo "#MSUB -m work,scratch" >> compile.sh
   echo "cd ../.. ">> compile.sh
-  echo "./make_xios --arch_path `pwd`/../ARCH --arch ${arch} --${mode} --build_dir ${build_dir} --job 4" >> compile.sh
-  ccc_msub -E "--wait" compile.sh
+  echo "./make_xios --arch_path `pwd`/../ARCH --arch ${arch} --${mode} --build_dir ${build_dir} --job 16" >> compile.sh
+  cmd=$(ccc_msub compile.sh)
+  output=$(ccc_mpp | grep ${jobid})
+  jobid="${cmd//[!0-9]/}"
+  while [ ! -z "$output" ]
+  do
+    echo "compiling job " $jobid "pending/running for about" ${i} seconds
+    sleep 30
+    ((i+=30))
+    output=$(ccc_mpp | grep ${jobid})
+  done
+
 fi
 
-export build_info=$(tail -n 50 compile.out)
-if [[ $build_info == *"Build command finished"* ]]; then
+build_info=$(sacct -j $jobid -o State)
+if [[ $build_info == *"COMPLETED"* ]]; then
   build_ok=true
 else