Split type definitions from psb_config

base/modules/Makefile

@@ -124,7 +124,7 @@ FINCLUDES=$(FMFLAG)$(LIBDIR) $(FMFLAG). $(FIFLAG).
 
 objs:  $(MODULES) $(OBJS) $(MPFOBJS)
 	/bin/cp -p $(CPUPDFLAG) *$(.mod) $(MODDIR)
-	/bin/cp -p $(CPUPDFLAG) psb_config.h $(INCDIR)
+	/bin/cp -p $(CPUPDFLAG) psb_config.h psb_types.h $(INCDIR)
 
 lib: objs  $(LIBDIR)/$(LIBNAME) 
 

base/modules/psb_config.h.in

@@ -1,15 +1,6 @@
 #ifndef PSB_CONFIG_H
 #define PSB_CONFIG_H
 
-#include <stdint.h>
-
-#ifdef  __cplusplus
-#include <complex>
-#else
-#include <math.h>
-#include <complex.h>
-#endif
-
 #define PSB_ERR_ERROR  -1
 #define PSB_ERR_SUCCESS 0
 
@@ -35,30 +26,4 @@
 
 
 
-  typedef int32_t psb_m_t;
-
-#if defined(PSB_IPK4) &&  defined(PSB_LPK4)
-  typedef int32_t psb_i_t;
-  typedef int32_t psb_l_t;
-#elif defined(PSB_IPK4) &&  defined(PSB_LPK8)
-  typedef int32_t psb_i_t;
-  typedef int64_t psb_l_t;
-#elif defined(PSB_IPK8) &&  defined(PSB_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;
-
-#ifdef  __cplusplus
-   typedef std::complex<float> psb_c_t;
-   typedef std::complex<double> psb_z_t;
-#else
-   typedef float complex psb_c_t;
-   typedef double complex psb_z_t;
-#endif
-
 #endif

base/modules/psb_fakempi.h

@@ -1,6 +1,7 @@
 #ifndef PSB_FAKEMPI_H
 #define PSB_FAKEMPI_H
 #include "psb_config.h"
+#include "psb_types.h"
 
 #define MPI_INTEGER        1
 #define MPI_INTEGER8       2

base/modules/psb_types.h

@@ -0,0 +1,38 @@
+#ifndef PSB_TYPES_H
+#define PSB_TYPES_H
+
+
+#include <stdint.h>
+
+#ifdef  __cplusplus
+#include <complex>
+#else
+#include <math.h>
+#include <complex.h>
+#endif
+  typedef int32_t psb_m_t;
+
+#if defined(PSB_IPK4) &&  defined(PSB_LPK4)
+  typedef int32_t psb_i_t;
+  typedef int32_t psb_l_t;
+#elif defined(PSB_IPK4) &&  defined(PSB_LPK8)
+  typedef int32_t psb_i_t;
+  typedef int64_t psb_l_t;
+#elif defined(PSB_IPK8) &&  defined(PSB_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;
+
+#ifdef  __cplusplus
+   typedef std::complex<float> psb_c_t;
+   typedef std::complex<double> psb_z_t;
+#else
+   typedef float complex psb_c_t;
+   typedef double complex psb_z_t;
+#endif
+#endif

cbind/base/psb_c_base.h

@@ -14,6 +14,7 @@ extern "C" {
 #include <stdbool.h>
 
 #include "psb_config.h"
+#include "psb_types.h"
 
 
   typedef struct PSB_C_DESCRIPTOR {

cuda/cintrf.h

@@ -36,6 +36,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include "psb_config.h"
+#include "psb_types.h"
 #include "core.h"
 
 #define ELL_PITCH_ALIGN_S 32

cuda/spgpu/core.h

@@ -47,6 +47,7 @@
  */
 
 #include "psb_config.h"
+#include "psb_types.h"
 #include "driver_types.h"
 #include "cuComplex.h"
  

test/pargen/runs/ppde.inp

@@ -2,7 +2,7 @@
 BICGSTAB               Iterative method BICGSTAB CGS  BICG BICGSTABL RGMRES FCG CGR RICHARDSON
 BJAC                   Preconditioner NONE  DIAG  BJAC 
 CSR                    Storage format for matrix A:  CSR COO 
-200                    Domain size (acutal system is this**3 (pde3d) or **2 (pde2d) )
+100                    Domain size (acutal system is this**3 (pde3d) or **2 (pde2d) )
 3                      Partition: 1 BLOCK  3 3D
 2                      Stopping criterion 1 2 
 0200                   MAXIT

util/psb_amd_order.c

@@ -30,6 +30,7 @@
  
 */
 #include "psb_config.h"
+#include "psb_types.h"
 #ifdef PSB_HAVE_AMD
 #include "amd.h"
 #endif

util/psb_metis_int.h.in

@@ -1,6 +1,7 @@
 #include <math.h>
 #include <complex.h>
 #include "psb_config.h"
+#include "psb_types.h"
 #if defined(PSB_HAVE_METIS)
 #include "@METISINCFILE@"
 #endif