added suffix for non-standard 64 bit integer blas/lapack routines

ralna · Jan 3, 2024 · 7bf231a · 7bf231a
1 parent d92d8d1
commit 7bf231a
Show file tree

Hide file tree

Showing 3 changed files with 179 additions and 0 deletions.
diff --git a/include/galahad_blas.h b/include/galahad_blas.h
@@ -1,4 +1,56 @@
 #ifdef GALAHAD_64BIT_INTEGER
+#define GALAHAD_BLAS_interface GALAHAD_BLAS_interface_64
+#ifdef GALAHAD_NO_UNDERSCORE_64BIT_INTEGER
+#define SNRM2 SNRM264
+#define DNRM2 DNRM264
+#define ISAMAX ISAMAX64
+#define IDAMAX IDAMAX64
+#define SROTG SROTG64
+#define DROTG DROTG64
+#define SROT SROT64
+#define DROT DROT64
+#define SSWAP SSWAP64
+#define DSWAP DSWAP64
+#define SSCAL SSCAL64
+#define DSCAL DSCAL64
+#define STRSV STRSV64
+#define DTRSV DTRSV64
+#define STRSM STRSM64
+#define DTRSM DTRSM64
+#define STBSV STBSV64
+#define DTBSV DTBSV64
+#define SGEMV SGEMV64
+#define DGEMV DGEMV64
+#define SGEMM SGEMM64
+#define DGEMM DGEMM64
+#define SGER SGER64
+#define DGER DGER64
+#elif GALAHAD_DOUBLE_UNDERSCORE_64BIT_INTEGER
+#define SNRM2 SNRM2__64
+#define DNRM2 DNRM2__64
+#define ISAMAX ISAMAX__64
+#define IDAMAX IDAMAX__64
+#define SROTG SROTG__64
+#define DROTG DROTG__64
+#define SROT SROT__64
+#define DROT DROT__64
+#define SSWAP SSWAP__64
+#define DSWAP DSWAP__64
+#define SSCAL SSCAL__64
+#define DSCAL DSCAL__64
+#define STRSV STRSV__64
+#define DTRSV DTRSV__64
+#define STRSM STRSM__64
+#define DTRSM DTRSM__64
+#define STBSV STBSV__64
+#define DTBSV DTBSV__64
+#define SGEMV SGEMV__64
+#define DGEMV DGEMV__64
+#define SGEMM SGEMM__64
+#define DGEMM DGEMM__64
+#define SGER SGER__64
+#define DGER DGER__64
+#else
 #define SNRM2 SNRM2_64
 #define DNRM2 DNRM2_64
 #define ISAMAX ISAMAX_64
@@ -24,3 +76,4 @@
 #define SGER SGER_64
 #define DGER DGER_64
 #endif
+#endif
diff --git a/include/galahad_lapack.h b/include/galahad_lapack.h
@@ -1,4 +1,84 @@
 #ifdef GALAHAD_64BIT_INTEGER
