Skip to content

Commit

Permalink
sync with dev2
Browse files Browse the repository at this point in the history
  • Loading branch information
DrTimothyAldenDavis committed Mar 21, 2024
1 parent 1e3479e commit 9fc13e0
Show file tree
Hide file tree
Showing 11 changed files with 83 additions and 20 deletions.
30 changes: 30 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,33 @@
Mar XX, 2024: version 7.7.0 FIXME date

* SPEX 3.1.0: major revision to API, new methods. Added SPEX_Cholesky,
SPEX_Backslash, and python interface. MATLAB interface revised.
* Example 1.7.0: revised for change in SPEX API
* GraphBLAS 9.1.0: revised defn of C11 or MSVC complex type, bug fix
* CXSparse 4.4.0: revise malloc/calloc/realloc/free wrappers
* All others: minor changes to build system
* Package versions in this release:
SuiteSparse_config 7.7.0
AMD 3.3.2
BTF 2.3.2
CAMD 3.3.2
CCOLAMD 3.3.3
CHOLMOD 5.2.1
COLAMD 3.3.3
CSparse 4.3.2
CXSparse 4.4.0
Example 1.7.0
GraphBLAS 9.1.0
KLU 2.3.3
LDL 3.3.2
LAGraph 1.1.3
SuiteSparse_Mongoose 3.3.3
ParU 0.1.3
RBio 4.3.2
SPEX 3.1.0
SPQR 4.3.3
UMFPACK 6.3.3

Mar 2, 2024: version 7.6.1

* GraphBLAS 9.0.3: performance bug fix (JIT kernels were not compiled with
Expand Down
15 changes: 15 additions & 0 deletions GraphBLAS/Doc/ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
Mar 22, 2024: version 9.1.0

* minor updates to build system
* C11 complex type detection: this is now detected and configured by
cmake, instead of using an #if ... in the GraphBLAS.h header.
This change was required to port GraphBLAS to the clang-cl compiler
on Windows when it simulates the MSVC compiler. Also added a new
feature (thus the minor version update to 9.1.0): GxB_HAVE_COMPLEX* to
GraphBLAS.h to indicate which kind of complex data types are available
in C11 or MSVC. Contributed by Markus Mützel.
* port to clang-cl: fixing the GxB_get and GxB_set macro
* (53) bug fix: eWiseAdd C<M>=A+B when M, A, and B are all hypersparse;
access to M was incorrect (also affects C<M>+=T for any operation, if
M and T are both hypersparse).

Mar 1, 2024: version 9.0.3

* (52) performance bug fix: JIT kernels since v8.3.1 were not compiled with
Expand Down
Binary file modified GraphBLAS/Doc/GraphBLAS_UserGuide.pdf
Binary file not shown.
18 changes: 18 additions & 0 deletions GraphBLAS/Doc/GraphBLAS_UserGuide.tex
Original file line number Diff line number Diff line change
Expand Up @@ -14768,6 +14768,24 @@ \section{Release Notes}

\begin{itemize}

\item Mar 22, 2024: version 9.1.0

\begin{itemize}
\item minor updates to build system
\item C11 complex type detection: this is now detected and configured by
cmake, instead of using an \verb'#if' ... in the GraphBLAS.h header.
This change was required to port GraphBLAS to the clang-cl compiler
on Windows when it simulates the MSVC compiler. Also added a new
feature (thus the minor version update to 9.1.0):
\verb'GxB_HAVE_COMPLEX*' to
GraphBLAS.h to indicate which kind of complex data types are available
in C11 or MSVC. Contributed by Markus M\"{u}tzel.
\item (53) bug fix: eWiseAdd \verb'C<M>=A+B' when \verb'M', \verb'A',
and \verb'B' are all hypersparse; access to \verb'M' was incorrect
(also affects \verb'C<M>+=T' for any operation, if \verb'M' and
\verb'T' are both hypersparse).
\end{itemize}

\item Mar 1, 2024: version 9.0.3

\begin{itemize}
Expand Down
4 changes: 2 additions & 2 deletions GraphBLAS/Doc/GraphBLAS_version.tex
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
% version of SuiteSparse:GraphBLAS
\date{VERSION
9.0.3,
Mar 1, 2024}
9.1.0,
Mar 22, 2024}

8 changes: 4 additions & 4 deletions GraphBLAS/Include/GraphBLAS.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SuiteSparse:GraphBLAS 9.0.3
// SuiteSparse:GraphBLAS 9.1.0
//------------------------------------------------------------------------------
// GraphBLAS.h: definitions for the GraphBLAS package
//------------------------------------------------------------------------------
Expand Down Expand Up @@ -226,10 +226,10 @@

// The version of this implementation, and the GraphBLAS API version:
#define GxB_IMPLEMENTATION_NAME "SuiteSparse:GraphBLAS"
#define GxB_IMPLEMENTATION_DATE "Mar 1, 2024"
#define GxB_IMPLEMENTATION_DATE "Mar 22, 2024"
#define GxB_IMPLEMENTATION_MAJOR 9
#define GxB_IMPLEMENTATION_MINOR 0
#define GxB_IMPLEMENTATION_SUB 3
#define GxB_IMPLEMENTATION_MINOR 1
#define GxB_IMPLEMENTATION_SUB 0
#define GxB_SPEC_DATE "Dec 22, 2023"
#define GxB_SPEC_MAJOR 2
#define GxB_SPEC_MINOR 1
Expand Down
2 changes: 1 addition & 1 deletion GraphBLAS/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved.

