From c78e44cdc563853c250da78ee78ba622c39126b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Luc=20Peuri=C3=A8re?= Date: Wed, 9 Mar 2005 19:45:59 +0000 Subject: big warning hunt commit lot of casts, added prototypes, missing includes and some true errors --- intern/opennl/superlu/get_perm_c.c | 6 +++--- intern/opennl/superlu/lsame.c | 3 +++ intern/opennl/superlu/memory.c | 4 ++++ intern/opennl/superlu/mmd.c | 6 ++++++ intern/opennl/superlu/sp_preorder.c | 3 +++ intern/opennl/superlu/ssp_defs.h | 3 +++ intern/opennl/superlu/superlu_timer.c | 2 ++ intern/opennl/superlu/sutil.c | 8 ++++++++ intern/opennl/superlu/util.c | 6 ++++++ intern/opennl/superlu/xerbla.c | 1 + 10 files changed, 39 insertions(+), 3 deletions(-) (limited to 'intern/opennl/superlu') diff --git a/intern/opennl/superlu/get_perm_c.c b/intern/opennl/superlu/get_perm_c.c index 9cdf5a876bf..e255b4a76bd 100644 --- a/intern/opennl/superlu/get_perm_c.c +++ b/intern/opennl/superlu/get_perm_c.c @@ -12,7 +12,7 @@ extern int genmmd_(int *, int *, int *, int *, int *, int *, int *, int *, int *, int *, int *, int *); -void +static void get_colamd( const int m, /* number of rows in matrix A. */ const int n, /* number of columns in matrix A. */ @@ -47,7 +47,7 @@ get_colamd( SUPERLU_FREE(p); } -void +static void getata( const int m, /* number of rows in matrix A. */ const int n, /* number of columns in matrix A. */ @@ -189,7 +189,7 @@ getata( } -void +static void at_plus_a( const int n, /* number of columns in matrix A. */ const int nz, /* number of nonzeros in matrix A */ diff --git a/intern/opennl/superlu/lsame.c b/intern/opennl/superlu/lsame.c index 29f27d38fa9..79fb4d428a5 100644 --- a/intern/opennl/superlu/lsame.c +++ b/intern/opennl/superlu/lsame.c @@ -1,3 +1,6 @@ +int lsame_(char *, char *); + + int lsame_(char *ca, char *cb) { /* -- LAPACK auxiliary routine (version 2.0) -- diff --git a/intern/opennl/superlu/memory.c b/intern/opennl/superlu/memory.c index 54d863ea9e9..279b60b5239 100644 --- a/intern/opennl/superlu/memory.c +++ b/intern/opennl/superlu/memory.c @@ -10,6 +10,10 @@ #include "ssp_defs.h" +/* prototypes --------------------------------- */ +void copy_mem_int(int, void *, void *); +void user_bcopy(char *, char *, int); + #if ( DEBUGlevel>=1 ) /* Debug malloc/free. */ int superlu_malloc_total = 0; diff --git a/intern/opennl/superlu/mmd.c b/intern/opennl/superlu/mmd.c index 05f26ce0995..cc45aea7b41 100644 --- a/intern/opennl/superlu/mmd.c +++ b/intern/opennl/superlu/mmd.c @@ -1,6 +1,12 @@ typedef int shortint; + +/* prototypes -------------------- */ +int genmmd_(int *, int *, int *, int *, int *, int *, int *, + int *, int *, int *, int *, int *); + + /* *************************************************************** */ /* *************************************************************** */ /* **** GENMMD ..... MULTIPLE MINIMUM EXTERNAL DEGREE **** */ diff --git a/intern/opennl/superlu/sp_preorder.c b/intern/opennl/superlu/sp_preorder.c index f82da2de1aa..c40ebc9a4f7 100644 --- a/intern/opennl/superlu/sp_preorder.c +++ b/intern/opennl/superlu/sp_preorder.c @@ -1,5 +1,8 @@ #include "ssp_defs.h" +int check_perm(char *, int , int *); + + void sp_preorder(superlu_options_t *options, SuperMatrix *A, int *perm_c, int *etree, SuperMatrix *AC) diff --git a/intern/opennl/superlu/ssp_defs.h b/intern/opennl/superlu/ssp_defs.h index 5b4e86b175b..61b324e74d8 100644 --- a/intern/opennl/superlu/ssp_defs.h +++ b/intern/opennl/superlu/ssp_defs.h @@ -225,7 +225,10 @@ extern void sPrint_SuperNode_Matrix(char *, SuperMatrix *); extern void sPrint_Dense_Matrix(char *, SuperMatrix *); extern void print_lu_col(char *, int, int, int *, GlobalLU_t *); extern void check_tempv(int, float *); +extern int print_int_vec(char *what, int n, int *vec); +extern int sp_symetree(int *acolst, int *acolend, int *arow, int n, int *parent); + #ifdef __cplusplus } #endif diff --git a/intern/opennl/superlu/superlu_timer.c b/intern/opennl/superlu/superlu_timer.c index 798fd59d4ea..4f68f3a7f1a 100644 --- a/intern/opennl/superlu/superlu_timer.c +++ b/intern/opennl/superlu/superlu_timer.c @@ -11,6 +11,8 @@ /* We want this flag, safer than putting in build system */ #define NO_TIMER +double SuperLU_timer_ (); + #ifdef SUN /* * It uses the system call gethrtime(3C), which is accurate to diff --git a/intern/opennl/superlu/sutil.c b/intern/opennl/superlu/sutil.c index 4689f34968a..78f0b8bc5cc 100644 --- a/intern/opennl/superlu/sutil.c +++ b/intern/opennl/superlu/sutil.c @@ -22,6 +22,14 @@ #include #include "ssp_defs.h" +/* prototypes */ +void sprint_lu_col(char *msg, int jcol, int pivrow, int *xprune, GlobalLU_t *Glu); +void scheck_tempv(int n, float *tempv); +void sPrintPerf(SuperMatrix *, SuperMatrix *, mem_usage_t *,float , float , + float *, float *, char *, SuperLUStat_t *); +int print_float_vec(char *what, int n, float *vec); +/* ********** */ + void sCreate_CompCol_Matrix(SuperMatrix *A, int m, int n, int nnz, float *nzval, int *rowind, int *colptr, diff --git a/intern/opennl/superlu/util.c b/intern/opennl/superlu/util.c index 3c49d714d1c..824cabacee5 100644 --- a/intern/opennl/superlu/util.c +++ b/intern/opennl/superlu/util.c @@ -22,6 +22,12 @@ #include "ssp_defs.h" #include "util.h" +/* prototypes */ +flops_t LUFactFlops(SuperLUStat_t *stat); +flops_t LUSolveFlops(SuperLUStat_t *stat); +float SpaSize(int n, int np, float sum_npw); +float DenseSize(int n, float sum_nw); + /* * Global statistics variale */ diff --git a/intern/opennl/superlu/xerbla.c b/intern/opennl/superlu/xerbla.c index cb94fa71d95..68cef9d84e4 100644 --- a/intern/opennl/superlu/xerbla.c +++ b/intern/opennl/superlu/xerbla.c @@ -1,5 +1,6 @@ #include +int xerbla_(char *, int *); /* Subroutine */ int xerbla_(char *srname, int *info) { -- cgit v1.2.3