Commit 176201c1 authored by Andreas Marek's avatar Andreas Marek
Browse files

Merge branch 'ELPA2_GPU' into matrix_redistribute

parents b380ce92 056612c7
...@@ -335,6 +335,13 @@ ...@@ -335,6 +335,13 @@
isSkewsymmetric = (skewsymmetric == 1) 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 ! GPU settings
call obj%get("gpu", gpu,error) call obj%get("gpu", gpu,error)
if (error .ne. ELPA_OK) then if (error .ne. ELPA_OK) then
...@@ -587,14 +594,6 @@ ...@@ -587,14 +594,6 @@
#endif #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 #if REALCASE == 1
useQRActual = .false. useQRActual = .false.
......
...@@ -59,6 +59,7 @@ ...@@ -59,6 +59,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <math.h> #include <math.h>
#include <complex.h> #include <complex.h>
#include "../helpers/scalapack_interfaces.h"
#ifdef HAVE_64BIT_INTEGER_MATH_SUPPORT #ifdef HAVE_64BIT_INTEGER_MATH_SUPPORT
#define C_INT_TYPE_PTR long int* #define C_INT_TYPE_PTR long int*
...@@ -85,6 +86,22 @@ ...@@ -85,6 +86,22 @@
#ifdef WITH_MPI #ifdef WITH_MPI
#include <mpi.h> #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_ */
//*********************************************************************************************************** //***********************************************************************************************************
......
...@@ -67,7 +67,11 @@ ...@@ -67,7 +67,11 @@
#undef THRESHOLD #undef THRESHOLD
#if 0
/* General definitions needed in single and double case */ /* 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 MATH_DATATYPE real
#define BLAS_TRANS_OR_CONJ 'T' #define BLAS_TRANS_OR_CONJ 'T'
...@@ -217,7 +221,12 @@ ...@@ -217,7 +221,12 @@
#undef BLAS_CHAR_AND_SY_OR_HE #undef BLAS_CHAR_AND_SY_OR_HE
#undef PRECISION #undef PRECISION
#undef COMPLEX_DATATYPE #undef COMPLEX_DATATYPE
#if 0
/* in the complex case also sometime real valued variables are needed */ /* 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 REAL_DATATYPE
#undef C_REAL_DATATYPE #undef C_REAL_DATATYPE
...@@ -283,7 +292,11 @@ ...@@ -283,7 +292,11 @@
#undef THRESHOLD #undef THRESHOLD
#if 0
/* General definitions needed in single and double case */ /* 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 MATH_DATATYPE complex
#define BLAS_TRANS_OR_CONJ 'C' #define BLAS_TRANS_OR_CONJ 'C'
#ifdef DOUBLE_PRECISION #ifdef DOUBLE_PRECISION
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment