Fix no-complex build for bml_elemental code

lanl · Aug 5, 2022 · 4f4281e · 4f4281e
1 parent e3fb02c
commit 4f4281e
Show file tree

Hide file tree

Showing 8 changed files with 46 additions and 16 deletions.
diff --git a/src/C-interface/bml_elemental.c b/src/C-interface/bml_elemental.c
@@ -5,7 +5,9 @@
 #include "ellpack/bml_elemental_ellpack.h"
 #include "ellsort/bml_elemental_ellsort.h"
 
+#ifdef BML_COMPLEX
 #include <complex.h>
+#endif
 
 /** Return a single matrix element.
  *
@@ -77,7 +79,7 @@ bml_get_element_double_real(
  * \param A The bml matrix
  * \return The matrix element
  */
-float complex
+float _Complex
 bml_get_element_single_complex(
     bml_matrix_t * A,
     int i,
@@ -108,7 +110,7 @@ bml_get_element_single_complex(
  * \param A The bml matrix
  * \return The matrix element
  */
-double complex
+double _Complex
 bml_get_element_double_complex(
     bml_matrix_t * A,
     int i,

diff --git a/src/C-interface/bml_elemental.h b/src/C-interface/bml_elemental.h
@@ -3,7 +3,9 @@
 
 #include "bml_types.h"
 
+#ifdef BML_COMPLEX
 #include <complex.h>
+#endif
 
 float bml_get_element_single_real(
     bml_matrix_t * A,
@@ -15,14 +17,16 @@ double bml_get_element_double_real(
     int i,
     int j);
 
-float complex bml_get_element_single_complex(
+#ifdef BML_COMPLEX
+float _Complex bml_get_element_single_complex(
     bml_matrix_t * A,
     int i,
     int j);
 
-double complex bml_get_element_double_complex(
+double _Complex bml_get_element_double_complex(
     bml_matrix_t * A,
     int i,
     int j);
+#endif
 
 #endif
diff --git a/src/C-interface/dense/bml_elemental_dense.c b/src/C-interface/dense/bml_elemental_dense.c
@@ -3,7 +3,9 @@
 #include "bml_elemental_dense.h"
 #include "bml_types_dense.h"
 
+#ifdef BML_COMPLEX
 #include <complex.h>
+#endif
 
 /** Return a single matrix element.
  *
@@ -57,14 +59,15 @@ bml_get_element_dense_double_real(
     return ((double *) A->matrix)[ROWMAJOR(i, j, A->N, A->N)];
 }
 
+#ifdef BML_COMPLEX
 /** Return a single matrix element.
  *
  * \param A The bml matrix
  * \param i The row index
  * \param j The column index
  * \return The matrix element
  */
-float complex
+float _Complex
 bml_get_element_dense_single_complex(
     bml_matrix_dense_t * A,
     int i,
@@ -90,7 +93,7 @@ bml_get_element_dense_single_complex(
  * \param j The column index
  * \return The matrix element
  */
-double complex
+double _Complex
 bml_get_element_dense_double_complex(
     bml_matrix_dense_t * A,
     int i,
@@ -108,3 +111,4 @@ bml_get_element_dense_double_complex(
     }
     return ((double complex *) A->matrix)[ROWMAJOR(i, j, A->N, A->N)];
 }
+#endif
diff --git a/src/C-interface/dense/bml_elemental_dense.h b/src/C-interface/dense/bml_elemental_dense.h
@@ -3,7 +3,9 @@
 
 #include "bml_types_dense.h"
 
+#ifdef BML_COMPLEX
 #include <complex.h>
+#endif
 
 float bml_get_element_dense_single_real(
     bml_matrix_dense_t * A,
@@ -15,14 +17,16 @@ double bml_get_element_dense_double_real(
     int i,
     int j);
 
-float complex bml_get_element_dense_single_complex(
+#ifdef BML_COMPLEX
+float _Complex bml_get_element_dense_single_complex(
     bml_matrix_dense_t * A,
     int i,
     int j);
 
-double complex bml_get_element_dense_double_complex(
+double _Complex bml_get_element_dense_double_complex(
     bml_matrix_dense_t * A,
     int i,
     int j);
+#endif
 
 #endif
diff --git a/src/C-interface/ellpack/bml_elemental_ellpack.c b/src/C-interface/ellpack/bml_elemental_ellpack.c
@@ -3,7 +3,9 @@
 #include "bml_elemental_ellpack.h"
 #include "bml_types_ellpack.h"
 
+#ifdef BML_COMPLEX
 #include <complex.h>
+#endif
 
 /** Return a single matrix element.
  *
@@ -72,14 +74,15 @@ bml_get_element_ellpack_double_real(
     return 0;
 }
 
+#ifdef BML_COMPLEX
 /** Return a single matrix element.
  *
  * \param A The bml matrix
  * \param i The row index
  * \param j The column index
  * \return The matrix element
  */
-float complex
+float _Complex
 bml_get_element_ellpack_single_complex(
     bml_matrix_ellpack_t * A,
     int i,
@@ -113,7 +116,7 @@ bml_get_element_ellpack_single_complex(
  * \param j The column index
  * \return The matrix element
  */
-double complex
+double _Complex
 bml_get_element_ellpack_double_complex(
     bml_matrix_ellpack_t * A,
     int i,
@@ -139,3 +142,4 @@ bml_get_element_ellpack_double_complex(
     }
     return 0;
 }
+#endif
diff --git a/src/C-interface/ellpack/bml_elemental_ellpack.h b/src/C-interface/ellpack/bml_elemental_ellpack.h
@@ -3,7 +3,9 @@
 
 #include "bml_types_ellpack.h"
 
+#ifdef BML_COMPLEX
 #include <complex.h>
+#endif
 
 float bml_get_element_ellpack_single_real(
     bml_matrix_ellpack_t * A,
@@ -15,14 +17,16 @@ double bml_get_element_ellpack_double_real(
     int i,
     int j);
 
-float complex bml_get_element_ellpack_single_complex(
+#ifdef BML_COMPLEX
+float _Complex bml_get_element_ellpack_single_complex(
     bml_matrix_ellpack_t * A,
     int i,
     int j);
 
-double complex bml_get_element_ellpack_double_complex(
+double _Complex bml_get_element_ellpack_double_complex(
     bml_matrix_ellpack_t * A,
     int i,
     int j);
+#endif
 
 #endif
diff --git a/src/C-interface/ellsort/bml_elemental_ellsort.c b/src/C-interface/ellsort/bml_elemental_ellsort.c
@@ -3,7 +3,9 @@
 #include "bml_elemental_ellsort.h"
 #include "bml_types_ellsort.h"
 
+#ifdef BML_COMPLEX
 #include <complex.h>
+#endif
 
 /** Return a single matrix element.
  *
@@ -72,14 +74,15 @@ bml_get_element_ellsort_double_real(
     return 0;
 }
 
+#ifdef BML_COMPLEX
 /** Return a single matrix element.
  *
  * \param A The bml matrix
  * \param i The row index
  * \param j The column index
  * \return The matrix element
  */
-float complex
+float _Complex
 bml_get_element_ellsort_single_complex(
     bml_matrix_ellsort_t * A,
     int i,
@@ -113,7 +116,7 @@ bml_get_element_ellsort_single_complex(
  * \param j The column index
  * \return The matrix element
  */
-double complex
+double _Complex
 bml_get_element_ellsort_double_complex(
     bml_matrix_ellsort_t * A,
     int i,
@@ -139,3 +142,4 @@ bml_get_element_ellsort_double_complex(
     }
     return 0;
 }
+#endif
diff --git a/src/C-interface/ellsort/bml_elemental_ellsort.h b/src/C-interface/ellsort/bml_elemental_ellsort.h
@@ -3,7 +3,9 @@
 
 #include "bml_types_ellsort.h"
 
+#ifdef BML_COMPLEX
 #include <complex.h>
+#endif
 
 float bml_get_element_ellsort_single_real(
     bml_matrix_ellsort_t * A,
@@ -15,14 +17,16 @@ double bml_get_element_ellsort_double_real(
     int i,
     int j);
 
-float complex bml_get_element_ellsort_single_complex(
+#ifdef BML_COMPLEX
+float _Complex bml_get_element_ellsort_single_complex(
     bml_matrix_ellsort_t * A,
     int i,
     int j);
 
-double complex bml_get_element_ellsort_double_complex(
+double _Complex bml_get_element_ellsort_double_complex(
     bml_matrix_ellsort_t * A,
     int i,
     int j);
+#endif
 
 #endif