SPDX-License-Identifier: Apache-2.0

VERSION 9.0.3, Mar 1, 2024
VERSION 9.1.0, Mar 22, 2024

SuiteSparse:GraphBLAS is a complete implementation of the GraphBLAS standard,
which defines a set of sparse matrix operations on an extended algebra of
Expand Down
6 changes: 3 additions & 3 deletions GraphBLAS/cmake_modules/GraphBLAS_version.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
#-------------------------------------------------------------------------------

# version of SuiteSparse:GraphBLAS
set ( GraphBLAS_DATE "Mar 1, 2024" )
set ( GraphBLAS_DATE "Mar 22, 2024" )
set ( GraphBLAS_VERSION_MAJOR 9 CACHE STRING "" FORCE )
set ( GraphBLAS_VERSION_MINOR 0 CACHE STRING "" FORCE )
set ( GraphBLAS_VERSION_SUB 3 CACHE STRING "" FORCE )
set ( GraphBLAS_VERSION_MINOR 1 CACHE STRING "" FORCE )
set ( GraphBLAS_VERSION_SUB 0 CACHE STRING "" FORCE )

# GraphBLAS C API Specification version, at graphblas.org
set ( GraphBLAS_API_DATE "Dec 22, 2023" )
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
SuiteSparse: A Suite of Sparse matrix packages at http://suitesparse.com
-----------------------------------------------------------------------------

Mar 2, 2024, SuiteSparse VERSION 7.6.1
Feb XX, 2024, SuiteSparse VERSION 7.7.0

SuiteSparse is a set of sparse-matrix-related packages written or co-authored
by Tim Davis, available at https://github.com/DrTimothyAldenDavis/SuiteSparse .
Expand Down
8 changes: 4 additions & 4 deletions SuiteSparse_config/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
cmake_minimum_required ( VERSION 3.22 )

# version of both SuiteSparse and SuiteSparse_config
set ( SUITESPARSE_DATE "Mar 2, 2024" )
set ( SUITESPARSE_DATE "Feb XX, 2024" ) # FIXME for 7.7.0
set ( SUITESPARSE_VERSION_MAJOR 7 )
set ( SUITESPARSE_VERSION_MINOR 6 )
set ( SUITESPARSE_VERSION_SUB 1 )
set ( SUITESPARSE_VERSION_MINOR 7 )
set ( SUITESPARSE_VERSION_SUB 0 )
set ( SUITESPARSE_CONFIG_VERSION_MAJOR ${SUITESPARSE_VERSION_MAJOR} CACHE STRING "" FORCE )
set ( SUITESPARSE_CONFIG_VERSION_MINOR ${SUITESPARSE_VERSION_MINOR} CACHE STRING "" FORCE )
set ( SUITESPARSE_CONFIG_VERSION_PATCH ${SUITESPARSE_VERSION_SUB} CACHE STRING "" FORCE )
Expand Down Expand Up @@ -174,7 +174,7 @@ if ( BUILD_STATIC_LIBS )
OUTPUT_NAME suitesparseconfig
PUBLIC_HEADER "SuiteSparse_config.h" )

if ( MSVC )
if ( MSVC OR ("${CMAKE_C_SIMULATE_ID}" STREQUAL "MSVC") )
set_target_properties ( SuiteSparseConfig_static PROPERTIES
OUTPUT_NAME suitesparseconfig_static )
endif ( )
Expand Down
10 changes: 5 additions & 5 deletions SuiteSparse_config/SuiteSparse_config.h
Original file line number Diff line number Diff line change
Expand Up @@ -420,19 +420,19 @@ int SuiteSparse_version // returns SUITESPARSE_VERSION

#define SUITESPARSE_HAS_VERSION_FUNCTION

#define SUITESPARSE_DATE "Mar 2, 2024"
#define SUITESPARSE_DATE "Feb XX, 2024"
#define SUITESPARSE_MAIN_VERSION 7
#define SUITESPARSE_SUB_VERSION 6
#define SUITESPARSE_SUBSUB_VERSION 1
#define SUITESPARSE_SUB_VERSION 7
#define SUITESPARSE_SUBSUB_VERSION 0

// version format x.y
#define SUITESPARSE_VER_CODE(main,sub) ((main) * 1000 + (sub))
#define SUITESPARSE_VERSION SUITESPARSE_VER_CODE(7, 6)
#define SUITESPARSE_VERSION SUITESPARSE_VER_CODE(7, 7)

// version format x.y.z
#define SUITESPARSE__VERCODE(main,sub,patch) \
(((main)*1000ULL + (sub))*1000ULL + (patch))
#define SUITESPARSE__VERSION SUITESPARSE__VERCODE(7,6,1)
#define SUITESPARSE__VERSION SUITESPARSE__VERCODE(7,7,0)

//==============================================================================
// SuiteSparse interface to the BLAS and LAPACK libraries
Expand Down

0 comments on commit 9fc13e0

Please sign in to comment.