remove "#include mex.h" and matrix.h from SuiteSparse_config.h, for M…

…ATLAB mexFunctions
DrTimothyAldenDavis · Oct 3, 2024 · 39c23ae · 39c23ae
1 parent 0aa858c
commit 39c23ae
Show file tree

Hide file tree

Showing 25 changed files with 79 additions and 60 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,9 +1,13 @@
-Sept 23, 2024: version 7.8.3
+Oct 10, 2024: version 7.8.3
 
     * ParU 1.0.0: first stable release. No change since last version
         v0.3.0, except for date, version, and updates to the User Guide.
     * UMFPACK 6.3.5: a few typos in comments and user guide; no change to code
     * SuiteSparse_config and Example: revised to reflect ParU 1.0.0.
+    * SuiteSparse_config.h: removed inclusion of MATLAB mex.h in
+        SuiteSparse_config.h (conflicts with C++ mex files)
+    * KLU and RBio: revised mexFunctions to handle change in
+        SuiteSparse_config.h
     * Package versions in this release: (* denotes a new version)
         SuiteSparse_config 7.8.3    *
         AMD 3.3.3
@@ -16,12 +20,12 @@ Sept 23, 2024: version 7.8.3
         CXSparse 4.4.1
         Example 1.8.3               *
         GraphBLAS 9.3.1
-        KLU 2.3.4
+        KLU 2.3.5                   *
         LDL 3.3.2
         LAGraph 1.1.4
         SuiteSparse_Mongoose 3.3.4
         ParU 1.0.0                  *
-        RBio 4.3.3
+        RBio 4.3.4                  *
         SPEX 3.2.1
         SPQR 4.3.4
         UMFPACK 6.3.5               *

diff --git a/Example/CMakeLists.txt b/Example/CMakeLists.txt
@@ -53,7 +53,7 @@ message ( STATUS "MY prefix path:    ${CMAKE_PREFIX_PATH}" )
 #-------------------------------------------------------------------------------
 
 # cmake inserts the date and version number into Include/my.h:
-set ( MY_DATE "Sept 5, 2024" )
+set ( MY_DATE "Oct 10, 2024" )
 set ( MY_VERSION_MAJOR 1 )
 set ( MY_VERSION_MINOR 8 )
 set ( MY_VERSION_PATCH 3 )
@@ -96,13 +96,13 @@ find_package ( CHOLMOD 5.3.0 REQUIRED )
 find_package ( COLAMD 3.3.4 REQUIRED )
 find_package ( CXSparse 4.4.1 REQUIRED )
 find_package ( GraphBLAS 9.3.1 )
-find_package ( KLU 2.3.4 REQUIRED )
-find_package ( KLU_CHOLMOD 2.3.4 REQUIRED )
+find_package ( KLU 2.3.5 REQUIRED )
+find_package ( KLU_CHOLMOD 2.3.5 REQUIRED )
 find_package ( LDL 3.3.2 REQUIRED )
 find_package ( LAGraph 1.1.4 )
 find_package ( SuiteSparse_Mongoose 3.3.4 REQUIRED )
 find_package ( ParU 1.0.0 REQUIRED )
-find_package ( RBio 4.3.3 REQUIRED )
+find_package ( RBio 4.3.4 REQUIRED )
 find_package ( SPEX 3.2.1 REQUIRED )    # requires GMP and MPFR
 find_package ( SPQR 4.3.4 REQUIRED )
 find_package ( UMFPACK 6.3.5 REQUIRED )

diff --git a/Example/Include/my.h b/Example/Include/my.h
@@ -11,7 +11,7 @@
 // file, since it is constructed from Config/my.h.in by cmake.
 
 // version and date for example user library
-#define MY_DATE "Sept 5, 2024"
+#define MY_DATE "Oct 10, 2024"
 #define MY_MAJOR_VERSION 1
 #define MY_MINOR_VERSION 8
 #define MY_PATCH_VERSION 3

diff --git a/Example/Include/my_internal.h b/Example/Include/my_internal.h
@@ -14,8 +14,8 @@
 
 // SuiteSparse include files for C/C++:
 #include "SuiteSparse_config.h"
-#if !defined (SUITESPARSE__VERSION) || SUITESPARSE__VERSION < SUITESPARSE__VERCODE(7,8,2)
-#error "This library requires SuiteSparse_config 7.8.2 or later"
+#if !defined (SUITESPARSE__VERSION) || SUITESPARSE__VERSION < SUITESPARSE__VERCODE(7,8,3)
+#error "This library requires SuiteSparse_config 7.8.3 or later"
 #endif
 
 #include "amd.h"
