major attempt to make ssids_64 work

ralna · Feb 4, 2024 · d5af99e · d5af99e
1 parent 749e8d0
commit d5af99e
Show file tree

Hide file tree

Showing 66 changed files with 2,806 additions and 2,530 deletions.
diff --git a/include/galahad_blas.h b/include/galahad_blas.h
@@ -1,6 +1,6 @@
-#ifdef GALAHAD_64BIT_INTEGER
+#ifdef INTEGER_64
 #define GALAHAD_BLAS_interface GALAHAD_BLAS_interface_64
-#ifdef GALAHAD_NO_UNDERSCORE_64BIT_INTEGER
+#ifdef NO_UNDERSCORE_INTEGER_64
 #define DASUM  DASUM64
 #define DCABS1 DCABS164
 #define DDOT   DDOT64
@@ -69,7 +69,7 @@
 #define ZTRMM  ZTRMM64
 #define ZTRMV  ZTRMV64
 #define ZTRSM  ZTRSM64
-#elif GALAHAD_DOUBLE_UNDERSCORE_64BIT_INTEGER
+#elif DOUBLE_UNDERSCORE_INTEGER_64
 #define DASUM  DASUM__64
 #define DCABS1 DCABS1__64
 #define DDOT   DDOT__64
@@ -138,7 +138,7 @@
 #define ZTRMM  ZTRMM__64
 #define ZTRMV  ZTRMV__64
 #define ZTRSM  ZTRSM__64
-#elif GALAHAD_NO_SYMBOL_64BIT_INTEGER
+#elif NO_SYMBOL_INTEGER_64
 #else
 #define DASUM  DASUM_64
 #define DCABS1 DCABS1_64

diff --git a/include/galahad_blas_original.h b/include/galahad_blas_original.h
@@ -1,6 +1,6 @@
-#ifdef GALAHAD_64BIT_INTEGER
+#ifdef INTEGER_64
 #define GALAHAD_BLAS_interface GALAHAD_BLAS_interface_64
-#ifdef GALAHAD_NO_UNDERSCORE_64BIT_INTEGER
+#ifdef NO_UNDERSCORE_INTEGER_64
 #define SNRM2 SNRM264
 #define DNRM2 DNRM264
 #define ISAMAX ISAMAX64
@@ -25,7 +25,7 @@
 #define DGEMM DGEMM64
 #define SGER SGER64
 #define DGER DGER64
-#elif GALAHAD_DOUBLE_UNDERSCORE_64BIT_INTEGER
+#elif DOUBLE_UNDERSCORE_INTEGER_64
 #define SNRM2 SNRM2__64
 #define DNRM2 DNRM2__64
 #define ISAMAX ISAMAX__64
@@ -50,7 +50,7 @@
 #define DGEMM DGEMM__64
 #define SGER SGER__64
 #define DGER DGER__64
-#elif GALAHAD_NO_SYMBOL_64BIT_INTEGER
+#elif NO_SYMBOL_INTEGER_64
 #define SNRM2 SNRM2
 #define DNRM2 DNRM2
 #define ISAMAX ISAMAX

diff --git a/include/galahad_kinds.h b/include/galahad_kinds.h
@@ -1,4 +1,4 @@
-#ifdef GALAHAD_64BIT_INTEGER
+#ifdef INTEGER_64
 #define GALAHAD_KINDS_single GALAHAD_KINDS_single_64
 #define GALAHAD_KINDS_double GALAHAD_KINDS_double_64
 #endif
diff --git a/include/galahad_lapack.h b/include/galahad_lapack.h
@@ -1,7 +1,7 @@
 #include "galahad_blas.h"
-#ifdef GALAHAD_64BIT_INTEGER
+#ifdef INTEGER_64
 #define GALAHAD_LAPACK_interface GALAHAD_LAPACK_interface_64
-#ifdef GALAHAD_NO_UNDERSCORE_64BIT_INTEGER
+#ifdef NO_UNDERSCORE_INTEGER_64
 #define DISNAN DISNAN64
 #define DLADIV DLADIV64
 #define DLAISN DLAISN64
