real/complex simplification of test_check_correctness

.gitlab-ci.yml

@@ -41,6 +41,20 @@ intel-double-precision-mpi-noomp-jobs:
     - make check TASKS=2 TEST_FLAGS='150 50 16' || { cat test-suite.log; exit 1; }
     - grep -i "Expected %stop" test-suite.log && exit 1 || true ;
 
+# intel double precision nompi noomp AVX/SSE
+intel-double-precision-nompi-noomp-jobs:
+  only:
+    - /.*master.*/
+  tags:
+    - avx
+  script:
+    - ./autogen.sh
+    - ./configure FC=ifort --enable-option-checking=fatal CFLAGS="-O3 -mavx" FCFLAGS="-O3 -axAVX" SCALAPACK_LDFLAGS="$MKL_INTEL_SCALAPACK_LDFLAGS_NO_MPI_NO_OMP" SCALAPACK_FCFLAGS="$SCALAPACK_FCFLAGS_NO_MPI_NO_OMP" --disable-avx2 --with-mpi=no || { cat config.log; exit 1; }
+    - make -j 8
+    - export LD_LIBRARY_PATH=$MKL_HOME/lib/intel64:$LD_LIBRARY_PATH
+    - make check TEST_FLAGS='150 50 16' || { cat test-suite.log; exit 1; }
+    - grep -i "Expected %stop" test-suite.log && exit 1 || true ;
+
 # intel double precision mpi noomp AVX/SSE large
 intel-double-precision-mpi-noomp-large-jobs:
   only:
@@ -95,6 +109,20 @@ gfortran-single-precision-mpi-noomp-jobs:
     - make check TASKS=2 TEST_FLAGS='150 50 16' || { cat test-suite.log; exit 1; }
     - grep -i "Expected %stop" test-suite.log && exit 1 || true ;
 
+# gfortran single precision nompi noomp AVX/SSE
+gfortran-single-precision-mpi-noomp-jobs:
+  only:
+    - /.*master.*/
+  tags:
+    - avx
+  script:
+    - ./autogen.sh
+    - ./configure --enable-option-checking=fatal CFLAGS="-O3 -mavx" FCFLAGS="-O3 -mavx" SCALAPACK_LDFLAGS="$MKL_GFORTRAN_SCALAPACK_LDFLAGS_NO_MPI_NO_OMP" SCALAPACK_FCFLAGS="$MKL_GFORTRAN_SCALAPACK_FCFLAGS_NO_MPI_NO_OMP" --disable-avx2 FC=gfortran --enable-single-precision --with-mpi=no || { cat config.log; exit 1; }
+    - make -j 8
+    - export LD_LIBRARY_PATH=$MKL_HOME/lib/intel64:$LD_LIBRARY_PATH
+    - make check TASKS=2 TEST_FLAGS='150 50 16' || { cat test-suite.log; exit 1; }
+    - grep -i "Expected %stop" test-suite.log && exit 1 || true ;
+
 # gfortran single precision mpi noomp AVX/SSE no legacy
 gfortran-single-precision-mpi-noomp-no-legacy-jobs:
   tags:

test/shared/test_check_correctness_template.F90

@@ -50,41 +50,19 @@
 #include "../../src/general/precision_kinds.F90"
       integer(kind=ik)                 :: status
       integer(kind=ik), intent(in)     :: na, nev, nblk, myid, np_rows, np_cols, my_prow, my_pcol
-#if REALCASE == 1
-      real(kind=rck), intent(in)     :: as(:,:), z(:,:)
-      real(kind=rck)                 :: ev(:)
-      real(kind=rck), dimension(size(as,dim=1),size(as,dim=2)) :: tmp1, tmp2
-      real(kind=rck)                :: xc
+      MATH_DATATYPE(kind=rck), intent(in)     :: as(:,:), z(:,:)
+      real(kind=rk)                 :: ev(:)
+      MATH_DATATYPE(kind=rck), dimension(size(as,dim=1),size(as,dim=2)) :: tmp1, tmp2
+      MATH_DATATYPE(kind=rck)                :: xc
 
 #ifndef WITH_MPI
-
-#ifdef DOUBLE_PRECISION_REAL
-      real(kind=rck)                 :: dnrm2
-#else
-      real(kind=rck)                 :: snrm2
-#endif
-
+#if REALCASE == 1
+      real(kind=rck)                   :: dnrm2, snrm2
 #endif
-#endif /* REALCASE */
-
 #if COMPLEXCASE == 1
-      complex(kind=rck), intent(in)    :: as(:,:), z(:,:)
-      real(kind=rck)                   :: ev(:)
-      complex(kind=rck), dimension(size(as,dim=1),size(as,dim=2)) :: tmp1, tmp2
-      complex(kind=rck)                :: xc
-#ifdef DOUBLE_PRECISION_COMPLEX
-#ifndef WITH_MPI
-      complex(kind=rck)                :: zdotc, cdotc
-#endif
-
-#else /* DOUBLE_PRECISION_COMPLEX */
-#ifndef WITH_MPI
       complex(kind=rck)                :: zdotc, cdotc
-#endif
-
-#endif /* DOUBLE_PRECISION_COMPLEX */
-
 #endif /* COMPLEXCASE */
+#endif
 
       integer(kind=ik)                 :: sc_desc(:)