@@ -69,8 +69,8 @@
 #endif
 
 #include "klu.h"
-#if !defined (KLU__VERSION) || KLU__VERSION < SUITESPARSE__VERCODE(2,3,4)
-#error "This library requires KLU 2.3.4 or later"
+#if !defined (KLU__VERSION) || KLU__VERSION < SUITESPARSE__VERCODE(2,3,5)
+#error "This library requires KLU 2.3.5 or later"
 #endif
 
 #include "ldl.h"
@@ -79,8 +79,8 @@
 #endif
 
 #include "RBio.h"
-#if !defined (RBIO__VERSION) || RBIO__VERSION < SUITESPARSE__VERCODE(4,3,3)
-#error "This library requires RBio 4.3.3 or later"
+#if !defined (RBIO__VERSION) || RBIO__VERSION < SUITESPARSE__VERCODE(4,3,4)
+#error "This library requires RBio 4.3.4 or later"
 #endif
 
 #include "SPEX.h"

diff --git a/KLU/CMakeLists.txt b/KLU/CMakeLists.txt
@@ -12,10 +12,10 @@
 
 cmake_minimum_required ( VERSION 3.22 )
 
-set ( KLU_DATE "June 20, 2024" )
+set ( KLU_DATE "Oct 10, 2024" )
 set ( KLU_VERSION_MAJOR 2 CACHE STRING "" FORCE )
 set ( KLU_VERSION_MINOR 3 CACHE STRING "" FORCE )