@@ -275,7 +275,7 @@
 #define ZLARFB ZLARFB64
 #define ZLARFG ZLARFG64
 #define ZLARFT ZLARFT64
-#elif GALAHAD_DOUBLE_UNDERSCORE_64BIT_INTEGER
+#elif DOUBLE_UNDERSCORE_INTEGER_64
 #define DISNAN DISNAN__64
 #define DLADIV DLADIV__64
 #define DLAISN DLAISN__64
@@ -549,7 +549,7 @@
 #define ZLARFB ZLARFB__64
 #define ZLARFG ZLARFG__64
 #define ZLARFT ZLARFT__64
-#elif GALAHAD_NO_SYMBOL_64BIT_INTEGER
+#elif NO_SYMBOL_INTEGER_64
 #else
 #define DISNAN DISNAN_64
 #define DLADIV DLADIV_64

diff --git a/include/galahad_lapack_original.h b/include/galahad_lapack_original.h
@@ -1,6 +1,6 @@
-#ifdef GALAHAD_64BIT_INTEGER
+#ifdef INTEGER_64
 #define GALAHAD_LAPACK_interface GALAHAD_LAPACK_interface_64
-#ifdef GALAHAD_NO_UNDERSCORE_64BIT_INTEGER
+#ifdef NO_UNDERSCORE_INTEGER_64
 #define SGETRF SGETRF64
 #define DGETRF DGETRF64
 #define SGETRS SGETRS64
@@ -39,7 +39,7 @@
 #define DSTERF DSTERF64
 #define SLAEV2 SLAEV264
 #define DLAEV2 DLAEV264
-#elif GALAHAD_DOUBLE_UNDERSCORE_64BIT_INTEGER
+#elif DOUBLE_UNDERSCORE_INTEGER_64
 #define SGETRF SGETRF__64
 #define DGETRF DGETRF__64
 #define SGETRS SGETRS__64
@@ -78,45 +78,7 @@
 #define DSTERF DSTERF__64
 #define SLAEV2 SLAEV2__64
 #define DLAEV2 DLAEV2__64
-#elif GALAHAD_NO_SYMBOL_64BIT_INTEGER
-#define SGETRF SGETRF
-#define DGETRF DGETRF
-#define SGETRS SGETRS
-#define DGETRS DGETRS
-#define SGELS  SGELS
-#define DGELS  DGELS
-#define SGELSY SGELSY
-#define DGELSY DGELSY
-#define SGELSS SGELSS
-#define DGELSS DGELSS
-#define SGELSD SGELSD
-#define DGELSD DGELSD
-#define SGESVD SGESVD
-#define DGESVD DGESVD
-#define SPTTRF SPTTRF
-#define DPTTRF DPTTRF
-#define SPOTRF SPOTRF
-#define DPOTRF DPOTRF
-#define SPOTRS SPOTRS
-#define DPOTRS DPOTRS
-#define SSYTRF SSYTRF
-#define DSYTRF DSYTRF
-#define SSYTRS SSYTRS
-#define DSYTRS DSYTRS
-#define SPBTRF SPBTRF
-#define DPBTRF DPBTRF
-#define SPBTRS SPBTRS
-#define DPBTRS DPBTRS
-#define SSYEV  SSYEV
-#define DSYEV  DSYEV
-#define SSYGV  SSYGV
-#define DSYGV  DSYGV
-#define SHSEQR SHSEQR
-#define DHSEQR DHSEQR
-#define SSTERF SSTERF
-#define DSTERF DSTERF
-#define SLAEV2 SLAEV2
-#define DLAEV2 DLAEV2
+#elif NO_SYMBOL_INTEGER_64
 #else
 #define SGETRF SGETRF_64
 #define DGETRF DGETRF_64

diff --git a/include/galahad_modules.h b/include/galahad_modules.h
@@ -1,12 +1,12 @@
-#ifdef GALAHAD_64BIT_INTEGER
+#ifdef INTEGER_64
 #define GALAHAD_BLAS_interface GALAHAD_BLAS_interface_64
 #define GALAHAD_LAPACK_interface GALAHAD_LAPACK_interface_64
 #define GALAHAD_KINDS_single GALAHAD_KINDS_single_64
 #define GALAHAD_KINDS_double GALAHAD_KINDS_double_64
 #endif
 
 #ifdef GALAHAD_SINGLE
