From ab776dd082c9b160d95b6014d57596cfeffd0ab0 Mon Sep 17 00:00:00 2001 From: sfilippone Date: Tue, 11 Mar 2025 18:24:22 +0100 Subject: [PATCH] Fix silly bug in include for metis and configry --- base/modules/psb_config.h.in | 2 +- configure | 2 +- configure.ac | 2 +- util/psb_metis_int.c | 2 +- util/psb_metis_int.h.in | 2 ++ 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/base/modules/psb_config.h.in b/base/modules/psb_config.h.in index 928d333a..19c440f6 100644 --- a/base/modules/psb_config.h.in +++ b/base/modules/psb_config.h.in @@ -58,7 +58,7 @@ typedef std::complex psb_z_t; #else typedef float complex psb_c_t; - typedef float complex psb_z_t; + typedef double complex psb_z_t; #endif #endif diff --git a/configure b/configure index 2fd463a5..c512d094 100755 --- a/configure +++ b/configure @@ -10157,7 +10157,7 @@ if test "x$psblas_cv_have_metis" == "xyes" ; then FDEFINES="$psblas_cv_define_prepend-DHAVE_METIS $psblas_cv_define_prepend-DMETIS_$pac_cv_metis_idx $psblas_cv_define_prepend-DMETIS_REAL_$pac_cv_metis_real $FDEFINES" # CDEFINES="-DHAVE_METIS_ $psblas_cv_metis_includes $CDEFINES -DMETIS_$pac_cv_metis_idx -DMETIS_REAL_$pac_cv_metis_real" METISINCFILE=$psblas_cv_metisincfile - CHAVEMETIS="#define HAVE_METIS_" + CHAVEMETIS="#define HAVE_METIS" CINTMETIS="#define METIS_$pac_cv_metis_idx" CREALMETIS="#define METIS_REAL_$pac_cv_metis_real" fi diff --git a/configure.ac b/configure.ac index 1b98681d..c8897551 100755 --- a/configure.ac +++ b/configure.ac @@ -812,7 +812,7 @@ if test "x$psblas_cv_have_metis" == "xyes" ; then FDEFINES="$psblas_cv_define_prepend-DHAVE_METIS $psblas_cv_define_prepend-DMETIS_$pac_cv_metis_idx $psblas_cv_define_prepend-DMETIS_REAL_$pac_cv_metis_real $FDEFINES" # CDEFINES="-DHAVE_METIS_ $psblas_cv_metis_includes $CDEFINES -DMETIS_$pac_cv_metis_idx -DMETIS_REAL_$pac_cv_metis_real" METISINCFILE=$psblas_cv_metisincfile - CHAVEMETIS="#define HAVE_METIS_" + CHAVEMETIS="#define HAVE_METIS" CINTMETIS="#define METIS_$pac_cv_metis_idx" CREALMETIS="#define METIS_REAL_$pac_cv_metis_real" fi diff --git a/util/psb_metis_int.c b/util/psb_metis_int.c index 4d492407..dbf7afb6 100644 --- a/util/psb_metis_int.c +++ b/util/psb_metis_int.c @@ -1,6 +1,6 @@ #include -#if defined(HAVE_METIS_) #include "psb_metis_int.h" +#if defined(HAVE_METIS) #if defined(METIS_REAL_32) diff --git a/util/psb_metis_int.h.in b/util/psb_metis_int.h.in index b9e2e81a..5914943d 100644 --- a/util/psb_metis_int.h.in +++ b/util/psb_metis_int.h.in @@ -3,6 +3,7 @@ #include "psb_config.h" #include "@METISINCFILE@" +#if 0 typedef int32_t psb_m_t; #if defined(IPK4) && defined(LPK4) @@ -22,3 +23,4 @@ typedef float psb_s_t; typedef double psb_d_t; typedef float complex psb_c_t; typedef double complex psb_z_t; +#endif