From f268a411e86a951ba925997ed58a7087c1b76d3f Mon Sep 17 00:00:00 2001 From: Salvatore Filippone Date: Wed, 22 Jul 2020 10:17:06 +0200 Subject: [PATCH] Begin reworking Metis interface --- util/Makefile | 2 +- util/{metis_int.c => psb_metis_int.c} | 20 +++++++++++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) rename util/{metis_int.c => psb_metis_int.c} (77%) diff --git a/util/Makefile b/util/Makefile index 0f572e9c..3f2f3553 100644 --- a/util/Makefile +++ b/util/Makefile @@ -21,7 +21,7 @@ IMPLOBJS= psb_s_hbio_impl.o psb_d_hbio_impl.o \ psb_c_renum_impl.o psb_z_renum_impl.o psi_build_mtpart.o MODOBJS=psb_util_mod.o $(BASEOBJS) -COBJS=metis_int.o psb_amd_order.o +COBJS=psb_metis_int.o psb_amd_order.o OBJS=$(COBJS) $(MODOBJS) $(IMPLOBJS) LOCAL_MODS=$(MODOBJS:.o=$(.mod)) LIBNAME=$(UTILLIBNAME) diff --git a/util/metis_int.c b/util/psb_metis_int.c similarity index 77% rename from util/metis_int.c rename to util/psb_metis_int.c index b9d258b4..ad3abec9 100644 --- a/util/metis_int.c +++ b/util/psb_metis_int.c @@ -2,7 +2,25 @@ #if defined(HAVE_METIS_) #include "metis.h" -/* extern int METIS_PartGraphKway(int *, int *, int *, int *, int *, int *, int *, int *, float *, float, int *, int *, int *); */ +typedef int32_t psb_m_t; + +#if defined(IPK4) && defined(LPK4) +typedef int32_t psb_i_t; +typedef int32_t psb_l_t; +#elif defined(IPK4) && defined(LPK8) +typedef int32_t psb_i_t; +typedef int64_t psb_l_t; +#elif defined(IPK8) && defined(LPK8) +typedef int64_t psb_i_t; +typedef int64_t psb_l_t; +#else +#endif +typedef int64_t psb_e_t; + +typedef float psb_s_t; +typedef double psb_d_t; +typedef float complex psb_c_t; +typedef double complex psb_z_t; int metis_PartGraphKway_C(int *n, int *ixadj, int *iadj, int *ivwg,