+#define GALAHAD_LAPACK_interface GALAHAD_LAPACK_interface_64
+#ifdef GALAHAD_NO_UNDERSCORE_64BIT_INTEGER
+#define SGETRF SGETRF64
+#define DGETRF DGETRF64
+#define SGETRS SGETRS64
+#define DGETRS DGETRS64
+#define SGELS  SGELS64
+#define DGELS  DGELS64
+#define SGELSY SGELSY64
+#define DGELSY DGELSY64
+#define SGELSS SGELSS64
+#define DGELSS DGELSS64
+#define SGELSD SGELSD64
+#define DGELSD DGELSD64
+#define SGESVD SGESVD64
+#define DGESVD DGESVD64
+#define SPTTRF SPTTRF64
+#define DPTTRF DPTTRF64
+#define SPOTRF SPOTRF64
+#define DPOTRF DPOTRF64
+#define SPOTRS SPOTRS64
+#define DPOTRS DPOTRS64
+#define SSYTRF SSYTRF64
+#define DSYTRF DSYTRF64
+#define SSYTRS SSYTRS64
+#define DSYTRS DSYTRS64
+#define SPBTRF SPBTRF64
+#define DPBTRF DPBTRF64
+#define SPBTRS SPBTRS64
+#define DPBTRS DPBTRS64
+#define SSYEV  SSYEV64
+#define DSYEV  DSYEV64
+#define SSYGV  SSYGV64
+#define DSYGV  DSYGV64
+#define SHSEQR SHSEQR64
+#define DHSEQR DHSEQR64
+#define SSTERF SSTERF64
+#define DSTERF DSTERF64
+#define SLAEV2 SLAEV264
+#define DLAEV2 DLAEV264
+#elif GALAHAD_DOUBLE_UNDERSCORE_64BIT_INTEGER
+#define SGETRF SGETRF__64
+#define DGETRF DGETRF__64
+#define SGETRS SGETRS__64
+#define DGETRS DGETRS__64
+#define SGELS  SGELS__64
+#define DGELS  DGELS__64
+#define SGELSY SGELSY__64
+#define DGELSY DGELSY__64
+#define SGELSS SGELSS__64
+#define DGELSS DGELSS__64
+#define SGELSD SGELSD__64
+#define DGELSD DGELSD__64
+#define SGESVD SGESVD__64
+#define DGESVD DGESVD__64
+#define SPTTRF SPTTRF__64
+#define DPTTRF DPTTRF__64
+#define SPOTRF SPOTRF__64
+#define DPOTRF DPOTRF__64
+#define SPOTRS SPOTRS__64
+#define DPOTRS DPOTRS__64
+#define SSYTRF SSYTRF__64
+#define DSYTRF DSYTRF__64
+#define SSYTRS SSYTRS__64
+#define DSYTRS DSYTRS__64
+#define SPBTRF SPBTRF__64
+#define DPBTRF DPBTRF__64
+#define SPBTRS SPBTRS__64
+#define DPBTRS DPBTRS__64
+#define SSYEV  SSYEV__64
+#define DSYEV  DSYEV__64
+#define SSYGV  SSYGV__64
+#define DSYGV  DSYGV__64
+#define SHSEQR SHSEQR__64
+#define DHSEQR DHSEQR__64
+#define SSTERF SSTERF__64
+#define DSTERF DSTERF__64
+#define SLAEV2 SLAEV2__64
+#define DLAEV2 DLAEV2__64
+#else
 #define SGETRF SGETRF_64
 #define DGETRF DGETRF_64
 #define SGETRS SGETRS_64
@@ -38,3 +118,4 @@
 #define SLAEV2 SLAEV2_64
 #define DLAEV2 DLAEV2_64
 #endif
+#endif
diff --git a/src/all_qp/makemaster b/src/all_qp/makemaster
@@ -290,6 +290,11 @@ make_blls_cutest:
           $(MAKE) -f $(GALAHAD)/makefiles/$(VERSION) blls_cutest_addon \
           PRECIS=$(PRECIS) PWD=$(GALAHAD)/src/blls )
 
+make_bllsb_cutest:
+	( cd $(GALAHAD)/src/bllsb ; \
+          $(MAKE) -f $(GALAHAD)/makefiles/$(VERSION) bllsb_cutest_addon \
+          PRECIS=$(PRECIS) PWD=$(GALAHAD)/src/bllsb )
+
 make_bqp_cutest:
 	( cd $(GALAHAD)/src/bqp ; \
           $(MAKE) -f $(GALAHAD)/makefiles/$(VERSION) bqp_cutest_addon \
@@ -397,6 +402,11 @@ make_blls_ampl:
           $(MAKE) -f $(GALAHAD)/makefiles/$(VERSION) blls_ampl_addon \
           PRECIS=$(PRECIS) PWD=$(GALAHAD)/src/blls )
 
+make_bllsb_ampl:
+	( cd $(GALAHAD)/src/bllsb ; \
+          $(MAKE) -f $(GALAHAD)/makefiles/$(VERSION) bllsb_ampl_addon \
+          PRECIS=$(PRECIS) PWD=$(GALAHAD)/src/bllsb )
+
 make_bqp_ampl:
 	( cd $(GALAHAD)/src/bqp ; \
           $(MAKE) -f $(GALAHAD)/makefiles/$(VERSION) bqp_ampl_addon \
@@ -494,6 +504,11 @@ make_blls_qplib:
           $(MAKE) -f $(GALAHAD)/makefiles/$(VERSION) blls_qplib_addon \
           PRECIS=$(PRECIS) PWD=$(GALAHAD)/src/blls )
 
+make_bllsb_qplib:
+	( cd $(GALAHAD)/src/bllsb ; \
+          $(MAKE) -f $(GALAHAD)/makefiles/$(VERSION) bllsb_qplib_addon \
+          PRECIS=$(PRECIS) PWD=$(GALAHAD)/src/bllsb )
+
 make_bqp_qplib:
 	( cd $(GALAHAD)/src/bqp ; \
           $(MAKE) -f $(GALAHAD)/makefiles/$(VERSION) bqp_qplib_addon \
@@ -591,6 +606,11 @@ make_blls_test:
           $(MAKE) -f $(GALAHAD)/makefiles/$(VERSION) test \
           PRECIS=$(PRECIS) PWD=$(GALAHAD)/src/blls )
 
