hide BLAS definitions from user applications

DrTimothyAldenDavis · Nov 11, 2022 · 769870a · 769870a
1 parent cba326b
commit 769870a
Show file tree

Hide file tree

Showing 22 changed files with 66 additions and 13 deletions.
diff --git a/CHOLMOD/CMakeLists.txt b/CHOLMOD/CMakeLists.txt
@@ -15,7 +15,7 @@ cmake_minimum_required ( VERSION 3.22 )
 set ( CHOLMOD_DATE "Nov 12, 2022" )
 set ( CHOLMOD_VERSION_MAJOR 4 )
 set ( CHOLMOD_VERSION_MINOR 0 )
-set ( CHOLMOD_VERSION_SUB   0 )
+set ( CHOLMOD_VERSION_SUB   1 )
 
 message ( STATUS "Building CHOLMOD version: v"
     ${CHOLMOD_VERSION_MAJOR}.

diff --git a/CHOLMOD/Doc/ChangeLog b/CHOLMOD/Doc/ChangeLog
@@ -1,3 +1,7 @@
+Nov 12, 2022: version 4.0.1
+
+    * BLAS definitions: no longer exposed to the user application
+
 Nov 12, 2022: version 4.0.0
 
     * using CMake build system

diff --git a/CHOLMOD/Doc/cholmod_version.tex b/CHOLMOD/Doc/cholmod_version.tex
@@ -1,2 +1,2 @@
 % version of SuiteSparse/CHOLMOD
-\date{VERSION 4.0.0, Nov 12, 2022}
+\date{VERSION 4.0.1, Nov 12, 2022}
diff --git a/CHOLMOD/Include/cholmod.h b/CHOLMOD/Include/cholmod.h
@@ -100,7 +100,7 @@
 #define CHOLMOD_DATE "Nov 12, 2022"
 #define CHOLMOD_MAIN_VERSION   4
 #define CHOLMOD_SUB_VERSION    0
-#define CHOLMOD_SUBSUB_VERSION 0
+#define CHOLMOD_SUBSUB_VERSION 1
 
 /* make it easy for C++ programs to include CHOLMOD */
 #ifdef __cplusplus

diff --git a/CHOLMOD/Include/cholmod_internal.h b/CHOLMOD/Include/cholmod_internal.h
@@ -30,6 +30,7 @@
 #ifndef CHOLMOD_INTERNAL_H
 #define CHOLMOD_INTERNAL_H
 
+#define SUITESPARSE_BLAS_DEFINITIONS
 #include "cholmod.h"
 
 /* ========================================================================== */

diff --git a/CHOLMOD/Tcov/cm.h b/CHOLMOD/Tcov/cm.h
@@ -8,6 +8,7 @@
 
 //------------------------------------------------------------------------------
 
+#define SUITESPARSE_BLAS_DEFINITIONS
 #include "cholmod.h"
 #include <stdlib.h>
 #include <stdio.h>

diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+Nov 12, 2022: SuiteSparse 6.0.1
+
+    * BLAS: C prototypes for the Fortan BLAS were unintentionally exposed to
+        the user application.  Removed.  If you want to use them, see the
+        instructions in SuiteSparse_config.h.
+
 Nov 12, 2022: SuiteSparse 6.0.0
 
     * major update: using CMake build system for all packages

diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 SuiteSparse:  A Suite of Sparse matrix packages at http://suitesparse.com
 -----------------------------------------------------------------------------
 
-Nov 12, 2022.  SuiteSparse VERSION 6.0.0
+Nov 12, 2022.  SuiteSparse VERSION 6.0.1
 
 SuiteSparse is a set of sparse-matrix-related packages written or co-authored
 by Tim Davis, available at https://github.com/DrTimothyAldenDavis/SuiteSparse .

diff --git a/SPQR/CMakeLists.txt b/SPQR/CMakeLists.txt
@@ -16,7 +16,7 @@ cmake_minimum_required ( VERSION 3.22 )
 set ( SPQR_DATE "Nov 12, 2022" )
 set ( SPQR_VERSION_MAJOR 3 )
 set ( SPQR_VERSION_MINOR 0 )
-set ( SPQR_VERSION_SUB   0 )
+set ( SPQR_VERSION_SUB   1 )
 
 message ( STATUS "Building SPQR version: v"
     ${SPQR_VERSION_MAJOR}.

diff --git a/SPQR/Doc/ChangeLog b/SPQR/Doc/ChangeLog
@@ -1,3 +1,7 @@
+Nov 12, 2022: version 3.0.1
+
+    * BLAS definitions: no longer exposed to the user application
+
 Nov 12, 2022: version 3.0.0
 
     * using CMake build system

diff --git a/SPQR/Doc/spqr_version.tex b/SPQR/Doc/spqr_version.tex
@@ -1,2 +1,2 @@
 % version of SuiteSparse/SPQR
-\date{VERSION 3.0.0, Nov 12, 2022}
+\date{VERSION 3.0.1, Nov 12, 2022}
diff --git a/SPQR/Include/SuiteSparseQR_definitions.h b/SPQR/Include/SuiteSparseQR_definitions.h
@@ -65,7 +65,7 @@
 #define SPQR_DATE "Nov 12, 2022"
 #define SPQR_MAIN_VERSION   3
 #define SPQR_SUB_VERSION    0
-#define SPQR_SUBSUB_VERSION 0
+#define SPQR_SUBSUB_VERSION 1
 
 #define SPQR_VER_CODE(main,sub) ((main) * 1000 + (sub))
 #define SPQR_VERSION SPQR_VER_CODE(SPQR_MAIN_VERSION,SPQR_SUB_VERSION)

diff --git a/SPQR/Include/spqr.hpp b/SPQR/Include/spqr.hpp
@@ -15,6 +15,7 @@
 // include files
 // -----------------------------------------------------------------------------
 
+#define SUITESPARSE_BLAS_DEFINITIONS
 #include "SuiteSparseQR.hpp"
 #include <stdlib.h>
 #include <math.h>

diff --git a/SPQR/Tcov/qrtestc.c b/SPQR/Tcov/qrtestc.c
@@ -10,7 +10,6 @@
 /* Test the C wrapper functions. */
 
 #include "SuiteSparseQR_C.h"
-#define int64_t int64_t
 
 #define MAX(a,b) (((a) > (b)) ? (a) : (b))
 

diff --git a/SuiteSparse_config/CMakeLists.txt b/SuiteSparse_config/CMakeLists.txt
@@ -17,7 +17,7 @@ cmake_minimum_required ( VERSION 3.22 )
 set ( SUITESPARSE_DATE "Nov 12, 2022" )
 set ( SUITESPARSE_VERSION_MAJOR 6 )
 set ( SUITESPARSE_VERSION_MINOR 0 )
-set ( SUITESPARSE_VERSION_SUB   0 )
+set ( SUITESPARSE_VERSION_SUB   1 )
 
 message ( STATUS "Building SuiteSparse_config version: v"
     ${SUITESPARSE_VERSION_MAJOR}.

diff --git a/SuiteSparse_config/Config/SuiteSparse_config.h.in b/SuiteSparse_config/Config/SuiteSparse_config.h.in
@@ -689,6 +689,20 @@ int SuiteSparse_version     // returns SUITESPARSE_VERSION
 // See https://netlib.org/blas/ and https://netlib.org/lapack/ for the
 // definitions of the inputs/outputs of these functions.
 
+// These prototypes need to be found by UMFPACK, CHOLMOD, and SPQR, and to do
+// so, they need to appear in this public header to ensure the correct BLAS
+// library and integer size is used.  However, these definitions should not
+// (normally) be exposed to the user application.
+
+// If a user application wishes to use these definitions, simply add
+
+//      #define SUITESPARSE_BLAS_DEFINITIONS
+//      #include "SuiteSparse_config.h"
+
+// prior to #include'ing any SuiteSparse headers (amd.h, and so on).
+
+#if defined ( SUITESPARSE_BLAS_DEFINITIONS )
+
 void SUITESPARSE_BLAS_DGEMV         // Y = alpha*A*x + beta*Y
 (
     // input:
@@ -1447,6 +1461,8 @@ void SUITESPARSE_LAPACK_ZLARF       // apply Householder reflector
     }                                                                         \
 }
 
+#endif
+
 //------------------------------------------------------------------------------
 // SuiteSparse_BLAS_library: return name of BLAS library found
 //------------------------------------------------------------------------------

diff --git a/SuiteSparse_config/SuiteSparse_config.h b/SuiteSparse_config/SuiteSparse_config.h
@@ -488,7 +488,7 @@ int SuiteSparse_version     // returns SUITESPARSE_VERSION
 #define SUITESPARSE_DATE "Nov 12, 2022"
 #define SUITESPARSE_MAIN_VERSION    6
 #define SUITESPARSE_SUB_VERSION     0
-#define SUITESPARSE_SUBSUB_VERSION  0
+#define SUITESPARSE_SUBSUB_VERSION  1
 
 #define SUITESPARSE_VER_CODE(main,sub) ((main) * 1000 + (sub))
 #define SUITESPARSE_VERSION \
@@ -689,6 +689,20 @@ int SuiteSparse_version     // returns SUITESPARSE_VERSION
 // See https://netlib.org/blas/ and https://netlib.org/lapack/ for the
 // definitions of the inputs/outputs of these functions.
 
+// These prototypes need to be found by UMFPACK, CHOLMOD, and SPQR, and to do
+// so, they need to appear in this public header to ensure the correct BLAS
+// library and integer size is used.  However, these definitions should not
+// (normally) be exposed to the user application.
+
+// If a user application wishes to use these definitions, simply add
+
+//      #define SUITESPARSE_BLAS_DEFINITIONS
+//      #include "SuiteSparse_config.h"
+
+// prior to #include'ing any SuiteSparse headers (amd.h, and so on).
+
+#if defined ( SUITESPARSE_BLAS_DEFINITIONS )
+
 void SUITESPARSE_BLAS_DGEMV         // Y = alpha*A*x + beta*Y
 (
     // input:
@@ -1447,6 +1461,8 @@ void SUITESPARSE_LAPACK_ZLARF       // apply Householder reflector
     }                                                                         \
 }
 
+#endif
+
 //------------------------------------------------------------------------------
 // SuiteSparse_BLAS_library: return name of BLAS library found
 //------------------------------------------------------------------------------

diff --git a/UMFPACK/CMakeLists.txt b/UMFPACK/CMakeLists.txt
@@ -15,7 +15,7 @@ cmake_minimum_required ( VERSION 3.22 )
 set ( UMFPACK_DATE "Nov 12, 2022" )
 set ( UMFPACK_VERSION_MAJOR 6 )
 set ( UMFPACK_VERSION_MINOR 0 )
-set ( UMFPACK_VERSION_SUB   0 )
+set ( UMFPACK_VERSION_SUB   1 )
 
 message ( STATUS "Building UMFPACK version: v"
     ${UMFPACK_VERSION_MAJOR}.

diff --git a/UMFPACK/Doc/ChangeLog b/UMFPACK/Doc/ChangeLog
@@ -1,3 +1,7 @@
+Nov 12, 2022: version 6.0.1
+
+    * BLAS definitions: no longer exposed to the user application
+
 Nov 12, 2022: version 6.0.0
 
     * using CMake build system

diff --git a/UMFPACK/Doc/umfpack_version.tex b/UMFPACK/Doc/umfpack_version.tex
@@ -1,2 +1,2 @@
 % version of SuiteSparse/UMFPACK
-\date{VERSION 6.0.0, Nov 12, 2022}
+\date{VERSION 6.0.1, Nov 12, 2022}
diff --git a/UMFPACK/Include/umfpack.h b/UMFPACK/Include/umfpack.h
@@ -85,7 +85,7 @@ extern "C" {
 #define UMFPACK_DATE "Nov 12, 2022"
 #define UMFPACK_MAIN_VERSION   6
 #define UMFPACK_SUB_VERSION    0
-#define UMFPACK_SUBSUB_VERSION 0
+#define UMFPACK_SUBSUB_VERSION 1
 
 #define UMFPACK_VER_CODE(main,sub) ((main) * 1000 + (sub))
 #define UMFPACK_VER UMFPACK_VER_CODE(UMFPACK_MAIN_VERSION,UMFPACK_SUB_VERSION)

diff --git a/UMFPACK/Source/umf_internal.h b/UMFPACK/Source/umf_internal.h
@@ -91,6 +91,7 @@
 /* -------------------------------------------------------------------------- */
 
 /* stdio.h, stdlib.h, limits.h, and math.h, NDEBUG definition, assert.h */
+#define SUITESPARSE_BLAS_DEFINITIONS
 #include "amd_internal.h"
 
 /* -------------------------------------------------------------------------- */