From 015a090bbf8e10dddd78ba24d0a72ec466d24b24 Mon Sep 17 00:00:00 2001 From: Jean-Luc Fattebert Date: Thu, 4 Aug 2022 13:14:43 -0400 Subject: [PATCH] Fix no-complex build for bml_elemental code --- src/C-interface/bml_elemental.c | 6 ++++-- src/C-interface/bml_elemental.h | 8 ++++++-- src/C-interface/dense/bml_elemental_dense.c | 8 ++++++-- src/C-interface/dense/bml_elemental_dense.h | 8 ++++++-- src/C-interface/ellpack/bml_elemental_ellpack.c | 8 ++++++-- src/C-interface/ellpack/bml_elemental_ellpack.h | 8 ++++++-- src/C-interface/ellsort/bml_elemental_ellsort.c | 8 ++++++-- src/C-interface/ellsort/bml_elemental_ellsort.h | 8 ++++++-- 8 files changed, 46 insertions(+), 16 deletions(-) diff --git a/src/C-interface/bml_elemental.c b/src/C-interface/bml_elemental.c index e6f7cc640..3476a8e21 100644 --- 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 +#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 index 1739ae75e..3a1b52375 100644 --- 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 +#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 index 6f3129956..63a3673b1 100644 --- 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 +#endif /** Return a single matrix element. * @@ -57,6 +59,7 @@ 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 @@ -64,7 +67,7 @@ bml_get_element_dense_double_real( * \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 index ab74ec1cb..fcb1b0c3e 100644 --- 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 +#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 index 898c2e0c0..a3b3f834f 100644 --- 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 +#endif /** Return a single matrix element. * @@ -72,6 +74,7 @@ bml_get_element_ellpack_double_real( return 0; } +#ifdef BML_COMPLEX /** Return a single matrix element. * * \param A The bml matrix @@ -79,7 +82,7 @@ bml_get_element_ellpack_double_real( * \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 index 12af60f93..5906770cd 100644 --- 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 +#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 index 70c013ba5..4ea72f1f8 100644 --- 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 +#endif /** Return a single matrix element. * @@ -72,6 +74,7 @@ bml_get_element_ellsort_double_real( return 0; } +#ifdef BML_COMPLEX /** Return a single matrix element. * * \param A The bml matrix @@ -79,7 +82,7 @@ bml_get_element_ellsort_double_real( * \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 index 046193657..af0cfa283 100644 --- 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 +#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