Adapt api test programs for AVX512 kernels

test/Fortran/test_complex2_api.F90

@@ -373,6 +373,14 @@ program test_complex2_choose_kernel_with_api_double_precision
 #endif
 #endif
 
+#ifdef  WITH_COMPLEX_AVX512_BLOCK2_KERNEL
+                                 COMPLEX_ELPA_KERNEL_AVX512_BLOCK2)
+#else
+#ifdef  WITH_COMPLEX_AVX512_BLOCK1_KERNEL
+                                 COMPLEX_ELPA_KERNEL_AVX512_BLOCK1)
+#endif
+#endif
+
 #ifdef  WITH_GPU_VERSION
                                  COMPLEX_ELPA_KERNEL_GPU)
 #endif

test/Fortran/test_real2_api.F90

@@ -343,7 +343,6 @@ program test_real2_choose_kernel_with_api_double_precision
 #ifdef WITH_REAL_SSE_ASSEMBLY_KERNEL
                               REAL_ELPA_KERNEL_SSE)
 #endif
-#ifdef WITH_ONE_SPECIFIC_REAL_KERNEL
 
 #ifdef WITH_REAL_SSE_BLOCK6_KERNEL
                               REAL_ELPA_KERNEL_SSE_BLOCK6)
@@ -356,6 +355,7 @@ program test_real2_choose_kernel_with_api_double_precision
 #endif
 #endif
 #endif
+
 #ifdef WITH_REAL_AVX_BLOCK6_KERNEL
                               REAL_ELPA_KERNEL_AVX_BLOCK6)
 #else
@@ -380,7 +380,6 @@ program test_real2_choose_kernel_with_api_double_precision
 #endif
 #endif
 
-
 #ifdef WITH_REAL_AVX512_BLOCK6_KERNEL
                               REAL_ELPA_KERNEL_AVX512_BLOCK6)
 #else
@@ -393,59 +392,6 @@ program test_real2_choose_kernel_with_api_double_precision
 #endif
 #endif
 
-
-#else /* WITH_ONE_SPECIFIC_REAL_KERNEL */
-
-#ifdef WITH_REAL_SSE_BLOCK2_KERNEL
-                              REAL_ELPA_KERNEL_SSE_BLOCK2)
-#endif
-
-#ifdef WITH_REAL_SSE_BLOCK4_KERNEL
-                              REAL_ELPA_KERNEL_SSE_BLOCK4)
-#endif
-
-#ifdef WITH_REAL_SSE_BLOCK6_KERNEL
-                              REAL_ELPA_KERNEL_SSE_BLOCK6)
-#endif
-
-#ifdef WITH_REAL_AVX_BLOCK2_KERNEL
-                              REAL_ELPA_KERNEL_AVX_BLOCK2)
-#endif
-
-#ifdef WITH_REAL_AVX_BLOCK4_KERNEL
-                              REAL_ELPA_KERNEL_AVX_BLOCK4)
-#endif
-
-#ifdef WITH_REAL_AVX_BLOCK6_KERNEL
-                              REAL_ELPA_KERNEL_AVX_BLOCK6)
-#endif
-
-#ifdef WITH_REAL_AVX2_BLOCK2_KERNEL
-                              REAL_ELPA_KERNEL_AVX2_BLOCK2)
-#endif
-
-#ifdef WITH_REAL_AVX2_BLOCK4_KERNEL
-                              REAL_ELPA_KERNEL_AVX2_BLOCK4)
-#endif
-
-#ifdef WITH_REAL_AVX2_BLOCK6_KERNEL
-                              REAL_ELPA_KERNEL_AVX2_BLOCK6)
-#endif
-
-#ifdef WITH_REAL_AVX512_BLOCK2_KERNEL
-                              REAL_ELPA_KERNEL_AVX512_BLOCK2)
-#endif
-
-#ifdef WITH_REAL_AVX512_BLOCK4_KERNEL
-                              REAL_ELPA_KERNEL_AVX512_BLOCK4)
-#endif
-
-#ifdef WITH_REAL_AVX512_BLOCK6_KERNEL
-                              REAL_ELPA_KERNEL_AVX512_BLOCK6)
-#endif
-
-#endif /* WITH_ONE_SPECIFIC_REAL_KERNEL */
-
 #ifdef WITH_REAL_BGP_KERNEL
                               REAL_ELPA_KERNEL_BGP)
 #endif