From 2e26c767ae7cb28828ac360a9095dbb1063300ec Mon Sep 17 00:00:00 2001
From: Pavel Kus <pavel.kus@mpcdf.mpg.de>
Date: Tue, 17 Jul 2018 10:50:16 +0200
Subject: [PATCH] avoiding linking problem for non-MPI version without dummy
 functions

---
 src/elpa_generalized/cannon.c                 | 44 -------------------
 ...pa_impl_generalized_transform_template.F90 |  4 ++
 2 files changed, 4 insertions(+), 44 deletions(-)

diff --git a/src/elpa_generalized/cannon.c b/src/elpa_generalized/cannon.c
index e85c6c85..30ffbb2e 100644
--- a/src/elpa_generalized/cannon.c
+++ b/src/elpa_generalized/cannon.c
@@ -172,48 +172,4 @@ void cannons_reduction_c_fc(float complex* A, float complex* U, int local_rows,
 */
 void cannons_triang_rectangular_c_fc(float complex* U, float complex* B, int local_rows, int local_cols,
                                     int* u_desc, int* b_desc, float complex *Res, int row_comm, int col_comm);
-#else
-// Just because of the Intel preprocessor
-// TODO do something with it
-// ideally the build system, which is generating fortran interfaces, should respect ifdefs and not
-// generate interface for non-MPI case
-void cannons_reduction_c_d(double* A, double* U, int local_rows, int local_cols, int* a_desc,
-                         double *Res, int ToStore, int row_comm, int col_comm)
-{
-}
-
-void cannons_triang_rectangular_c_d(double* U, double* B, int local_rows, int local_cols,
-                                    int* u_desc, int* b_desc, double *Res, int row_comm, int col_comm)
-{
-}
-
-void cannons_reduction_c_f(float* A, float* U, int local_rows, int local_cols, int* a_desc,
-                         float *Res, int ToStore, int row_comm, int col_comm)
-{
-}
-
-void cannons_triang_rectangular_c_f(float* U, float* B, int local_rows, int local_cols,
-                                    int* u_desc, int* b_desc, float *Res, int row_comm, int col_comm)
-{
-}
-
-void cannons_reduction_c_dc(double complex* A, double complex* U, int local_rows, int local_cols, int* a_desc,
-                         double complex *Res, int ToStore, int row_comm, int col_comm)
-{
-}
-
-void cannons_triang_rectangular_c_dc(double complex* U, double complex* B, int local_rows, int local_cols,
-                                    int* u_desc, int* b_desc, double complex *Res, int row_comm, int col_comm)
-{
-}
-
-void cannons_reduction_c_fc(float complex* A, float complex* U, int local_rows, int local_cols, int* a_desc,
-                         float complex *Res, int ToStore, int row_comm, int col_comm)
-{
-}
-
-void cannons_triang_rectangular_c_fc(float complex* U, float complex* B, int local_rows, int local_cols,
-                                    int* u_desc, int* b_desc, float complex *Res, int row_comm, int col_comm)
-{
-}
 #endif
diff --git a/src/elpa_impl_generalized_transform_template.F90 b/src/elpa_impl_generalized_transform_template.F90
index 775534dd..7573c7c9 100644
--- a/src/elpa_impl_generalized_transform_template.F90
+++ b/src/elpa_impl_generalized_transform_template.F90
@@ -75,9 +75,11 @@
        call self%timer_start("cannons_reduction")
        ! BEWARE! even though tmp is output from the routine, it has to be zero on input!
        tmp = 0.0_rck
+#ifdef WITH_MPI
        call cannons_reduction_&
          &ELPA_IMPL_SUFFIX&
          &(a, b, self%local_nrows, self%local_ncols, sc_desc, tmp, BuffLevelInt, mpi_comm_rows, mpi_comm_cols)
+#endif
        call self%timer_stop("cannons_reduction")
 
        a(1:self%local_nrows, 1:self%local_ncols) = tmp(1:self%local_nrows, 1:self%local_ncols)
@@ -162,9 +164,11 @@
 
      if(use_cannon == 1) then
        call self%timer_start("cannons_triang_rectangular")
+#ifdef WITH_MPI
        call cannons_triang_rectangular_&
          &ELPA_IMPL_SUFFIX&
          &(b, q, self%local_nrows, self%local_ncols, sc_desc, sc_desc_ev, tmp, mpi_comm_rows, mpi_comm_cols);
+#endif
        call self%timer_stop("cannons_triang_rectangular")
 
        q(1:self%local_nrows, 1:self%local_ncols) = tmp(1:self%local_nrows, 1:self%local_ncols)
-- 
GitLab