Merge pull request xiaoyeli#19 from jschueller/longint

CMake: Add LONGINT option
OpenCMISS-Dependencies2 · Jul 5, 2024 · 9e23fe7 · 9e23fe7
2 parents b36a4a4 + cab0f6d
commit 9e23fe7
Show file tree

Hide file tree

Showing 40 changed files with 103 additions and 63 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -15,7 +15,7 @@ jobs:
     - name: Build
       run: |
         cmake -DCMAKE_C_FLAGS="-Wall -Wextra -Wpedantic" -DCMAKE_INSTALL_PREFIX=$PWD/install .
-        make -j2
+        make -j4
     - name: Test
-      run: ctest -R LA --output-on-failure -j2 --schedule-random --timeout 500
+      run: ctest --output-on-failure -j4 --schedule-random --timeout 500
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -102,6 +102,7 @@ else ()
   message (SEND_ERROR "invalid PLAT setting")
 endif ()
 
+option (LONGINT "use 64-bit integers for indexing sparse matrices (default is 32-bit)" OFF)
 
 enable_language(C)
 if (enable_fortran)

diff --git a/EXAMPLE/pclinsol.c b/EXAMPLE/pclinsol.c
@@ -41,7 +41,8 @@ main(int argc, char *argv[])
     trans_t  trans;
     complex   *xact, *rhs;
     superlu_memusage_t   superlu_memusage;
-    void   parse_command_line();
+    void parse_command_line(int argc, char *argv[], int_t *procs,
+                            int_t *n, int_t *b, int_t *w, int_t *r, int_t *maxsup);
 
     nrhs              = 1;
     trans             = NOTRANS;

diff --git a/EXAMPLE/pclinsolx.c b/EXAMPLE/pclinsolx.c
@@ -46,7 +46,9 @@ main(int argc, char *argv[])
     float      *ferr, *berr;
     float      u, drop_tol, rpg, rcond;
     superlu_memusage_t superlu_memusage;
-    void parse_command_line();
+    void parse_command_line(int argc, char *argv[], int_t *nprocs, int_t *lwork,
+                            int_t *w, int_t *relax, float *u, fact_t *fact, 
+                            trans_t *trans, yes_no_t *refact, equed_t *equed);
 
     /* Default parameters to control factorization. */
     nprocs = 1;
