From 559ebb291c951d74fc88fa09178241ddde0bef1f Mon Sep 17 00:00:00 2001 From: Tim Davis Date: Mon, 27 Nov 2023 22:14:57 -0600 Subject: [PATCH] RBio 4.3.0: version update --- RBio/CMakeLists.txt | 10 ++-- RBio/Demo/RBdemo.out | 114 ++++++++++++++++++++++++++----------------- RBio/Doc/ChangeLog | 4 ++ RBio/Include/RBio.h | 6 +-- 4 files changed, 82 insertions(+), 52 deletions(-) diff --git a/RBio/CMakeLists.txt b/RBio/CMakeLists.txt index fc7ad4adc9..2b8bae21cf 100644 --- a/RBio/CMakeLists.txt +++ b/RBio/CMakeLists.txt @@ -11,10 +11,10 @@ cmake_minimum_required ( VERSION 3.20 ) -set ( RBIO_DATE "Sept 18, 2023" ) +set ( RBIO_DATE "Dec 30, 2023" ) set ( RBIO_VERSION_MAJOR 4 CACHE STRING "" FORCE ) -set ( RBIO_VERSION_MINOR 2 CACHE STRING "" FORCE ) -set ( RBIO_VERSION_SUB 1 CACHE STRING "" FORCE ) +set ( RBIO_VERSION_MINOR 3 CACHE STRING "" FORCE ) +set ( RBIO_VERSION_SUB 0 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.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 ( ) endif ( ) diff --git a/RBio/Demo/RBdemo.out b/RBio/Demo/RBdemo.out index 5683bd1383..2e966c46e6 100644 --- a/RBio/Demo/RBdemo.out +++ b/RBio/Demo/RBdemo.out @@ -1,27 +1,29 @@ ( cd build && cmake .. && cmake --build . --config Release -j8 ) --- Building RBIO version: v4.2.1 (Sept 18, 2023) --- Source: /home/faculty/d/davis/dev2/SuiteSparse/RBio --- Build: /home/faculty/d/davis/dev2/SuiteSparse/RBio/build --- Install lib: /home/faculty/d/davis/dev2/SuiteSparse/lib --- Install include: /home/faculty/d/davis/dev2/SuiteSparse/include --- Install bin: /home/faculty/d/davis/dev2/SuiteSparse/bin --- Install rpath: /home/faculty/d/davis/dev2/SuiteSparse/lib --- Build rpath: /home/faculty/d/davis/dev2/SuiteSparse/RBio/build;/home/faculty/d/davis/dev2/SuiteSparse/lib +-- Building RBIO version: v4.3.0 (Dec 30, 2023) +-- Source: /home/davis/dev2/SuiteSparse/RBio +-- Build: /home/davis/dev2/SuiteSparse/RBio/build +-- Install lib: lib +-- Install include: include +-- Install bin: bin +-- Install pkg-file: lib +-- Install rpath: +-- Build rpath: /home/davis/dev2/SuiteSparse/RBio/build -- Build type: Release -- Fortran: /usr/bin/f95 -- CUDA: not enabled --- SuiteSparse_config version: 7.2.1 --- SuiteSparse_config include: /home/faculty/d/davis/dev2/SuiteSparse/SuiteSparse_config --- SuiteSparse_config library: /home/faculty/d/davis/dev2/SuiteSparse/SuiteSparse_config/build/libsuitesparseconfig.so.7.2.1 --- SuiteSparse_config static: /home/faculty/d/davis/dev2/SuiteSparse/SuiteSparse_config/build/libsuitesparseconfig.a +-- SuiteSparse_config version: 7.4.0 +-- SuiteSparse_config include: /home/davis/dev2/SuiteSparse/SuiteSparse_config +-- SuiteSparse_config library: /home/davis/dev2/SuiteSparse/SuiteSparse_config/build/libsuitesparseconfig.so.7.4.0 +-- SuiteSparse_config static: /home/davis/dev2/SuiteSparse/SuiteSparse_config/build/libsuitesparseconfig.a -- Also compiling the demos in RBio/Demo -- ------------------------------------------------------------------------ -- SuiteSparse CMAKE report for: rbio -- ------------------------------------------------------------------------ --- inside common SuiteSparse root: true --- install in SuiteSparse/lib and SuiteSparse/include: 1 +-- inside common SuiteSparse root: false +-- install in SuiteSparse/lib and SuiteSparse/include: OFF -- build type: Release --- NSTATIC: false (build static library) +-- BUILD_SHARED_LIBS: ON +-- BUILD_STATIC_LIBS: ON -- use OpenMP: no -- C compiler: /usr/bin/cc -- C flags: @@ -32,38 +34,51 @@ -- Fortran compiler: /usr/bin/f95 -- compile definitions: -- ------------------------------------------------------------------------ --- Configuring done (0.0s) --- Generating done (0.0s) --- Build files have been written to: /home/faculty/d/davis/dev2/SuiteSparse/RBio/build -gmake[1]: Entering directory '/home/faculty/d/davis/dev2/SuiteSparse/RBio/build' -[ 37%] Built target RBio -[ 75%] Built target RBio_static +-- Configuring done +-- Generating done +-- Build files have been written to: /home/davis/dev2/SuiteSparse/RBio/build +make[1]: Entering directory '/home/davis/dev2/SuiteSparse/RBio/build' +make[2]: Entering directory '/home/davis/dev2/SuiteSparse/RBio/build' +make[3]: Entering directory '/home/davis/dev2/SuiteSparse/RBio/build' +make[3]: Entering directory '/home/davis/dev2/SuiteSparse/RBio/build' +Consolidate compiler generated dependencies of target RBio +make[3]: Leaving directory '/home/davis/dev2/SuiteSparse/RBio/build' +Consolidate compiler generated dependencies of target RBio_static +make[3]: Leaving directory '/home/davis/dev2/SuiteSparse/RBio/build' +[ 37%] Built target RBio_static +[ 75%] Built target RBio +make[3]: Entering directory '/home/davis/dev2/SuiteSparse/RBio/build' +Consolidate compiler generated dependencies of target RBdemo +make[3]: Leaving directory '/home/davis/dev2/SuiteSparse/RBio/build' [100%] Built target RBdemo -gmake[1]: Leaving directory '/home/faculty/d/davis/dev2/SuiteSparse/RBio/build' +make[2]: Leaving directory '/home/davis/dev2/SuiteSparse/RBio/build' +make[1]: Leaving directory '/home/davis/dev2/SuiteSparse/RBio/build' ( cd build && cmake -DDEMO=1 .. && cmake --build . --config Release -j8 ) --- Building RBIO version: v4.2.1 (Sept 18, 2023) --- Source: /home/faculty/d/davis/dev2/SuiteSparse/RBio --- Build: /home/faculty/d/davis/dev2/SuiteSparse/RBio/build --- Install lib: /home/faculty/d/davis/dev2/SuiteSparse/lib --- Install include: /home/faculty/d/davis/dev2/SuiteSparse/include --- Install bin: /home/faculty/d/davis/dev2/SuiteSparse/bin --- Install rpath: /home/faculty/d/davis/dev2/SuiteSparse/lib --- Build rpath: /home/faculty/d/davis/dev2/SuiteSparse/RBio/build;/home/faculty/d/davis/dev2/SuiteSparse/lib +-- Building RBIO version: v4.3.0 (Dec 30, 2023) +-- Source: /home/davis/dev2/SuiteSparse/RBio +-- Build: /home/davis/dev2/SuiteSparse/RBio/build +-- Install lib: lib +-- Install include: include +-- Install bin: bin +-- Install pkg-file: lib +-- Install rpath: +-- Build rpath: /home/davis/dev2/SuiteSparse/RBio/build -- Build type: Release -- Fortran: /usr/bin/f95 -- CUDA: not enabled --- SuiteSparse_config version: 7.2.1 --- SuiteSparse_config include: /home/faculty/d/davis/dev2/SuiteSparse/SuiteSparse_config --- SuiteSparse_config library: /home/faculty/d/davis/dev2/SuiteSparse/SuiteSparse_config/build/libsuitesparseconfig.so.7.2.1 --- SuiteSparse_config static: /home/faculty/d/davis/dev2/SuiteSparse/SuiteSparse_config/build/libsuitesparseconfig.a +-- SuiteSparse_config version: 7.4.0 +-- SuiteSparse_config include: /home/davis/dev2/SuiteSparse/SuiteSparse_config +-- SuiteSparse_config library: /home/davis/dev2/SuiteSparse/SuiteSparse_config/build/libsuitesparseconfig.so.7.4.0 +-- SuiteSparse_config static: /home/davis/dev2/SuiteSparse/SuiteSparse_config/build/libsuitesparseconfig.a -- Also compiling the demos in RBio/Demo -- ------------------------------------------------------------------------ -- SuiteSparse CMAKE report for: rbio -- ------------------------------------------------------------------------ --- inside common SuiteSparse root: true --- install in SuiteSparse/lib and SuiteSparse/include: 1 +-- inside common SuiteSparse root: false +-- install in SuiteSparse/lib and SuiteSparse/include: OFF -- build type: Release --- NSTATIC: false (build static library) +-- BUILD_SHARED_LIBS: ON +-- BUILD_STATIC_LIBS: ON -- use OpenMP: no -- C compiler: /usr/bin/cc -- C flags: @@ -74,14 +89,25 @@ gmake[1]: Leaving directory '/home/faculty/d/davis/dev2/SuiteSparse/RBio/build' -- Fortran compiler: /usr/bin/f95 -- compile definitions: -- ------------------------------------------------------------------------ --- Configuring done (0.0s) --- Generating done (0.0s) --- Build files have been written to: /home/faculty/d/davis/dev2/SuiteSparse/RBio/build -gmake[1]: Entering directory '/home/faculty/d/davis/dev2/SuiteSparse/RBio/build' -[ 37%] Built target RBio -[ 75%] Built target RBio_static +-- Configuring done +-- Generating done +-- Build files have been written to: /home/davis/dev2/SuiteSparse/RBio/build +make[1]: Entering directory '/home/davis/dev2/SuiteSparse/RBio/build' +make[2]: Entering directory '/home/davis/dev2/SuiteSparse/RBio/build' +make[3]: Entering directory '/home/davis/dev2/SuiteSparse/RBio/build' +make[3]: Entering directory '/home/davis/dev2/SuiteSparse/RBio/build' +Consolidate compiler generated dependencies of target RBio_static +make[3]: Leaving directory '/home/davis/dev2/SuiteSparse/RBio/build' +Consolidate compiler generated dependencies of target RBio +make[3]: Leaving directory '/home/davis/dev2/SuiteSparse/RBio/build' +[ 37%] Built target RBio_static +[ 75%] Built target RBio +make[3]: Entering directory '/home/davis/dev2/SuiteSparse/RBio/build' +Consolidate compiler generated dependencies of target RBdemo +make[3]: Leaving directory '/home/davis/dev2/SuiteSparse/RBio/build' [100%] Built target RBdemo -gmake[1]: Leaving directory '/home/faculty/d/davis/dev2/SuiteSparse/RBio/build' +make[2]: Leaving directory '/home/davis/dev2/SuiteSparse/RBio/build' +make[1]: Leaving directory '/home/davis/dev2/SuiteSparse/RBio/build' ./build/RBdemo < ./RBio/private/west0479.rua =========================================================== diff --git a/RBio/Doc/ChangeLog b/RBio/Doc/ChangeLog index 615dfd74f4..b4808f1489 100644 --- a/RBio/Doc/ChangeLog +++ b/RBio/Doc/ChangeLog @@ -1,3 +1,7 @@ +Dec 30, 2023: version 4.3.0 + + * major change to build system: by Markus Mützel + Sept 18, 2023: version 4.2.1 * cmake update: add "None" build type, from Antonio Rojas, for Arch Linux diff --git a/RBio/Include/RBio.h b/RBio/Include/RBio.h index f14918ba2e..4007ee152e 100644 --- a/RBio/Include/RBio.h +++ b/RBio/Include/RBio.h @@ -79,10 +79,10 @@ extern "C" { #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 "Sept 18, 2023" +#define RBIO_DATE "Dec 30, 2023" #define RBIO_MAIN_VERSION 4 -#define RBIO_SUB_VERSION 2 -#define RBIO_SUBSUB_VERSION 1 +#define RBIO_SUB_VERSION 3 +#define RBIO_SUBSUB_VERSION 0 #define RBIO_VER_CODE(main,sub) ((main) * 1000 + (sub)) #define RBIO_VERSION RBIO_VER_CODE(RBIO_MAIN_VERSION,RBIO_SUB_VERSION)