+make_bllsb_test:
+	( cd $(GALAHAD)/src/bllsb ; \
+          $(MAKE) -f $(GALAHAD)/makefiles/$(VERSION) test \
+          PRECIS=$(PRECIS) PWD=$(GALAHAD)/src/bllsb )
+
 make_bqp_test:
 	( cd $(GALAHAD)/src/bqp ; \
           $(MAKE) -f $(GALAHAD)/makefiles/$(VERSION) test \
@@ -703,6 +723,11 @@ make_blls_tests:
           $(MAKE) -f $(GALAHAD)/makefiles/$(VERSION) tests \
           PRECIS=$(PRECIS) PWD=$(GALAHAD)/src/blls )
 
+make_bllsb_tests:
+	( cd $(GALAHAD)/src/bllsb ; \
+          $(MAKE) -f $(GALAHAD)/makefiles/$(VERSION) tests \
+          PRECIS=$(PRECIS) PWD=$(GALAHAD)/src/bllsb )
+
 make_bqp_tests:
 	( cd $(GALAHAD)/src/bqp ; \
           $(MAKE) -f $(GALAHAD)/makefiles/$(VERSION) tests \
@@ -810,6 +835,11 @@ make_blls_test_full:
           $(MAKE) -f $(GALAHAD)/makefiles/$(VERSION) test_full \
           PRECIS=$(PRECIS) PWD=$(GALAHAD)/src/blls )
 
+make_bllsb_test_full:
+	( cd $(GALAHAD)/src/bllsb ; \
+          $(MAKE) -f $(GALAHAD)/makefiles/$(VERSION) test_full \
+          PRECIS=$(PRECIS) PWD=$(GALAHAD)/src/bllsb )
+
 make_bqp_test_full:
 	( cd $(GALAHAD)/src/bqp ; \
           $(MAKE) -f $(GALAHAD)/makefiles/$(VERSION) test_full \
@@ -912,6 +942,11 @@ make_blls_test_spec:
           $(MAKE) -f $(GALAHAD)/makefiles/$(VERSION) test_spec \
           PRECIS=$(PRECIS) PWD=$(GALAHAD)/src/blls )
 
+make_bllsb_test_spec:
+	( cd $(GALAHAD)/src/bllsb ; \
+          $(MAKE) -f $(GALAHAD)/makefiles/$(VERSION) test_spec \
+          PRECIS=$(PRECIS) PWD=$(GALAHAD)/src/bllsb )
+
 make_bqp_test_spec:
 	( cd $(GALAHAD)/src/bqp ; \
           $(MAKE) -f $(GALAHAD)/makefiles/$(VERSION) test_spec \
@@ -1024,6 +1059,11 @@ make_ciface_blls_test:
           $(MAKE) -f $(GALAHAD)/makefiles/$(VERSION) test_cifaces \
           PRECIS=$(PRECIS) PWD=$(GALAHAD)/src/blls )
 
+make_ciface_bllsb_test:
+	( cd $(GALAHAD)/src/bllsb ; \
+          $(MAKE) -f $(GALAHAD)/makefiles/$(VERSION) test_cifaces \
+          PRECIS=$(PRECIS) PWD=$(GALAHAD)/src/bllsb )
+
 make_ciface_bqp_test:
 	( cd $(GALAHAD)/src/bqp ; \
           $(MAKE) -f $(GALAHAD)/makefiles/$(VERSION) test_cifaces \
@@ -1136,6 +1176,11 @@ make_pyiface_blls_test:
           $(MAKE) -f $(GALAHAD)/makefiles/$(VERSION) test_pyiface \
           PRECIS=$(PRECIS) PWD=$(GALAHAD)/src/blls )
 
+make_pyiface_bllsb_test:
+	( cd $(GALAHAD)/src/bllsb ; \
+          $(MAKE) -f $(GALAHAD)/makefiles/$(VERSION) test_pyiface \
+          PRECIS=$(PRECIS) PWD=$(GALAHAD)/src/bllsb )
+
 make_pyiface_bqp_test:
 	( cd $(GALAHAD)/src/bqp ; \
           $(MAKE) -f $(GALAHAD)/makefiles/$(VERSION) test_pyiface \