@@ -218,7 +220,7 @@ main(int argc, char *argv[])
  */
 void
 parse_command_line(int argc, char *argv[], int_t *nprocs, int_t *lwork, 
-		   int_t *w, int_t *relax, double *u, fact_t *fact, 
+		   int_t *w, int_t *relax, float *u, fact_t *fact, 
 		   trans_t *trans, yes_no_t *refact, equed_t *equed)
 {
     int c;

diff --git a/EXAMPLE/pclinsolx1.c b/EXAMPLE/pclinsolx1.c
@@ -55,7 +55,9 @@ main(int argc, char *argv[])
     float      *ferr, *berr;
     float      u, drop_tol, rpg, rcond;
     superlu_memusage_t superlu_memusage;
-    void parse_command_line();
+    void parse_command_line(int argc, char *argv[], int_t *nprocs, int_t *lwork, 
+                            int_t *w, int_t *relax, float *u, fact_t *fact, 
+                            trans_t *trans, yes_no_t *refact, equed_t *equed);
 
     /* Default parameters to control factorization. */
     nprocs = 1;
@@ -276,7 +278,7 @@ main(int argc, char *argv[])
  */
 void
 parse_command_line(int argc, char *argv[], int_t *nprocs, int_t *lwork, 
-		   int_t *w, int_t *relax, double *u, fact_t *fact, 
+		   int_t *w, int_t *relax, float *u, fact_t *fact, 
 		   trans_t *trans, yes_no_t *refact, equed_t *equed)
 {
     int c;

diff --git a/EXAMPLE/pclinsolx2.c b/EXAMPLE/pclinsolx2.c
@@ -54,7 +54,9 @@ main(int argc, char *argv[])
     float      *ferr, *berr;
     float      u, drop_tol, rpg, rcond;
     superlu_memusage_t superlu_memusage;
-    void parse_command_line();
+    void parse_command_line(int argc, char *argv[], int_t *nprocs, int_t *lwork, 
+                            int_t *w, int_t *relax, float *u, fact_t *fact, 
+                            trans_t *trans, yes_no_t *refact, equed_t *equed);
 
     /* Default parameters to control factorization. */
     nprocs = 1;
@@ -234,7 +236,7 @@ main(int argc, char *argv[])
  */
 void
 parse_command_line(int argc, char *argv[], int_t *nprocs, int_t *lwork, 
-		   int_t *w, int_t *relax, double *u, fact_t *fact, 
+		   int_t *w, int_t *relax, float *u, fact_t *fact, 
 		   trans_t *trans, yes_no_t *refact, equed_t *equed)
 {
     int c;

diff --git a/EXAMPLE/pcrepeat.c b/EXAMPLE/pcrepeat.c
@@ -59,7 +59,7 @@ main(int argc, char *argv[])
     complex      *rhsb, *xact;
     Gstat_t Gstat;
     flops_t     flopcnt;
-    void parse_command_line();
+    void parse_command_line(int argc, char *argv[], int_t *nprocs);
 
     /* Default parameters to control factorization. */
     nprocs = 1;

diff --git a/EXAMPLE/pcspmd.c b/EXAMPLE/pcspmd.c
@@ -94,7 +94,7 @@ main(int argc, char *argv[])
     pthread_t *thread_id;
     void      *status;
 #endif
-    void parse_command_line();
+    void parse_command_line(int argc, char *argv[], int_t *nprocs);
 
     /* Default parameters to control factorization. */
     nprocs = 1;

diff --git a/EXAMPLE/pdlinsol.c b/EXAMPLE/pdlinsol.c
@@ -41,7 +41,8 @@ main(int argc, char *argv[])
     trans_t  trans;
     double   *xact, *rhs;
     superlu_memusage_t   superlu_memusage;
-    void   parse_command_line();
+    void   parse_command_line(int argc, char *argv[], int_t *procs, int_t *n,
+                              int_t *b, int_t *w, int_t *r, int_t *maxsup);
 
     nrhs              = 1;
     trans             = NOTRANS;

diff --git a/EXAMPLE/pdlinsolx.c b/EXAMPLE/pdlinsolx.c
@@ -46,7 +46,9 @@ main(int argc, char *argv[])
     double      *ferr, *berr;
     double      u, drop_tol, rpg, rcond;
     superlu_memusage_t superlu_memusage;
-    void parse_command_line();
+    void parse_command_line(int argc, char *argv[], int_t *nprocs, int_t *lwork, 
+                            int_t *w, int_t *relax, double *u, fact_t *fact, 
+                            trans_t *trans, yes_no_t *refact, equed_t *equed);
 
     /* Default parameters to control factorization. */
     nprocs = 1;

diff --git a/EXAMPLE/pdlinsolx1.c b/EXAMPLE/pdlinsolx1.c
@@ -55,7 +55,9 @@ main(int argc, char *argv[])
     double      *ferr, *berr;
     double      u, drop_tol, rpg, rcond;
     superlu_memusage_t superlu_memusage;
-    void parse_command_line();
+    void parse_command_line(int argc, char *argv[], int_t *nprocs, int_t *lwork, 
+                            int_t *w, int_t *relax, double *u, fact_t *fact, 
+                            trans_t *trans, yes_no_t *refact, equed_t *equed);
 
     /* Default parameters to control factorization. */
     nprocs = 1;

diff --git a/EXAMPLE/pdlinsolx2.c b/EXAMPLE/pdlinsolx2.c
@@ -54,7 +54,9 @@ main(int argc, char *argv[])
     double      *ferr, *berr;
     double      u, drop_tol, rpg, rcond;
     superlu_memusage_t superlu_memusage;
-    void parse_command_line();
+    void parse_command_line(int argc, char *argv[], int_t *nprocs, int_t *lwork, 
+                            int_t *w, int_t *relax, double *u, fact_t *fact, 
+                            trans_t *trans, yes_no_t *refact, equed_t *equed);
 
     /* Default parameters to control factorization. */
     nprocs = 1;

diff --git a/EXAMPLE/pdrepeat.c b/EXAMPLE/pdrepeat.c
@@ -59,7 +59,7 @@ main(int argc, char *argv[])
     double      *rhsb, *xact;
     Gstat_t Gstat;
     flops_t     flopcnt;
-    void parse_command_line();
+    void parse_command_line(int argc, char *argv[], int_t *nprocs);
 
     /* Default parameters to control factorization. */
     nprocs = 1;

diff --git a/EXAMPLE/pdspmd.c b/EXAMPLE/pdspmd.c
@@ -94,7 +94,7 @@ main(int argc, char *argv[])
     pthread_t *thread_id;
     void      *status;
 #endif
-    void parse_command_line();
+    void parse_command_line(int argc, char *argv[], int_t *nprocs);
 
     /* Default parameters to control factorization. */
     nprocs = 1;

diff --git a/EXAMPLE/pslinsol.c b/EXAMPLE/pslinsol.c
@@ -41,7 +41,8 @@ main(int argc, char *argv[])
     trans_t  trans;
     float   *xact, *rhs;
     superlu_memusage_t   superlu_memusage;
-    void   parse_command_line();
+    void   parse_command_line(int argc, char *argv[], int_t *procs, int_t *n,
+                              int_t *b, int_t *w, int_t *r, int_t *maxsup);
 
     nrhs              = 1;
     trans             = NOTRANS;

diff --git a/EXAMPLE/pslinsolx.c b/EXAMPLE/pslinsolx.c
@@ -46,7 +46,9 @@ main(int argc, char *argv[])
     float      *ferr, *berr;
     float      u, drop_tol, rpg, rcond;
     superlu_memusage_t superlu_memusage;
-    void parse_command_line();
+    void parse_command_line(int argc, char *argv[], int_t *nprocs, int_t *lwork, 
+                            int_t *w, int_t *relax, float *u, fact_t *fact, 
+                            trans_t *trans, yes_no_t *refact, equed_t *equed);
 
     /* Default parameters to control factorization. */
     nprocs = 1;
@@ -218,7 +220,7 @@ main(int argc, char *argv[])
  */
 void
 parse_command_line(int argc, char *argv[], int_t *nprocs, int_t *lwork, 
-		   int_t *w, int_t *relax, double *u, fact_t *fact, 
+		   int_t *w, int_t *relax, float *u, fact_t *fact, 
 		   trans_t *trans, yes_no_t *refact, equed_t *equed)
 {
     int c;

diff --git a/EXAMPLE/pslinsolx1.c b/EXAMPLE/pslinsolx1.c
@@ -55,7 +55,9 @@ main(int argc, char *argv[])
     float      *ferr, *berr;
     float      u, drop_tol, rpg, rcond;
     superlu_memusage_t superlu_memusage;
-    void parse_command_line();
+    void parse_command_line(int argc, char *argv[], int_t *nprocs, int_t *lwork, 
+                            int_t *w, int_t *relax, float *u, fact_t *fact, 
+                            trans_t *trans, yes_no_t *refact, equed_t *equed);
 
     /* Default parameters to control factorization. */
     nprocs = 1;
@@ -276,7 +278,7 @@ main(int argc, char *argv[])
  */
 void
 parse_command_line(int argc, char *argv[], int_t *nprocs, int_t *lwork, 
-		   int_t *w, int_t *relax, double *u, fact_t *fact, 
+		   int_t *w, int_t *relax, float *u, fact_t *fact, 
 		   trans_t *trans, yes_no_t *refact, equed_t *equed)
 {
     int c;

diff --git a/EXAMPLE/pslinsolx2.c b/EXAMPLE/pslinsolx2.c
@@ -54,7 +54,9 @@ main(int argc, char *argv[])
     float      *ferr, *berr;
     float      u, drop_tol, rpg, rcond;
     superlu_memusage_t superlu_memusage;
-    void parse_command_line();
+    void parse_command_line(int argc, char *argv[], int_t *nprocs, int_t *lwork, 
+                            int_t *w, int_t *relax, float *u, fact_t *fact, 
+                            trans_t *trans, yes_no_t *refact, equed_t *equed);
 
     /* Default parameters to control factorization. */
     nprocs = 1;
@@ -234,7 +236,7 @@ main(int argc, char *argv[])
  */
 void
 parse_command_line(int argc, char *argv[], int_t *nprocs, int_t *lwork, 
-		   int_t *w, int_t *relax, double *u, fact_t *fact, 
+		   int_t *w, int_t *relax, float *u, fact_t *fact, 
 		   trans_t *trans, yes_no_t *refact, equed_t *equed)
 {
     int c;

diff --git a/EXAMPLE/psrepeat.c b/EXAMPLE/psrepeat.c
@@ -59,7 +59,7 @@ main(int argc, char *argv[])
     float      *rhsb, *xact;
     Gstat_t Gstat;
     flops_t     flopcnt;
-    void parse_command_line();
+    void parse_command_line(int argc, char *argv[], int_t *nprocs);
 
     /* Default parameters to control factorization. */
     nprocs = 1;

diff --git a/EXAMPLE/psspmd.c b/EXAMPLE/psspmd.c
@@ -94,7 +94,7 @@ main(int argc, char *argv[])
     pthread_t *thread_id;
     void      *status;
 #endif
-    void parse_command_line();
+    void parse_command_line(int argc, char *argv[], int_t *nprocs);
 
     /* Default parameters to control factorization. */
     nprocs = 1;

diff --git a/EXAMPLE/pzlinsol.c b/EXAMPLE/pzlinsol.c
@@ -41,7 +41,8 @@ main(int argc, char *argv[])
     trans_t  trans;
     doublecomplex   *xact, *rhs;
     superlu_memusage_t   superlu_memusage;
-    void   parse_command_line();
+    void parse_command_line(int argc, char *argv[], int_t *procs, int_t *n,
+                            int_t *b, int_t *w, int_t *r, int_t *maxsup);
 
     nrhs              = 1;
     trans             = NOTRANS;

diff --git a/EXAMPLE/pzlinsolx.c b/EXAMPLE/pzlinsolx.c
@@ -46,7 +46,9 @@ main(int argc, char *argv[])
     double      *ferr, *berr;
     double      u, drop_tol, rpg, rcond;
     superlu_memusage_t superlu_memusage;
-    void parse_command_line();
+    void parse_command_line(int argc, char *argv[], int_t *nprocs, int_t *lwork, 
+                            int_t *w, int_t *relax, double *u, fact_t *fact, 
+                            trans_t *trans, yes_no_t *refact, equed_t *equed);
 
     /* Default parameters to control factorization. */
     nprocs = 1;

diff --git a/EXAMPLE/pzlinsolx1.c b/EXAMPLE/pzlinsolx1.c
@@ -55,8 +55,9 @@ main(int argc, char *argv[])
     double      *ferr, *berr;
     double      u, drop_tol, rpg, rcond;
     superlu_memusage_t superlu_memusage;
-    void parse_command_line();
-
+    void parse_command_line(int argc, char *argv[], int_t *nprocs, int_t *lwork, 
+                            int_t *w, int_t *relax, double *u, fact_t *fact, 
+                            trans_t *trans, yes_no_t *refact, equed_t *equed);
     /* Default parameters to control factorization. */
     nprocs = 1;
     fact  = EQUILIBRATE;

diff --git a/EXAMPLE/pzlinsolx2.c b/EXAMPLE/pzlinsolx2.c
@@ -54,7 +54,9 @@ main(int argc, char *argv[])
     double      *ferr, *berr;
     double      u, drop_tol, rpg, rcond;
     superlu_memusage_t superlu_memusage;
-    void parse_command_line();
+    void parse_command_line(int argc, char *argv[], int_t *nprocs, int_t *lwork, 
+                            int_t *w, int_t *relax, double *u, fact_t *fact, 
+                            trans_t *trans, yes_no_t *refact, equed_t *equed);
 
     /* Default parameters to control factorization. */
     nprocs = 1;

diff --git a/EXAMPLE/pzrepeat.c b/EXAMPLE/pzrepeat.c
@@ -59,7 +59,7 @@ main(int argc, char *argv[])
     doublecomplex      *rhsb, *xact;
     Gstat_t Gstat;
     flops_t     flopcnt;
-    void parse_command_line();
+    void parse_command_line(int argc, char *argv[], int_t *nprocs);
 
     /* Default parameters to control factorization. */
     nprocs = 1;

diff --git a/EXAMPLE/pzspmd.c b/EXAMPLE/pzspmd.c
@@ -94,7 +94,7 @@ main(int argc, char *argv[])
     pthread_t *thread_id;
     void      *status;
 #endif
-    void parse_command_line();
+    void parse_command_line(int argc, char *argv[], int_t *nprocs);
 
     /* Default parameters to control factorization. */
     nprocs = 1;

diff --git a/SRC/CMakeLists.txt b/SRC/CMakeLists.txt
@@ -20,6 +20,10 @@ elseif (PLAT STREQUAL "_OPENMP")
   target_link_libraries (superlu_mt${PLAT} PRIVATE OpenMP::OpenMP_C)
 endif ()
 
+if (LONGINT)
+  target_compile_definitions (superlu_mt${PLAT} PUBLIC _LONGINT)
+endif ()
+
 target_include_directories (superlu_mt${PLAT} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
 target_include_directories (superlu_mt${PLAT} INTERFACE $<INSTALL_INTERFACE:include>)
 install (TARGETS superlu_mt${PLAT} DESTINATION ${CMAKE_INSTALL_LIBDIR})

diff --git a/SRC/creadmt.c b/SRC/creadmt.c
@@ -40,8 +40,8 @@ creadmt(int_t *m, int_t *n, int_t *nonz, complex **nzval, int_t **rowind, int_t
     int    lasta;
     char   title[TLEN];
     complex *a;
-    int    *asub;
-    int    *xa;
+    int_t    *asub;
+    int_t    *xa;
 
     /* 	Matrix format:
      *         up to 60 characters           title

diff --git a/SRC/dreadmt.c b/SRC/dreadmt.c
@@ -40,8 +40,8 @@ dreadmt(int_t *m, int_t *n, int_t *nonz, double **nzval, int_t **rowind, int_t *
     int    lasta;
     char   title[TLEN];
     double *a;
-    int    *asub;
-    int    *xa;
+    int_t    *asub;
+    int_t    *xa;
 
     /* 	Matrix format:
      *         up to 60 characters           title

diff --git a/SRC/slu_mt_cdefs.h b/SRC/slu_mt_cdefs.h
@@ -468,7 +468,7 @@ extern int_t  Glu_alloc (const int_t, const int_t, const int_t, const MemType,
    -------------------*/
 extern double  SuperLU_timer_();
 extern int_t     sp_ienv(int_t);
-extern double  slamch_();
+extern double  slamch_(char *);
 extern int     lsame_(char *, char *);
 extern int     xerbla_(char *, int *);
 extern void    superlu_abort_and_exit(char *);

diff --git a/SRC/slu_mt_ddefs.h b/SRC/slu_mt_ddefs.h
@@ -467,7 +467,7 @@ extern int_t  Glu_alloc (const int_t, const int_t, const int_t, const MemType,
    -------------------*/
 extern double  SuperLU_timer_();
 extern int_t     sp_ienv(int_t);
-extern double  dlamch_();
+extern double  dlamch_(char *);
 extern int     lsame_(char *, char *);
 extern int     xerbla_(char *, int *);
 extern void    superlu_abort_and_exit(char *);

diff --git a/SRC/slu_mt_sdefs.h b/SRC/slu_mt_sdefs.h
@@ -467,7 +467,7 @@ extern int_t  Glu_alloc (const int_t, const int_t, const int_t, const MemType,
    -------------------*/
 extern double  SuperLU_timer_();
 extern int_t     sp_ienv(int_t);
-extern double  slamch_();
+extern double  slamch_(char *);
 extern int     lsame_(char *, char *);
 extern int     xerbla_(char *, int *);
 extern void    superlu_abort_and_exit(char *);

diff --git a/SRC/slu_mt_zdefs.h b/SRC/slu_mt_zdefs.h
@@ -468,7 +468,7 @@ extern int_t  Glu_alloc (const int_t, const int_t, const int_t, const MemType,
    -------------------*/
 extern double  SuperLU_timer_();
 extern int_t     sp_ienv(int_t);
-extern double  dlamch_();
+extern double  dlamch_(char *);
 extern int     lsame_(char *, char *);
 extern int     xerbla_(char *, int *);
 extern void    superlu_abort_and_exit(char *);

diff --git a/SRC/sreadmt.c b/SRC/sreadmt.c
@@ -40,8 +40,8 @@ sreadmt(int_t *m, int_t *n, int_t *nonz, float **nzval, int_t **rowind, int_t **
     int    lasta;
     char   title[TLEN];
     float *a;
-    int    *asub;
-    int    *xa;
+    int_t    *asub;
+    int_t    *xa;
 
     /* 	Matrix format:
      *         up to 60 characters           title