Skip to content

Commit

Permalink
SPEX 2.3.0: version update
Browse files Browse the repository at this point in the history
  • Loading branch information
DrTimothyAldenDavis committed Nov 28, 2023
1 parent 559ebb2 commit 6f7e163
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 14 deletions.
18 changes: 9 additions & 9 deletions SPEX/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@

cmake_minimum_required ( VERSION 3.20 )

set ( SPEX_DATE "Sept 18, 2023" )
set ( SPEX_DATE "Dec 30, 2023" )
set ( SPEX_VERSION_MAJOR 2 CACHE STRING "" FORCE )
set ( SPEX_VERSION_MINOR 2 CACHE STRING "" FORCE )
set ( SPEX_VERSION_SUB 1 CACHE STRING "" FORCE )
set ( SPEX_VERSION_MINOR 3 CACHE STRING "" FORCE )
set ( SPEX_VERSION_SUB 0 CACHE STRING "" FORCE )

message ( STATUS "Building SPEX version: v"
${SPEX_VERSION_MAJOR}.
Expand Down Expand Up @@ -45,22 +45,22 @@ include ( SuiteSparsePolicy )
#-------------------------------------------------------------------------------

if ( NOT SUITESPARSE_ROOT_CMAKELISTS )
find_package ( SuiteSparse_config 7.2.0
find_package ( SuiteSparse_config 7.4.0
PATHS ${CMAKE_SOURCE_DIR}/../SuiteSparse_config/build NO_DEFAULT_PATH )
if ( NOT TARGET SuiteSparse::SuiteSparseConfig )
find_package ( SuiteSparse_config 7.2.0 REQUIRED )
find_package ( SuiteSparse_config 7.4.0 REQUIRED )
endif ( )

find_package ( AMD 3.2.0
find_package ( AMD 3.3.0
PATHS ${CMAKE_SOURCE_DIR}/../AMD/build NO_DEFAULT_PATH )
if ( NOT TARGET SuiteSparse::AMD )
find_package ( AMD 3.2.0 REQUIRED )
find_package ( AMD 3.3.0 REQUIRED )
endif ( )

find_package ( COLAMD 3.2.0
find_package ( COLAMD 3.3.0
PATHS ${CMAKE_SOURCE_DIR}/../COLAMD/build NO_DEFAULT_PATH )
if ( NOT TARGET SuiteSparse::COLAMD )
find_package ( COLAMD 3.2.0 REQUIRED )
find_package ( COLAMD 3.3.0 REQUIRED )
endif ( )
endif ( )

Expand Down
4 changes: 4 additions & 0 deletions SPEX/Doc/ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
Dec 30, 2023: version 2.3.0

* major change to build system: by Markus Mützel

Sept 18, 2023: version 2.2.1

* cmake update: add "None" build type, from Antonio Rojas, for Arch Linux
Expand Down
Binary file modified SPEX/Doc/SPEX_UserGuide.pdf
Binary file not shown.
1 change: 1 addition & 0 deletions SPEX/Doc/SPEX_UserGuide.tex
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
\documentclass[12pt]{report}
\batchmode
\usepackage{amsmath,amssymb,amsthm,latexsym,paralist,comment}
\usepackage{graphicx}
\usepackage{psfrag}
Expand Down
2 changes: 1 addition & 1 deletion SPEX/Doc/SPEX_version.tex
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
% version of SuiteSparse/SPEX
VERSION 2.2.1, Sept 18, 2023
VERSION 2.3.0, Dec 30, 2023
8 changes: 4 additions & 4 deletions SPEX/Include/SPEX.h
Original file line number Diff line number Diff line change
Expand Up @@ -265,11 +265,11 @@
// #define SPEX_UTIL_VERSION_MINOR 1
// #define SPEX_UTIL_VERSION_SUB 1

#define SPEX_DATE "Sept 18, 2023"
#define SPEX_VERSION "2.2.1"
#define SPEX_DATE "Dec 30, 2023"
#define SPEX_VERSION "2.3.0"
#define SPEX_VERSION_MAJOR 2
#define SPEX_VERSION_MINOR 2
#define SPEX_VERSION_SUB 1
#define SPEX_VERSION_MINOR 3
#define SPEX_VERSION_SUB 0

#if defined ( __cplusplus )
extern "C"
Expand Down

0 comments on commit 6f7e163

Please sign in to comment.