Changeset 2579

Timestamp:

Oct 25, 2017 4:45:27 PM (7 years ago)

Author:

knoop

Message:

palmtest now testing for multiple cpu-setups

File:

• palm/trunk/SCRIPTS/palmtest (modified) (8 diffs)

palm/trunk/SCRIPTS/palmtest

@@ -58 +58 @@
 }
 
+get_core_array() {
+   for i in 1 2 4 8 16 32; do
+      if [[ $i -le ${1} ]]; then
+         printf "$i "
+      fi
+   done
+}
 
 configure() {
@@ -93 +100 @@
 palm_installer_test() {
    hrule
-   printf "Testing with \"${1}\"... "
-   local input_dir=${tester_prefix}/JOBS/${1}/INPUT
-   local monitoring_dir=${tester_prefix}/JOBS/${1}/MONITORING
-   local test_dir=${trunk_dir}/INSTALL
-   if [[ ! -f ${test_dir}/${1}_p3d ]] || [[ ! -f ${test_dir}/${1}_rc ]]; then
+   local name=${1}
+   local cores=${2}
+   printf "Testing with \"${name}\" on ${cores} core(s)... "
+   local job_id=${name}_${cores}
+   local input_dir=${tester_prefix}/JOBS/${job_id}/INPUT
+   local monitoring_dir=${tester_prefix}/JOBS/${job_id}/MONITORING
+   if [[ ! -f ${test_dir}/${name}_p3d ]] || [[ ! -f ${test_dir}/${name}_rc ]]; then
       printf " test not found\n"
       return 1
@@ -104 +113 @@
    mkdir -p ${input_dir}
    mkdir -p ${monitoring_dir}
-   cp ${test_dir}/${1}_p3d ${input_dir}/${1}_p3d
-   cp ${test_dir}/${1}_rc ${monitoring_dir}/${1}_rc_reference
-   [[ -f ${test_dir}/${1}_topo ]] && cp ${test_dir}/${1}_topo ${input_dir}/
-   bash ${trunk_dir}/SCRIPTS/palmrun -d ${1} -a "d3#" -h "${configuration}" -X "$cores" -T "$cores" -v -B > ${monitoring_dir}/${1}_stdout 2>&1
-   grep -A 99999 "Run-control output" ${monitoring_dir}/${1}_rc 1> ${monitoring_dir}/RC 2> /dev/null
-   grep -A 99999 "Run-control output" ${monitoring_dir}/${1}_rc_reference 1> ${monitoring_dir}/RC_REF 2> /dev/null
+   cp ${test_dir}/${name}_p3d ${input_dir}/${job_id}_p3d
+   cp ${test_dir}/${name}_rc ${monitoring_dir}/${job_id}_rc_reference
+   [[ -f ${test_dir}/${name}_topo ]] && cp ${test_dir}/${name}_topo ${input_dir}/${job_id}_topo
+   bash ${trunk_dir}/SCRIPTS/palmrun -d ${job_id} -a "d3#" -h "${configuration}" -X "$cores" -T "$cores" -v -B > ${monitoring_dir}/${job_id}_stdout 2>&1
+   grep -A 99999 "Run-control output" ${monitoring_dir}/${job_id}_rc 1> ${monitoring_dir}/RC 2> /dev/null
+   grep -A 99999 "Run-control output" ${monitoring_dir}/${job_id}_rc_reference 1> ${monitoring_dir}/RC_REF 2> /dev/null
    diff_output=$(diff ${monitoring_dir}/RC_REF ${monitoring_dir}/RC)
    rm ${monitoring_dir}/RC ${monitoring_dir}/RC_REF
@@ -124 +133 @@
 palm_installer_test_suite() {
    for test_path in ${fnames}; do
-      testname_p3d=$(basename $test_path)
-      palm_installer_test "${testname_p3d%_p3d}"
+      for n_core in $(get_core_array $max_cores); do
+         testname_p3d=$(basename $test_path)
+         palm_installer_test "${testname_p3d%_p3d}" "${n_core}"
+      done
    done
    hrule
@@ -143 +154 @@
 existing_trunk_dir=$(readlink -f "${SCRIPT_LOCATION}/../")
 
-cores=$(get_number_of_cpu_cores)
+max_cores=$(get_number_of_cpu_cores)
 test_id=$(date +%Y-%m-%d_%H%M%S)
 do_plots=1
@@ -156 +167 @@
       (N)   test_id="$OPTARG";;
       (p)   do_plots=0;;
-      (X)   cores=$OPTARG;;
+      (X)   max_cores=$OPTARG;;
       (\?)  printf "\n  +++ unknown option $OPTARG \n";
             exit;;
@@ -163 +174 @@
 tester_prefix=${existing_working_dir}/tests/${test_id}
 trunk_dir=${tester_prefix}/trunk
+test_dir=${trunk_dir}/INSTALL
 
 mkdir -p ${tester_prefix}
@@ -169 +181 @@
 ln -s ${existing_trunk_dir}
 
+
+
 configure
 build