Complement PR #425 and fix to CPUID-select ELPA-kernel

Complement PR #425 and fix selecting ELPA-kernel. In case of MACHINE_CPU_GENERIC, the selection was incorrectly attempting to use the best possible/known CPU-extension.
cp2k · Jul 12, 2019 · 1325aee · 1325aee
1 parent 74c8e9e
commit 1325aee
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/fm/cp_fm_elpa.F b/src/fm/cp_fm_elpa.F
@@ -152,14 +152,15 @@ END FUNCTION get_elpa_kernel_descriptions
 ! **************************************************************************************************
    PURE FUNCTION get_elpa_kernel_index(cpuid) RESULT(index)
       USE machine,  ONLY: MACHINE_X86, &
+                          MACHINE_CPU_GENERIC, &
                           MACHINE_X86_SSE4, &
                           MACHINE_X86_AVX, &
                           MACHINE_X86_AVX2
       INTEGER, INTENT(IN) :: cpuid
       INTEGER :: index
 
       index = 1 ! AUTO
-      IF (cpuid .LE. MACHINE_X86) THEN
+      IF ((MACHINE_CPU_GENERIC .LT. cpuid) .AND. (cpuid .LE. MACHINE_X86)) THEN
          SELECT CASE (cpuid)
          CASE (MACHINE_X86_SSE4)
             index = 8 ! ELPA_2STAGE_REAL_SSE_BLOCK4