Gitlab CI: run less tests per default

ci_test_scripts/run_ci_tests.sh

@@ -164,47 +164,47 @@ then
       cat ./ELPA_CI_2gpu.err.*
     #fi
     
-  fi
-
-  #SSE, AVX, AVX2, and AVX-512 runners
-  if [[ "$CI_RUNNER_TAGS" =~ "sse" ]] || [[ "$CI_RUNNER_TAGS" =~ "avx" ]] || [[ "$CI_RUNNER_TAGS" =~ "avx2" ]]  || [ ["$CI_RUNNER_TAGS" =~ "avx512" ]]
-  then
-    cp $HOME/runners/job_script_templates/run_${CLUSTER}_1node.sh .
-    echo "./configure " "$configureArgs"  >> ./run_${CLUSTER}_1node.sh
-    echo " " >> ./run_${CLUSTER}_1node.sh
-    echo "make -j 16 " >> ./run_${CLUSTER}_1node.sh
-    echo " " >> ./run_${CLUSTER}_1node.sh
-    echo "export OMP_NUM_THREADS=$ompThreads" >> ./run_${CLUSTER}_1node.sh
-    echo "export TASKS=$mpiTasks" >> ./run_${CLUSTER}_1node.sh
-    echo "make check TEST_FLAGS=\" $matrixSize $nrEV $blockSize \"  " >> ./run_${CLUSTER}_1node.sh
-    echo " " >> ./run_${CLUSTER}_1node.sh
-    echo "#copy everything back from /tmp/elpa to runner directory"  >> ./run_${CLUSTER}_1node.sh
-    echo "cp -r * \$runner_path"  >> ./run_${CLUSTER}_1node.sh
+  else
 
+    #SSE, AVX, AVX2, and AVX-512 runners
+    if [[ "$CI_RUNNER_TAGS" =~ "sse" ]] || [[ "$CI_RUNNER_TAGS" =~ "avx" ]] || [[ "$CI_RUNNER_TAGS" =~ "avx2" ]]  || [ ["$CI_RUNNER_TAGS" =~ "avx512" ]]
+    then
+      cp $HOME/runners/job_script_templates/run_${CLUSTER}_1node.sh .
+      echo "./configure " "$configureArgs"  >> ./run_${CLUSTER}_1node.sh
+      echo " " >> ./run_${CLUSTER}_1node.sh
+      echo "make -j 16 " >> ./run_${CLUSTER}_1node.sh
+      echo " " >> ./run_${CLUSTER}_1node.sh
+      echo "export OMP_NUM_THREADS=$ompThreads" >> ./run_${CLUSTER}_1node.sh
+      echo "export TASKS=$mpiTasks" >> ./run_${CLUSTER}_1node.sh
+      echo "make check TEST_FLAGS=\" $matrixSize $nrEV $blockSize \"  " >> ./run_${CLUSTER}_1node.sh
+      echo " " >> ./run_${CLUSTER}_1node.sh
+      echo "#copy everything back from /tmp/elpa to runner directory"  >> ./run_${CLUSTER}_1node.sh
+      echo "cp -r * \$runner_path"  >> ./run_${CLUSTER}_1node.sh
+
+
+      echo " "
+      echo "Job script for the run"
+      cat ./run_${CLUSTER}_1node.sh
+      echo " "
+      echo "Submitting to SLURM"
+      if sbatch -W ./run_${CLUSTER}_1node.sh; then
+        exitCode=$?
+      else
+        exitCode=$?
+        echo "Submission excited with exitCode $exitCode"
+      fi
+
+      echo " "
+      echo "Exit Code of sbatch: $exitCode"
+      echo " "
+      cat ./ELPA_CI.out.*
+      #if [ $exitCode -ne 0 ]
+      #then
+        cat ./ELPA_CI.err.*
+      #fi
 
-    echo " "
-    echo "Job script for the run"
-    cat ./run_${CLUSTER}_1node.sh
-    echo " "
-    echo "Submitting to SLURM"
-    if sbatch -W ./run_${CLUSTER}_1node.sh; then
-      exitCode=$?
-    else
-      exitCode=$?
-      echo "Submission excited with exitCode $exitCode"
     fi
-
-    echo " "
-    echo "Exit Code of sbatch: $exitCode"
-    echo " "
-    cat ./ELPA_CI.out.*
-    #if [ $exitCode -ne 0 ]
-    #then
-      cat ./ELPA_CI.err.*
-    #fi
-
   fi
-
   #if [ $exitCode -ne 0 ]
   #then
   if [ -f ./test-suite.log ]

generate_automake_test_programs.py

@@ -196,9 +196,15 @@ for lang, m, g, q, t, p, d, s, lay, spl in product(sorted(language_flag.keys()),
         print("endif")
 
         if lay == "square" or t == "generalized":
-            print("check_SCRIPTS += " + name + "_default.sh")
+            if kernel == "all_kernels":
+                print("check_SCRIPTS += " + name + "_extended.sh")
+            else:
+                print("check_SCRIPTS += " + name + "_default.sh")
         elif lay == "all_layouts":
-            print("check_SCRIPTS += " + name + "_extended.sh")
+            if kernel == "all_kernels":
+                print("check_SCRIPTS += " + name + "_extended.sh")
+            else:
+                print("check_SCRIPTS += " + name + "_extended.sh")
         else:
             raise Exception("Unknown layout {0}".format(lay))