-set ( KLU_VERSION_SUB   4 CACHE STRING "" FORCE )
+set ( KLU_VERSION_SUB   5 CACHE STRING "" FORCE )
 
 message ( STATUS "Building KLU version: v"
     ${KLU_VERSION_MAJOR}.
@@ -43,22 +43,22 @@ include ( SuiteSparsePolicy )
 #-------------------------------------------------------------------------------
 
 if ( NOT SUITESPARSE_ROOT_CMAKELISTS )
-    find_package ( SuiteSparse_config 7.8.0
+    find_package ( SuiteSparse_config 7.8.3
         PATHS ${CMAKE_SOURCE_DIR}/../SuiteSparse_config/build NO_DEFAULT_PATH )
     if ( NOT TARGET SuiteSparse::SuiteSparseConfig )
-        find_package ( SuiteSparse_config 7.8.0 REQUIRED )
+        find_package ( SuiteSparse_config 7.8.3 REQUIRED )
     endif ( )
 
-    find_package ( AMD 3.3.2
+    find_package ( AMD 3.3.3
         PATHS ${CMAKE_SOURCE_DIR}/../AMD/build NO_DEFAULT_PATH )
     if ( NOT TARGET SuiteSparse::AMD )
-        find_package ( AMD 3.3.2 REQUIRED )
+        find_package ( AMD 3.3.3 REQUIRED )
     endif ( )
 
-    find_package ( COLAMD 3.3.3
+    find_package ( COLAMD 3.3.4
         PATHS ${CMAKE_SOURCE_DIR}/../COLAMD/build NO_DEFAULT_PATH )
     if ( NOT TARGET SuiteSparse::COLAMD )
-        find_package ( COLAMD 3.3.3 REQUIRED )
+        find_package ( COLAMD 3.3.4 REQUIRED )
     endif ( )
 
     find_package ( BTF 2.3.2
@@ -77,10 +77,10 @@ if ( SUITESPARSE_ROOT_CMAKELISTS )
 else ( )
     if ( KLU_USE_CHOLMOD )
         # look for CHOLMOD (optional fill-reducing orderings)
-        find_package ( CHOLMOD 5.2.1
+        find_package ( CHOLMOD 5.3.0
             PATHS ${CMAKE_SOURCE_DIR}/../CHOLMOD/build NO_DEFAULT_PATH )
         if ( NOT TARGET SuiteSparse::CHOLMOD )
-            find_package ( CHOLMOD 5.2.1 )
+            find_package ( CHOLMOD 5.3.0 )
         endif ( )
         if ( NOT CHOLMOD_FOUND )
             # CHOLMOD not found so disable it

diff --git a/KLU/Config/klu.h.in b/KLU/Config/klu.h.in
@@ -833,8 +833,8 @@ void klu_version (int version [3]) ;
 
 #define KLU__VERSION SUITESPARSE__VERCODE(@KLU_VERSION_MAJOR@,@KLU_VERSION_MINOR@,@KLU_VERSION_SUB@)
 #if !defined (SUITESPARSE__VERSION) || \
-    (SUITESPARSE__VERSION < SUITESPARSE__VERCODE(7,8,0))
-#error "KLU @KLU_VERSION_MAJOR@.@KLU_VERSION_MINOR@.@KLU_VERSION_SUB@ requires SuiteSparse_config 7.8.0 or later"
+    (SUITESPARSE__VERSION < SUITESPARSE__VERCODE(7,8,3))
+#error "KLU @KLU_VERSION_MAJOR@.@KLU_VERSION_MINOR@.@KLU_VERSION_SUB@ requires SuiteSparse_config 7.8.3 or later"
 #endif
 
 #if !defined (AMD__VERSION) || \

diff --git a/KLU/Doc/ChangeLog b/KLU/Doc/ChangeLog
@@ -1,3 +1,8 @@
+Oct 10, 2024: version 2.3.5
+
+    * MATLAB: revised mexFunction to account for change in
+        SuiteSparse_config.h
+
 June 20, 2024: version 2.3.4
 
     * minor update for MATLAB on Windows

diff --git a/KLU/Doc/KLU_UserGuide.pdf b/KLU/Doc/KLU_UserGuide.pdf
diff --git a/KLU/Doc/klu_version.tex b/KLU/Doc/klu_version.tex
@@ -1,2 +1,2 @@
 % version of SuiteSparse/KLU
-\date{VERSION 2.3.4, June 20, 2024}
+\date{VERSION 2.3.5, Oct 10, 2024}
diff --git a/KLU/Include/klu.h b/KLU/Include/klu.h
@@ -823,33 +823,33 @@ void klu_version (int version [3]) ;
  *      #endif
  */
 
-#define KLU_DATE "June 20, 2024"
+#define KLU_DATE "Oct 10, 2024"
 #define KLU_MAIN_VERSION   2
 #define KLU_SUB_VERSION    3
-#define KLU_SUBSUB_VERSION 4
+#define KLU_SUBSUB_VERSION 5
 
 #define KLU_VERSION_CODE(main,sub) SUITESPARSE_VER_CODE(main,sub)
 #define KLU_VERSION KLU_VERSION_CODE(2,3)
 
-#define KLU__VERSION SUITESPARSE__VERCODE(2,3,4)
+#define KLU__VERSION SUITESPARSE__VERCODE(2,3,5)
 #if !defined (SUITESPARSE__VERSION) || \
-    (SUITESPARSE__VERSION < SUITESPARSE__VERCODE(7,8,0))
-#error "KLU 2.3.4 requires SuiteSparse_config 7.8.0 or later"
+    (SUITESPARSE__VERSION < SUITESPARSE__VERCODE(7,8,3))
+#error "KLU 2.3.5 requires SuiteSparse_config 7.8.3 or later"
 #endif
 
 #if !defined (AMD__VERSION) || \
     (AMD__VERSION < SUITESPARSE__VERCODE(3,3,3))
-#error "KLU 2.3.4 requires AMD 3.3.3 or later"
+#error "KLU 2.3.5 requires AMD 3.3.3 or later"
 #endif
 
 #if !defined (COLAMD__VERSION) || \
     (COLAMD__VERSION < SUITESPARSE__VERCODE(3,3,4))
-#error "KLU 2.3.4 requires COLAMD 3.3.4 or later"
+#error "KLU 2.3.5 requires COLAMD 3.3.4 or later"
 #endif
 
 #if !defined (BTF__VERSION) || \
     (BTF__VERSION < SUITESPARSE__VERCODE(2,3,2))
-#error "KLU 2.3.4 requires BTF 2.3.2 or later"
+#error "KLU 2.3.5 requires BTF 2.3.2 or later"
 #endif
 
 #endif

diff --git a/KLU/MATLAB/klu_install.m b/KLU/MATLAB/klu_install.m
@@ -21,7 +21,7 @@ function klu_install (metis_path)
 end
 
 % compile KLU and add to the path
-klu_make (metis_path) ;
+klu_make ;
 klu_path = pwd ;
 addpath (klu_path)
 

diff --git a/KLU/MATLAB/klu_mex.c b/KLU/MATLAB/klu_mex.c
@@ -52,6 +52,7 @@
 
 /* ========================================================================== */
 
+#include "mex.h"
 #include "klu.h"
 
 #ifndef NCHOLMOD

diff --git a/RBio/CMakeLists.txt b/RBio/CMakeLists.txt
@@ -2,7 +2,7 @@
 # SuiteSparse/RBio/CMakeLists.txt:  cmake for RBio
 #-------------------------------------------------------------------------------
 
-# RBio, Copyright (c) 2009-2023, Timothy A. Davis.  All Rights Reserved.
+# RBio, Copyright (c) 2009-2024, Timothy A. Davis.  All Rights Reserved.
 # SPDX-License-Identifier: GPL-2.0+
 
 #-------------------------------------------------------------------------------
@@ -11,10 +11,10 @@
 
 cmake_minimum_required ( VERSION 3.22 )
 
-set ( RBIO_DATE "June 20, 2024" )
+set ( RBIO_DATE "Oct 10, 2024" )
 set ( RBIO_VERSION_MAJOR 4 CACHE STRING "" FORCE )
 set ( RBIO_VERSION_MINOR 3 CACHE STRING "" FORCE )
-set ( RBIO_VERSION_SUB   3 CACHE STRING "" FORCE )
+set ( RBIO_VERSION_SUB   4 CACHE STRING "" FORCE )
 
 message ( STATUS "Building RBio version: v"
     ${RBIO_VERSION_MAJOR}.
@@ -43,10 +43,10 @@ include ( SuiteSparsePolicy )
 #-------------------------------------------------------------------------------
 
 if ( NOT SUITESPARSE_ROOT_CMAKELISTS )
-    find_package ( SuiteSparse_config 7.8.0
+    find_package ( SuiteSparse_config 7.8.3
         PATHS ${CMAKE_SOURCE_DIR}/../SuiteSparse_config/build NO_DEFAULT_PATH )
     if ( NOT TARGET SuiteSparse::SuiteSparseConfig )
-        find_package ( SuiteSparse_config 7.8.0 REQUIRED )
+        find_package ( SuiteSparse_config 7.8.3 REQUIRED )
     endif ( )
 endif ( )
 

diff --git a/RBio/Config/RBio.h.in b/RBio/Config/RBio.h.in
@@ -85,8 +85,8 @@
 
 #define RBIO__VERSION SUITESPARSE__VERCODE(@RBIO_VERSION_MAJOR@,@RBIO_VERSION_MINOR@,@RBIO_VERSION_SUB@)
 #if !defined (SUITESPARSE__VERSION) || \
-    (SUITESPARSE__VERSION < SUITESPARSE__VERCODE(7,8,0))
-#error "RBio @RBIO_VERSION_MAJOR@.@RBIO_VERSION_MINOR@.@RBIO_VERSION_SUB@ requires SuiteSparse_config 7.8.0 or later"
+    (SUITESPARSE__VERSION < SUITESPARSE__VERCODE(7,8,3))
+#error "RBio @RBIO_VERSION_MAJOR@.@RBIO_VERSION_MINOR@.@RBIO_VERSION_SUB@ requires SuiteSparse_config 7.8.3 or later"
 #endif
 
 /* -------------------------------------------------------------------------- */

diff --git a/RBio/Include/RBio.h b/RBio/Include/RBio.h
@@ -75,18 +75,18 @@
 #define RBIO_VALUE_IOERROR (-94)  /* I/O error: numerical values */
 #define RBIO_FILE_IOERROR (-95)   /* I/O error: cannot read/write the file */
 
-#define RBIO_DATE "June 20, 2024"
+#define RBIO_DATE "Oct 10, 2024"
 #define RBIO_MAIN_VERSION   4
 #define RBIO_SUB_VERSION    3
-#define RBIO_SUBSUB_VERSION 3
+#define RBIO_SUBSUB_VERSION 4
 
 #define RBIO_VER_CODE(main,sub) SUITESPARSE_VER_CODE(main,sub)
 #define RBIO_VERSION RBIO_VER_CODE(4,3)
 
-#define RBIO__VERSION SUITESPARSE__VERCODE(4,3,3)
+#define RBIO__VERSION SUITESPARSE__VERCODE(4,3,4)
 #if !defined (SUITESPARSE__VERSION) || \
-    (SUITESPARSE__VERSION < SUITESPARSE__VERCODE(7,8,0))
-#error "RBio 4.3.3 requires SuiteSparse_config 7.8.0 or later"
+    (SUITESPARSE__VERSION < SUITESPARSE__VERCODE(7,8,3))
+#error "RBio 4.3.4 requires SuiteSparse_config 7.8.3 or later"
 #endif
 
 /* -------------------------------------------------------------------------- */

diff --git a/RBio/RBio/RBerror.c b/RBio/RBio/RBerror.c
@@ -7,6 +7,7 @@
 
 //------------------------------------------------------------------------------
 
+#include "mex.h"
 #include "RBio.h"
 
 void RBerror (int status)

diff --git a/RBio/RBio/RBraw.c b/RBio/RBio/RBraw.c
@@ -41,6 +41,7 @@ c See also RBfix, RBread, RBreade.
 c-----------------------------------------------------------------------
 */
 
+#include "mex.h"
 #include "RBio.h"
 #define LEN 1024
 

diff --git a/RBio/RBio/RBread.c b/RBio/RBio/RBread.c
@@ -19,6 +19,7 @@
    mtype: see RBwrite.m for a description.
 */
 
+#include "mex.h"
 #include "RBio.h"
 #define LEN 1024
 #define TRUE (1)

diff --git a/RBio/RBio/RBtype.c b/RBio/RBio/RBtype.c
@@ -36,6 +36,7 @@
 -----------------------------------------------------------------------
 */
 
+#include "mex.h"
 #include "RBio.h"
 #define TRUE (1)
 

diff --git a/RBio/RBio/RBwrite.c b/RBio/RBio/RBwrite.c
@@ -41,6 +41,7 @@ function mtype = RBwrite (filename, A, Z, title, key)                       %#ok
 % See also RBread, RBtype.
 */
 
+#include "mex.h"
 #include "RBio.h"
 #define LEN 1024
 #define MAX(a,b) (((a) > (b)) ? (a) : (b))

diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 SuiteSparse:  A Suite of Sparse matrix packages at http://suitesparse.com
 -----------------------------------------------------------------------------
 
-Sept 23, 2024, SuiteSparse VERSION 7.8.3
+Oct 10, 2024, SuiteSparse VERSION 7.8.3
 
 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/SuiteSparse_config/CMakeLists.txt b/SuiteSparse_config/CMakeLists.txt
@@ -2,7 +2,7 @@
 # SuiteSparse/SuiteSparse_config/CMakeLists.txt:  cmake for SuiteSparse_config
 #-------------------------------------------------------------------------------
 
-# SuiteSparse_config, Copyright (c) 2012-2023, Timothy A. Davis.
+# SuiteSparse_config, Copyright (c) 2012-2024, Timothy A. Davis.
 # All Rights Reserved.
 # SPDX-License-Identifier: BSD-3-clause
 
@@ -15,7 +15,7 @@
 cmake_minimum_required ( VERSION 3.22 )
 
 # version of both SuiteSparse and SuiteSparse_config
-set ( SUITESPARSE_DATE "Sept 23, 2024" )
+set ( SUITESPARSE_DATE "Oct 10, 2024" )
 set ( SUITESPARSE_VERSION_MAJOR 7 )
 set ( SUITESPARSE_VERSION_MINOR 8 )
 set ( SUITESPARSE_VERSION_SUB   3 )

diff --git a/SuiteSparse_config/Config/SuiteSparse_config.h.in b/SuiteSparse_config/Config/SuiteSparse_config.h.in
@@ -79,10 +79,10 @@
 // MATLAB/Octave
 //------------------------------------------------------------------------------
 
-#if defined ( MATLAB_MEX_FILE )
-#include "mex.h"
-#include "matrix.h"
-#endif
+//  #if defined ( MATLAB_MEX_FILE )
+//  #include "mex.h"
+//  #include "matrix.h"
+//  #endif
 
 //------------------------------------------------------------------------------
 // string and token handling macros

diff --git a/SuiteSparse_config/SuiteSparse_config.c b/SuiteSparse_config/SuiteSparse_config.c
@@ -13,6 +13,10 @@
 
 #include "SuiteSparse_config.h"
 
+#if defined ( MATLAB_MEX_FILE )
+#include "mex.h"
+#endif
+
 /* -------------------------------------------------------------------------- */
 /* SuiteSparse_config : a static struct */
 /* -------------------------------------------------------------------------- */