Merge branch 'ELPA2_GPU' into matrix_redistribute

src/elpa2/elpa2_template.F90

@@ -335,6 +335,13 @@
 
     isSkewsymmetric = (skewsymmetric == 1)
 
+    call obj%get("debug",debug,error)
+    if (error .ne. ELPA_OK) then
+      print *,"Problem getting option. Aborting..."
+      stop
+    endif
+    wantDebug = debug == 1
+
     ! GPU settings
     call obj%get("gpu", gpu,error)
     if (error .ne. ELPA_OK) then
@@ -587,14 +594,6 @@
 
 #endif
 
-    call obj%get("debug",debug,error)
-    if (error .ne. ELPA_OK) then
-      print *,"Problem getting option. Aborting..."
-      stop
-    endif
-    wantDebug = debug == 1
-
-
 
 #if REALCASE == 1
     useQRActual = .false.

src/elpa_generalized/cannon.c

@@ -59,6 +59,7 @@
 #include <stdlib.h>
 #include <math.h>
 #include <complex.h>
+#include "../helpers/scalapack_interfaces.h"
 
 #ifdef HAVE_64BIT_INTEGER_MATH_SUPPORT
 #define C_INT_TYPE_PTR long int*
@@ -85,6 +86,22 @@
 #ifdef WITH_MPI
 #include <mpi.h>
 
+#ifndef Add_
+#define numroc_ numroc
+#define dlacpy_ dlacpy
+#define pdtran_ pdtran
+#define dlacpy_ dlacpy
+#define pdlacpy_ pdlacpy
+#define slacpy_ slacpy
+#define pstran_ pstran
+#define pslacpy_ pslacpy
+#define zlacpy_ zlacpy
+#define pztranc_ pztranc
+#define pzlacpy_ pzlacpy
+#define clacpy_ clacpy
+#define pctranc_ pctranc
+#define pclacpy_ pclacpy
+#endif /* Add_ */
 
 //***********************************************************************************************************
 

src/general/precision_macros.h

@@ -67,7 +67,11 @@
 #undef THRESHOLD
 
 
+#if 0
 /* General definitions needed in single and double case */
+/* the if 0 bracket is just to make the IBM Fortran compiler happy */
+#endif
+
 #define  MATH_DATATYPE real
 #define  BLAS_TRANS_OR_CONJ 'T'
 
@@ -217,7 +221,12 @@
 #undef  BLAS_CHAR_AND_SY_OR_HE
 #undef  PRECISION
 #undef COMPLEX_DATATYPE
+
+#if 0
 /* in the complex case also sometime real valued variables are needed */
+/* the if 0 bracket is just to make the IBM Fortran compiler happy */
+#endif
+
 #undef REAL_DATATYPE
 #undef C_REAL_DATATYPE
 
@@ -283,7 +292,11 @@
 
 #undef THRESHOLD
 
+#if 0
 /* General definitions needed in single and double case */
+/* the if 0 bracket is just to make the IBM Fortran compiler happy */
+#endif
+
 #define  MATH_DATATYPE complex
 #define  BLAS_TRANS_OR_CONJ 'C'
 #ifdef DOUBLE_PRECISION