Unify pack_unpack_cpu

Makefile.am

@@ -27,10 +27,9 @@ libelpa@SUFFIX@_private_la_SOURCES = \
         src/mod_mpi.F90 \
         src/mod_mpi_stubs.F90 \
 	src/mod_redist_band.F90 \
-        src/mod_pack_unpack_real.F90 \
+        src/mod_pack_unpack_cpu.F90 \
         src/mod_compute_hh_trafo_real.F90 \
         src/mod_compute_hh_trafo_complex.F90 \
-        src/mod_pack_unpack_complex.F90 \
         src/aligned_mem.F90 \
         src/elpa1_compute_private.F90 \
 	src/elpa2_determine_workload.F90 \
@@ -63,6 +62,7 @@ EXTRA_libelpa@SUFFIX@_private_la_DEPENDENCIES = \
 	src/elpa2_kernels/elpa2_kernels_real_template.X90 \
 	src/elpa2_kernels/elpa2_kernels_complex_template.X90 \
 	src/elpa2_kernels/elpa2_kernels_simple_template.X90 \
+	src/pack_unpack_cpu.X90 \
         src/redist_band.X90 \
 	src/sanity.X90 \
 	src/elpa_cholesky_template.X90 \
@@ -981,6 +981,7 @@ EXTRA_DIST = \
   src/elpa2_kernels/elpa2_kernels_complex_template.X90 \
   src/elpa2_kernels/elpa2_kernels_simple_template.X90 \
   src/redist_band.X90 \
+  src/pack_unpack_cpu.X90 \
   src/sanity.X90 \
   src/elpa_cholesky_template.X90 \
   src/elpa_invert_trm.X90 \

src/elpa2_trans_ev_tridi_to_band_template.X90

@@ -45,14 +45,13 @@
       use timings_dummy
 #endif
       use elpa2_workload
+      use pack_unpack_cpu
 #if REALCASE == 1
-      use pack_unpack_real
       use pack_unpack_real_gpu
       use compute_hh_trafo_real
 
 #endif
 #if COMPLEXCASE == 1
-      use pack_unpack_complex
       use compute_hh_trafo_complex
 #endif
       use cuda_functions

src/mod_pack_unpack_cpu.F90

+!    This file is part of ELPA.
+!
+!    The ELPA library was originally created by the ELPA consortium,
+!    consisting of the following organizations:
+!
+!    - Max Planck Computing and Data Facility (MPCDF), formerly known as
+!      Rechenzentrum Garching der Max-Planck-Gesellschaft (RZG),
+!    - Bergische Universität Wuppertal, Lehrstuhl für angewandte
+!      Informatik,
+!    - Technische Universität München, Lehrstuhl für Informatik mit
+!      Schwerpunkt Wissenschaftliches Rechnen ,
+!    - Fritz-Haber-Institut, Berlin, Abt. Theorie,
+!    - Max-Plack-Institut für Mathematik in den Naturwissenschaften,
+!      Leipzig, Abt. Komplexe Strukutren in Biologie und Kognition,
+!      and
+!    - IBM Deutschland GmbH
+!
+!
+!    More information can be found here:
+!    http://elpa.mpcdf.mpg.de/
+!
+!    ELPA is free software: you can redistribute it and/or modify
+!    it under the terms of the version 3 of the license of the
+!    GNU Lesser General Public License as published by the Free
+!    Software Foundation.
+!
+!    ELPA is distributed in the hope that it will be useful,
+!    but WITHOUT ANY WARRANTY; without even the implied warranty of
+!    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+!    GNU Lesser General Public License for more details.
+!
+!    You should have received a copy of the GNU Lesser General Public License
+!    along with ELPA.  If not, see <http://www.gnu.org/licenses/>
+!
+!    ELPA reflects a substantial effort on the part of the original
+!    ELPA consortium, and we ask you to respect the spirit of the
+!    license that we chose: i.e., please contribute any changes you
+!    may have back to the original ELPA library distribution, and keep
+!    any derivatives of ELPA under the same license that we chose for
+!    the original distribution, the GNU Lesser General Public License.
+!
+! This file was written by A. Marek, MPCDF
+
+module pack_unpack_cpu
+#include "config-f90.h"
+  implicit none
+
+  private
+
+#ifdef WITH_OPENMP
+  public pack_row_real_cpu_openmp_double, unpack_row_real_cpu_openmp_double
+  public pack_row_complex_cpu_openmp_double, unpack_row_complex_cpu_openmp_double
+#else
+  public pack_row_real_cpu_double, unpack_row_real_cpu_double
+  public pack_row_complex_cpu_double, unpack_row_complex_cpu_double
+#endif
+
+#ifdef WANT_SINGLE_PRECISION_COMPLEX
+
+#ifdef WITH_OPENMP
+  public pack_row_real_cpu_openmp_single, unpack_row_real_cpu_openmp_single
+  public pack_row_complex_cpu_openmp_single,  unpack_row_complex_cpu_openmp_single
+#else
+  public pack_row_real_cpu_single, unpack_row_real_cpu_single
+  public pack_row_complex_cpu_single, unpack_row_complex_cpu_single
+#endif
+
+#endif /* WANT_SINGLE_PRECISION_COMPLEX */
+
+  contains
+
+  !real double precision
+#define REALCASE 1
+#define DOUBLE_PRECISION 1
+#include "precision_macros.h"
+#include "pack_unpack_cpu.X90"
+#undef REALCASE
+#undef DOUBLE_PRECISION
+
+ ! real single precision
+#if defined(WANT_SINGLE_PRECISION_REAL)
+#define REALCASE 1
+#define SINGLE_PRECISION 1
+#include "precision_macros.h"
+#include "pack_unpack_cpu.X90"
+#undef REALCASE
+#undef SINGLE_PRECISION
+#endif
+
+  !complex double precision
+#define COMPLEXCASE 1
+#define DOUBLE_PRECISION 1
+#include "precision_macros.h"
+#include "pack_unpack_cpu.X90"
+#undef COMPLEXCASE
+#undef DOUBLE_PRECISION
+
+ ! complex single precision
+#if defined(WANT_SINGLE_PRECISION_COMPLEX)
+#define COMPLEXCASE 1
+#define SINGLE_PRECISION 1
+#include "precision_macros.h"
+#include "pack_unpack_cpu.X90"
+#undef COMPLEXCASE
+#undef SINGLE_PRECISION
+#endif
+
+
+end module

src/precision_macros.h

@@ -45,7 +45,7 @@
 #undef  MPI_MATH_DATATYPE_PRECISION
 #undef  C_DATATYPE_KIND
 
-/* General definitions needed in single and real case */
+/* General definitions needed in single and double case */
 #define  MATH_DATATYPE real
 #define  BLAS_TRANS_OR_CONJ 'T'