-#ifdef GALAHAD_64BIT_INTEGER
+#ifdef INTEGER_64
 
 #define CUTEst_interface_precision CUTEST_interface_single_64
 #define CUTEST_interface_precision CUTEST_interface_single_64
@@ -743,7 +743,7 @@
 
 #else
 
-#ifdef GALAHAD_64BIT_INTEGER
+#ifdef INTEGER_64
 
 #define CUTEst_interface_precision CUTEST_interface_double_64
 #define CUTEST_interface_precision CUTEST_interface_double_64
@@ -1479,7 +1479,7 @@
 #ifdef GALAHAD_SINGLE
 #define mumps_struc smumps_struc
 #define MUMPS_STRUC SMUMPS_STRUC
-#ifdef GALAHAD_64BIT_INTEGER
+#ifdef INTEGER_64
 #define GALAHAD_MUMPS_TYPES_precision GALAHAD_MUMPS_TYPES_single_64
 #ifdef DUMMY_SMUMPS
 #define MUMPS_precision GALAHAD_SMUMPS_64
@@ -1497,7 +1497,7 @@
 #else
 #define mumps_struc dmumps_struc
 #define MUMPS_STRUC DMUMPS_STRUC
-#ifdef GALAHAD_64BIT_INTEGER
+#ifdef INTEGER_64
 #define GALAHAD_MUMPS_TYPES_precision GALAHAD_MUMPS_TYPES_double_64
 #ifdef DUMMY_DMUMPS
 #define MUMPS_precision GALAHAD_DMUMPS_64

diff --git a/include/metis.h b/include/metis.h
@@ -30,7 +30,7 @@
  GCC does provides these definitions in stdint.h, but it may require some
  modifications on other architectures.
 --------------------------------------------------------------------------*/
-#ifdef GALAHAD_64BIT_INTEGER
+#ifdef INTEGER_64
   #define IDXTYPEWIDTH 64
 #else
   #define IDXTYPEWIDTH 32

diff --git a/include/spral_procedures.h b/include/spral_procedures.h
@@ -1,13 +1,13 @@
 #ifdef GALAHAD_SINGLE
-#ifdef GALAHAD_64BIT_INTEGER
+#ifdef INTEGER_64
 #define GALAHAD_KINDS_precision galahad_kinds_single_64
 #define SPRAL_SSIDS_precision spral_ssids_single_64
 #else
 #define GALAHAD_KINDS_precision galahad_kinds_single
 #define SPRAL_SSIDS_precision spral_ssids_single
 #endif
 #else
-#ifdef GALAHAD_64BIT_INTEGER
+#ifdef INTEGER_64
 #define GALAHAD_KINDS_precision galahad_kinds_double_64
 #define SPRAL_SSIDS_precision spral_ssids_double_64
 #else
@@ -16,13 +16,13 @@
 #endif
 #endif
 
-#ifdef SPRAL_64BIT_INTEGER
+#ifdef INTEGER_64
 #define spral_ssids_lapack_iface spral_ssids_lapack_iface_64
 #define spral_ssids_blas_iface spral_ssids_blas_iface_64
 #endif
 
 #ifdef SPRAL_SINGLE
-#ifdef SPRAL_64BIT_INTEGER
+#ifdef INTEGER_64
 #define SPRAL_KINDS_precision spral_kinds_single_64
 #define spral_kinds_precision spral_kinds_single_64
 #define spral_ssids_precision spral_ssids_single_64
@@ -66,7 +66,7 @@
 #define spral_matrix_util_precision spral_matrix_util_single
 #endif
 #else
-#ifdef SPRAL_64BIT_INTEGER
+#ifdef INTEGER_64
 #define SPRAL_KINDS_precision spral_kinds_double_64
 #define spral_kinds_precision spral_kinds_double_64
 #define spral_ssids_precision spral_ssids_double_64