Move ELPA 2stage legacy C-interface definition in subdir

Makefile.am

@@ -41,7 +41,7 @@ libelpa@SUFFIX@_private_la_SOURCES = \
         src/elpa2/kernels/mod_single_hh_trafo_real.F90 \
         src/elpa_driver_c_interface.F90 \
         src/elpa1/legacy_interface/elpa_1stage_c_interface_legacy.F90 \
-        src/elpa_2stage_c_interface.F90 \
+        src/elpa2/legacy_interface/elpa_2stage_c_interface.F90 \
         src/GPU/check_for_gpu.F90 \
         src/GPU/mod_cuda.F90 \
         src/elpa2/GPU/interface_c_kernel.F90 \
@@ -63,7 +63,7 @@ EXTRA_libelpa@SUFFIX@_private_la_DEPENDENCIES = \
 	src/elpa2/legacy_interface/elpa2_template_legacy.X90 \
 	src/elpa2/elpa2_template_new_interface.X90 \
 	src/elpa1/legacy_interface/elpa1_c_interface_template.X90 \
-	src/elpa2_c_interface_template.X90 \
+	src/elpa2/legacy_interface/elpa2_c_interface_template.X90 \
 	src/elpa_driver_c_interface_template.X90 \
 	src/elpa1/legacy_interface/elpa_solve_tridi_c_interface_template.X90 \
         src/elpa1/legacy_interface/elpa_mult_at_b_c_interface_template.X90 \
@@ -1116,7 +1116,7 @@ EXTRA_DIST = \
   src/elpa2/legacy_interface/elpa2_template_legacy.X90 \
   src/elpa2/elpa2_template_new_interface.X90 \
   src/elpa1/legacy_interface/elpa1_c_interface_template.X90 \
-  src/elpa2_c_interface_template.X90 \
+  src/elpa2/legacy_interface/elpa2_c_interface_template.X90 \
   src/elpa_driver_c_interface_template.X90 \
   src/elpa1/legacy_interface/elpa_solve_tridi_c_interface_template.X90 \
   src/elpa1/legacy_interface/elpa_mult_at_b_c_interface_template.X90 \
@@ -1165,7 +1165,7 @@ EXTRA_DIST = \
 #elpa/elpa_generated.h: $(top_srcdir)/src/elpa1/legacy_interface/elpa_1stage_c_interface_legacy.F90
 #	grep -h "^ *!c>" $^ | sed 's/^ *!c>//;' > $@ || { rm $@; exit 1; }
 #
-#elpa/elpa_generated.h: $(top_srcdir)/src/elpa_2stage_c_interface.F90
+#elpa/elpa_generated.h: $(top_srcdir)/src/elpa2/legacy_interface/elpa_2stage_c_interface.F90
 #	grep -h "^ *!c>" $^ | sed 's/^ *!c>//;' > $@ || { rm $@; exit 1; }
 #
 #test/shared_sources/generated.h: $(wildcard $(top_srcdir)/test/shared_sources/*.F90)

generated_headers.am

@@ -19,7 +19,7 @@ elpa/elpa_generated.h: $(top_srcdir)/src/elpa_driver_c_interface.F90 | elpa
 elpa/elpa_generated.h: $(top_srcdir)/src/elpa1/legacy_interface/elpa_1stage_c_interface_legacy.F90 | elpa
 	$(call extract_interface,!c>)
 
-elpa/elpa_generated.h: $(top_srcdir)/src/elpa_2stage_c_interface.F90 | elpa
+elpa/elpa_generated.h: $(top_srcdir)/src/elpa2/legacy_interface/elpa_2stage_c_interface.F90 | elpa
 	$(call extract_interface,!c>)
 
 test/shared/generated.h: $(wildcard $(top_srcdir)/test/shared/*.*90) | test/shared

src/elpa_2stage_c_interface.F90 → src/elpa2/legacy_interface/elpa_2stage_c_interface.F90

@@ -77,8 +77,8 @@
   !c> int elpa_solve_evp_real_2stage_single_precision(int na, int nev, float *a, int lda, float *ev, float *q, int ldq, int nblk, int matrixCols, int mpi_comm_rows, int mpi_comm_cols, int mpi_comm_all, int THIS_REAL_ELPA_KERNEL_API, int useQR, int useGPU);
 #endif
 
-#include "precision_macros.h"
-#include "elpa2_c_interface_template.X90"
+#include "../../precision_macros.h"
+#include "./elpa2_c_interface_template.X90"
 #undef DOUBLE_PRECISION
 #undef REALCASE
 
@@ -120,8 +120,8 @@
   !c> int elpa_solve_evp_real_2stage_single_precision(int na, int nev, float *a, int lda, float *ev, float *q, int ldq, int nblk, int matrixCols, int mpi_comm_rows, int mpi_comm_cols, int mpi_comm_all, int THIS_REAL_ELPA_KERNEL_API, int useQR, int useGPU);
 #endif
 
-#include "precision_macros.h"
-#include "elpa2_c_interface_template.X90"
+#include "../../precision_macros.h"
+#include "./elpa2_c_interface_template.X90"
 #undef DOUBLE_PRECISION
 #undef SINGLE_PRECISION
 #undef REALCASE
@@ -164,8 +164,8 @@
   !c> int elpa_solve_evp_complex_2stage_single_precision(int na, int nev, complex *a, int lda, float *ev, complex *q, int ldq, int nblk, int matrixCols, int mpi_comm_rows, int mpi_comm_cols, int mpi_comm_all, int THIS_COMPLEX_ELPA_KERNEL_API, int useGPU);
 #endif
 
-#include "precision_macros.h"
-#include "elpa2_c_interface_template.X90"
+#include "../../precision_macros.h"
+#include "./elpa2_c_interface_template.X90"
 #undef DOUBLE_PRECISION
 #undef COMPLEXCASE
 
@@ -207,8 +207,8 @@
   !c> int elpa_solve_evp_complex_2stage_single_precision(int na, int nev, complex *a, int lda, float *ev, complex *q, int ldq, int nblk, int matrixCols, int mpi_comm_rows, int mpi_comm_cols, int mpi_comm_all, int THIS_COMPLEX_ELPA_KERNEL_API, int useGPU);
 #endif
 
-#include "precision_macros.h"
-#include "elpa2_c_interface_template.X90"
+#include "../../precision_macros.h"
+#include "./elpa2_c_interface_template.X90"
 #undef DOUBLE_PRECISION
 #undef SINGLE_PRECISION
 #undef COMPLEXCASE

test/Fortran/test_complex2_gpu.F90

@@ -84,7 +84,7 @@ program test_complex2_gpu_version_double_precision
 
    use mod_check_for_gpu, only : check_for_gpu
    use elpa_utilities, only : error_unit
-   use elpa2_legacy
+   use elpa2_utilities
    use mod_read_input_parameters
    use mod_check_correctness
    use mod_setup_mpi

test/Fortran/test_complex2_gpu_single.F90

@@ -84,7 +84,7 @@ program test_complex2_gpu_version_single_precision
 
    use mod_check_for_gpu, only : check_for_gpu
    use elpa_utilities, only : error_unit
-   use elpa2_legacy
+   use elpa2_utilities
    use mod_read_input_parameters
    use mod_check_correctness
    use mod_setup_mpi

test/Fortran/test_complex_gpu.F90

@@ -74,9 +74,9 @@ program test_complex_gpu_version_double_precision
 !-------------------------------------------------------------------------------
    use precision
    use elpa1_legacy
-   
+
    use mod_check_for_gpu, only : check_for_gpu
-   
+
    use elpa_utilities, only : error_unit
    use elpa1_utilities
 #ifdef WITH_OPENMP

test/Fortran/test_complex_gpu_single.F90

@@ -74,7 +74,7 @@ program test_complex_gpu_version_single_precision
 !-------------------------------------------------------------------------------
    use precision
    use elpa1_legacy
-   
+
    use mod_check_for_gpu, only : check_for_gpu
 
    use elpa_utilities, only : error_unit

test/Fortran/test_real2_gpu.F90

@@ -85,7 +85,7 @@ program test_real2_gpu_version_double_precision
    use mod_check_for_gpu, only : check_for_gpu
 
    use elpa_utilities, only : error_unit
-   use elpa2_legacy
+   use elpa2_utilities
    use mod_read_input_parameters
    use mod_check_correctness
    use mod_setup_mpi

test/Fortran/test_real2_gpu_single.F90

@@ -85,7 +85,7 @@ program test_real2_gpu_version_single_precision
    use mod_check_for_gpu, only : check_for_gpu
 
    use elpa_utilities, only : error_unit
-   use elpa2_legacy
+   use elpa2_utilities
    use mod_read_input_parameters
    use mod_check_correctness
    use mod_setup_mpi

test/Fortran/test_real_gpu_single.F90

@@ -75,9 +75,9 @@ program test_real_gpu_version_single_precision
 !-------------------------------------------------------------------------------
    use precision
    use elpa1_legacy
-   
+
    use mod_check_for_gpu, only : check_for_gpu
-      
+
    use elpa_utilities, only : error_unit
    use elpa1_utilities
 #ifdef WITH_OPENMP