Merge pull request #437 from DrTimothyAldenDavis/dev

v7.2.1
DrTimothyAldenDavis · Oct 13, 2023 · d6c84f7 · d6c84f7
2 parents 8a7641c + a43c386
commit d6c84f7
Show file tree

Hide file tree

Showing 168 changed files with 4,432 additions and 3,570 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -22,7 +22,7 @@ jobs:
     # https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners
     runs-on: ubuntu-latest
 
-    name: ubuntu (${{ matrix.compiler }} ${{ matrix.cuda }} CUDA)
+    name: ubuntu (${{ matrix.compiler }} ${{ matrix.cuda }} CUDA ${{ matrix.openmp }} OpenMP)
 
     strategy:
       # Allow other runners in the matrix to continue if some fail
@@ -31,6 +31,7 @@ jobs:
       matrix:
         compiler: [gcc, clang]
         cuda: [with, without]
+        openmp: [with]
         include:
           - compiler: gcc
             compiler-pkgs: "g++ gcc"
@@ -51,6 +52,14 @@ jobs:
               -DENABLE_CUDA=On
               -DCUDAToolkit_INCLUDE_DIR="/usr/include"
               -DCMAKE_CUDA_COMPILER_LAUNCHER="ccache"
+          - compiler: gcc
+            compiler-pkgs: "g++ gcc"
+            cc: "gcc"
+            cxx: "g++"
+            ccache-max: 600M
+            cuda: without
+            openmp: without
+            openmp-cmake-flags: "-DNOPENMP=ON"
 
     env:
       CC: ${{ matrix.cc }}
@@ -75,7 +84,7 @@ jobs:
         # used in action/cache/restore and action/cache/save steps
         id: ccache-prepare
         run: |
-          echo "key=ccache:ubuntu:${{ matrix.compiler }}:${{ matrix.cuda }}:${{ github.ref }}:$(date +"%Y-%m-%d_%H-%M-%S"):${{ github.sha }}" >> $GITHUB_OUTPUT
+          echo "key=ccache:ubuntu:${{ matrix.compiler }}:${{ matrix.cuda }}:${{ matrix.openmp }}:${{ github.ref }}:$(date +"%Y-%m-%d_%H-%M-%S"):${{ github.sha }}" >> $GITHUB_OUTPUT
 
       - name: restore ccache
         # setup the GitHub cache used to maintain the ccache from one job to the next
@@ -85,8 +94,8 @@ jobs:
           key: ${{ steps.ccache-prepare.outputs.key }}
           # Prefer caches from the same branch. Fall back to caches from the dev branch.
           restore-keys: |
-            ccache:ubuntu:${{ matrix.compiler }}:${{ matrix.cuda }}:${{ github.ref }}
-            ccache:ubuntu:${{ matrix.compiler }}:${{ matrix.cuda }}
+            ccache:ubuntu:${{ matrix.compiler }}:${{ matrix.cuda }}:${{ matrix.openmp }}:${{ github.ref }}
+            ccache:ubuntu:${{ matrix.compiler }}:${{ matrix.cuda }}:${{ matrix.openmp }}:
 
       - name: create empty libraries
         # This is to work around a bug in nvlink.
@@ -127,6 +136,7 @@ jobs:
                   -DCMAKE_Fortran_COMPILER_LAUNCHER="ccache" \
                   -DBLA_VENDOR="OpenBLAS" \
                   ${{ matrix.cuda-cmake-flags }} \
+                  ${{ matrix.openmp-cmake-flags }} \
                   ..
             echo "::endgroup::"
             echo "::group::Build $lib"
@@ -573,7 +583,7 @@ jobs:
           # Prefer caches from the same branch. Fall back to caches from the dev branch.
           restore-keys: |
             ccache:msvc:${{ matrix.openmp }}:${{ github.ref }}
-            ccache:msvc:${{ matrix.openmp }}
+            ccache:msvc:${{ matrix.openmp }}:
 
       - name: configure ccache
         # Limit the maximum size and switch on compression to avoid exceeding the total disk or cache quota.

diff --git a/AMD/CMakeLists.txt b/AMD/CMakeLists.txt
@@ -12,10 +12,10 @@
 
 cmake_minimum_required ( VERSION 3.20 )
 
-set ( AMD_DATE "Sept 8, 2023" )
+set ( AMD_DATE "Sept 18, 2023" )
 set ( AMD_VERSION_MAJOR 3 )
 set ( AMD_VERSION_MINOR 2 )
-set ( AMD_VERSION_SUB   0 )
+set ( AMD_VERSION_SUB   1 )
 
 message ( STATUS "Building AMD version: v"
     ${AMD_VERSION_MAJOR}.

diff --git a/AMD/Config/AMDConfig.cmake.in b/AMD/Config/AMDConfig.cmake.in
@@ -60,7 +60,7 @@ if ( TARGET ${_target_static} )
 endif ( )
 
 # Check for most common build types
-set ( _config_types "Debug" "Release" "RelWithDebInfo" "MinSizeRel" )
+set ( _config_types "Debug" "Release" "RelWithDebInfo" "MinSizeRel" "None" )
 
 get_property ( _isMultiConfig GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG )
 if ( _isMultiConfig )

diff --git a/AMD/Demo/amd_demo.out b/AMD/Demo/amd_demo.out
@@ -1,7 +1,7 @@
-AMD version 3.2.0, date: Sept 8, 2023
+AMD version 3.2.1, date: Sept 18, 2023
 AMD demo, with the 24-by-24 Harwell/Boeing matrix, can_24:
 
-AMD version 3.2.0, Sept 8, 2023: approximate minimum degree ordering
+AMD version 3.2.1, Sept 18, 2023: approximate minimum degree ordering
     dense row parameter: 10
     (rows with more than max (10 * sqrt (n), 16) entries are
     considered "dense", and placed last in output permutation)
@@ -115,7 +115,7 @@ Plot of input matrix pattern:
 23:  . . . . . . X . . . . X X . . . . . . . . . . X
 return value from amd_order: 0 (should be 0)
 
-AMD version 3.2.0, Sept 8, 2023, results:
+AMD version 3.2.1, Sept 18, 2023, results:
     status: OK
     n, dimension of A:                                  24
     nz, number of nonzeros in A:                        160

diff --git a/AMD/Demo/amd_demo2.out b/AMD/Demo/amd_demo2.out
@@ -1,7 +1,7 @@
 AMD demo, with a jumbled version of the 24-by-24
 Harwell/Boeing matrix, can_24:
 
-AMD version 3.2.0, Sept 8, 2023: approximate minimum degree ordering
+AMD version 3.2.1, Sept 18, 2023: approximate minimum degree ordering
     dense row parameter: 10
     (rows with more than max (10 * sqrt (n), 16) entries are
     considered "dense", and placed last in output permutation)
@@ -144,7 +144,7 @@ Plot of symmetric matrix to be ordered by amd_order:
 23:  . . . . . . X . . . . X X . . . . . . . . . . X
 return value from amd_order: 1 (should be 1)
 
-AMD version 3.2.0, Sept 8, 2023, results:
+AMD version 3.2.1, Sept 18, 2023, results:
     status: OK, but jumbled
     n, dimension of A:                                  24
     nz, number of nonzeros in A:                        102

diff --git a/AMD/Demo/amd_l_demo.out b/AMD/Demo/amd_l_demo.out
@@ -1,7 +1,7 @@
-AMD version 3.2.0, date: Sept 8, 2023
+AMD version 3.2.1, date: Sept 18, 2023
 AMD demo, with the 24-by-24 Harwell/Boeing matrix, can_24:
 
-AMD version 3.2.0, Sept 8, 2023: approximate minimum degree ordering
+AMD version 3.2.1, Sept 18, 2023: approximate minimum degree ordering
     dense row parameter: 10
     (rows with more than max (10 * sqrt (n), 16) entries are
     considered "dense", and placed last in output permutation)
@@ -115,7 +115,7 @@ Plot of input matrix pattern:
 23:  . . . . . . X . . . . X X . . . . . . . . . . X
 return value from amd_l_order: 0 (should be 0)
 
-AMD version 3.2.0, Sept 8, 2023, results:
+AMD version 3.2.1, Sept 18, 2023, results:
     status: OK
     n, dimension of A:                                  24
     nz, number of nonzeros in A:                        160

diff --git a/AMD/Doc/AMD_UserGuide.pdf b/AMD/Doc/AMD_UserGuide.pdf
diff --git a/AMD/Doc/ChangeLog b/AMD/Doc/ChangeLog
@@ -1,3 +1,7 @@
+Sept 18, 2023: version 3.2.1
+
+    * cmake update: add "None" build type, from Antonio Rojas, for Arch Linux
+
 Sept 8, 2023: version 3.2.0
 
     * cmake updates: SuiteSparse:: namespace by Markus Muetzel

diff --git a/AMD/Doc/amd_version.tex b/AMD/Doc/amd_version.tex
@@ -1,2 +1,2 @@
 % version of SuiteSparse/AMD
-\date{VERSION 3.2.0, Sept 8, 2023}
+\date{VERSION 3.2.1, Sept 18, 2023}
diff --git a/AMD/Include/amd.h b/AMD/Include/amd.h
@@ -374,10 +374,10 @@ void amd_l_info     (double Info [ ]) ;
  * Versions 1.1 and earlier of AMD do not include a #define'd version number.
  */
 
-#define AMD_DATE "Sept 8, 2023"
+#define AMD_DATE "Sept 18, 2023"
 #define AMD_MAIN_VERSION   3
 #define AMD_SUB_VERSION    2
-#define AMD_SUBSUB_VERSION 0
+#define AMD_SUBSUB_VERSION 1
 
 #define AMD_VERSION_CODE(main,sub) ((main) * 1000 + (sub))
 #define AMD_VERSION AMD_VERSION_CODE(AMD_MAIN_VERSION,AMD_SUB_VERSION)

diff --git a/BTF/CMakeLists.txt b/BTF/CMakeLists.txt
@@ -12,10 +12,10 @@
 
 cmake_minimum_required ( VERSION 3.20 )
 
-set ( BTF_DATE "Sept 8, 2023" )
+set ( BTF_DATE "Sept 18, 2023" )
 set ( BTF_VERSION_MAJOR 2 )
 set ( BTF_VERSION_MINOR 2 )
-set ( BTF_VERSION_SUB   0 )
+set ( BTF_VERSION_SUB   1 )
 
 message ( STATUS "Building BTF version: v"
     ${BTF_VERSION_MAJOR}.

diff --git a/BTF/Config/BTFConfig.cmake.in b/BTF/Config/BTFConfig.cmake.in
@@ -60,7 +60,7 @@ if ( TARGET ${_target_static} )
 endif ( )
 
 # Check for most common build types
-set ( _config_types "Debug" "Release" "RelWithDebInfo" "MinSizeRel" )
+set ( _config_types "Debug" "Release" "RelWithDebInfo" "MinSizeRel" "None" )
 
 get_property ( _isMultiConfig GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG )
 if ( _isMultiConfig )

diff --git a/BTF/Doc/ChangeLog b/BTF/Doc/ChangeLog
@@ -1,3 +1,7 @@
+Sept 18, 2023: version 2.2.1
+
+    * cmake update: add "None" build type, from Antonio Rojas, for Arch Linux
+
 Sept 8, 2023: version 2.2.0
 
     * cmake updates: SuiteSparse:: namespace by Markus Muetzel

diff --git a/BTF/Include/btf.h b/BTF/Include/btf.h
@@ -254,10 +254,10 @@ int64_t btf_l_order (int64_t, int64_t *, int64_t *, double , double *,
  *      #endif
  */
 
-#define BTF_DATE "Sept 8, 2023"
+#define BTF_DATE "Sept 18, 2023"
 #define BTF_MAIN_VERSION   2
 #define BTF_SUB_VERSION    2
-#define BTF_SUBSUB_VERSION 0
+#define BTF_SUBSUB_VERSION 1
 
 #define BTF_VERSION_CODE(main,sub) ((main) * 1000 + (sub))
 #define BTF_VERSION BTF_VERSION_CODE(BTF_MAIN_VERSION,BTF_SUB_VERSION)

diff --git a/CAMD/CMakeLists.txt b/CAMD/CMakeLists.txt
@@ -11,10 +11,10 @@
 
 cmake_minimum_required ( VERSION 3.20 )
 
-set ( CAMD_DATE "Sept 8, 2023" )
+set ( CAMD_DATE "Sept 18, 2023" )
 set ( CAMD_VERSION_MAJOR 3 )
 set ( CAMD_VERSION_MINOR 2 )
-set ( CAMD_VERSION_SUB   0 )
+set ( CAMD_VERSION_SUB   1 )
 
 message ( STATUS "Building CAMD version: v"
     ${CAMD_VERSION_MAJOR}.

diff --git a/CAMD/Config/CAMDConfig.cmake.in b/CAMD/Config/CAMDConfig.cmake.in
@@ -60,7 +60,7 @@ if ( TARGET ${_target_static} )
 endif ( )
 
 # Check for most common build types
-set ( _config_types "Debug" "Release" "RelWithDebInfo" "MinSizeRel" )
+set ( _config_types "Debug" "Release" "RelWithDebInfo" "MinSizeRel" "None" )
 
 get_property ( _isMultiConfig GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG )
 if ( _isMultiConfig )

diff --git a/CAMD/Demo/camd_demo.out b/CAMD/Demo/camd_demo.out
@@ -1,7 +1,7 @@
-CAMD version 3.2, date: Sept 8, 2023
+CAMD version 3.2, date: Sept 18, 2023
 CAMD demo, with the 24-by-24 Harwell/Boeing matrix, can_24:
 
-camd version 3.2.0, Sept 8, 2023:  approximate minimum degree ordering:
+camd version 3.2.1, Sept 18, 2023:  approximate minimum degree ordering:
     dense row parameter: 10
     (rows with more than max (10 * sqrt (n), 16) entries are
     considered "dense", and placed last in output permutation)
@@ -115,7 +115,7 @@ Plot of input matrix pattern:
 23:  . . . . . . X . . . . X X . . . . . . . . . . X
 return value from camd_order: 0 (should be 0)
 
-CAMD version 3.2.0, Sept 8, 2023, results:
+CAMD version 3.2.1, Sept 18, 2023, results:
     status: OK
     n, dimension of A:                                  24
     nz, number of nonzeros in A:                        160

diff --git a/CAMD/Demo/camd_demo2.out b/CAMD/Demo/camd_demo2.out
@@ -1,7 +1,7 @@
 CAMD demo, with a jumbled version of the 24-by-24
 Harwell/Boeing matrix, can_24:
 
-camd version 3.2.0, Sept 8, 2023:  approximate minimum degree ordering:
+camd version 3.2.1, Sept 18, 2023:  approximate minimum degree ordering:
     dense row parameter: 10
     (rows with more than max (10 * sqrt (n), 16) entries are
     considered "dense", and placed last in output permutation)
@@ -144,7 +144,7 @@ Plot of symmetric matrix to be ordered by camd_order:
 23:  . . . . . . X . . . . X X . . . . . . . . . . X
 return value from camd_order: 1 (should be 1)
 
-CAMD version 3.2.0, Sept 8, 2023, results:
+CAMD version 3.2.1, Sept 18, 2023, results:
     status: OK, but jumbled
     n, dimension of A:                                  24
     nz, number of nonzeros in A:                        102

diff --git a/CAMD/Demo/camd_l_demo.out b/CAMD/Demo/camd_l_demo.out
@@ -1,7 +1,7 @@
-CAMD version 3.2, date: Sept 8, 2023
+CAMD version 3.2, date: Sept 18, 2023
 CAMD demo, with the 24-by-24 Harwell/Boeing matrix, can_24:
 
-camd version 3.2.0, Sept 8, 2023:  approximate minimum degree ordering:
+camd version 3.2.1, Sept 18, 2023:  approximate minimum degree ordering:
     dense row parameter: 10
     (rows with more than max (10 * sqrt (n), 16) entries are
     considered "dense", and placed last in output permutation)
@@ -115,7 +115,7 @@ Plot of input matrix pattern:
 23:  . . . . . . X . . . . X X . . . . . . . . . . X
 return value from camd_l_order: 0 (should be 0)
 
-CAMD version 3.2.0, Sept 8, 2023, results:
+CAMD version 3.2.1, Sept 18, 2023, results:
     status: OK
     n, dimension of A:                                  24
     nz, number of nonzeros in A:                        160

diff --git a/CAMD/Doc/CAMD_UserGuide.pdf b/CAMD/Doc/CAMD_UserGuide.pdf
diff --git a/CAMD/Doc/ChangeLog b/CAMD/Doc/ChangeLog
@@ -1,3 +1,7 @@
+Sept 18, 2023: version 3.2.1
+
+    * cmake update: add "None" build type, from Antonio Rojas, for Arch Linux
+
 Sept 8, 2023: version 3.2.0
 
     * cmake updates: SuiteSparse:: namespace by Markus Muetzel

diff --git a/CAMD/Doc/camd_version.tex b/CAMD/Doc/camd_version.tex
@@ -1,2 +1,2 @@
 % version of SuiteSparse/CAMD
-\date{VERSION 3.2.0, Sept 8, 2023}
+\date{VERSION 3.2.1, Sept 18, 2023}
diff --git a/CAMD/Include/camd.h b/CAMD/Include/camd.h
@@ -384,10 +384,10 @@ void camd_l_info     (double Info [ ]) ;
  *      #endif
  */
 
-#define CAMD_DATE "Sept 8, 2023"
+#define CAMD_DATE "Sept 18, 2023"
 #define CAMD_MAIN_VERSION   3
 #define CAMD_SUB_VERSION    2
-#define CAMD_SUBSUB_VERSION 0
+#define CAMD_SUBSUB_VERSION 1
 
 #define CAMD_VERSION_CODE(main,sub) ((main) * 1000 + (sub))
 #define CAMD_VERSION CAMD_VERSION_CODE(CAMD_MAIN_VERSION,CAMD_SUB_VERSION)

diff --git a/CCOLAMD/CMakeLists.txt b/CCOLAMD/CMakeLists.txt
@@ -11,10 +11,10 @@
 
 cmake_minimum_required ( VERSION 3.20 )
 
-set ( CCOLAMD_DATE "Sept 8, 2023" )
+set ( CCOLAMD_DATE "Sept 18, 2023" )
 set ( CCOLAMD_VERSION_MAJOR 3 )
 set ( CCOLAMD_VERSION_MINOR 2 )
-set ( CCOLAMD_VERSION_SUB   0 )
+set ( CCOLAMD_VERSION_SUB   1 )
 
 message ( STATUS "Building CCOLAMD version: v"
     ${CCOLAMD_VERSION_MAJOR}.

diff --git a/CCOLAMD/Config/CCOLAMDConfig.cmake.in b/CCOLAMD/Config/CCOLAMDConfig.cmake.in
@@ -60,7 +60,7 @@ if ( TARGET ${_target_static} )
 endif ( )
 
 # Check for most common build types
-set ( _config_types "Debug" "Release" "RelWithDebInfo" "MinSizeRel" )
+set ( _config_types "Debug" "Release" "RelWithDebInfo" "MinSizeRel" "None" )
 
 get_property ( _isMultiConfig GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG )
 if ( _isMultiConfig )

diff --git a/CCOLAMD/Demo/ccolamd_example.out b/CCOLAMD/Demo/ccolamd_example.out
@@ -15,7 +15,7 @@ Column 3, with 2 entries:
     row 1
     row 3
 
-ccolamd version 3.2.0, Sept 8, 2023: OK.  
+ccolamd version 3.2.1, Sept 18, 2023: OK.  
 ccolamd: number of dense or empty rows ignored:    0
 ccolamd: number of dense or empty columns ignored: 0
 ccolamd: number of garbage collections performed:  0
@@ -38,7 +38,7 @@ Column 3, with 1 entries:
     row 4
 Column 4, with 0 entries:
 
-csymamd version 3.2.0, Sept 8, 2023: OK.  
+csymamd version 3.2.1, Sept 18, 2023: OK.  
 csymamd: number of dense or empty rows ignored:    0
 csymamd: number of dense or empty columns ignored: 0
 csymamd: number of garbage collections performed:  0

diff --git a/CCOLAMD/Demo/ccolamd_l_example.out b/CCOLAMD/Demo/ccolamd_l_example.out
@@ -15,7 +15,7 @@ Column 3, with 2 entries:
     row 1
     row 3
 
-ccolamd version 3.2.0, Sept 8, 2023: OK.  
+ccolamd version 3.2.1, Sept 18, 2023: OK.  
 ccolamd: number of dense or empty rows ignored:    0
 ccolamd: number of dense or empty columns ignored: 0
 ccolamd: number of garbage collections performed:  0
@@ -38,7 +38,7 @@ Column 3, with 1 entries:
     row 4
 Column 4, with 0 entries:
 
-csymamd version 3.2.0, Sept 8, 2023: OK.  
+csymamd version 3.2.1, Sept 18, 2023: OK.  
 csymamd: number of dense or empty rows ignored:    0
 csymamd: number of dense or empty columns ignored: 0
 csymamd: number of garbage collections performed:  0

diff --git a/CCOLAMD/Doc/ChangeLog b/CCOLAMD/Doc/ChangeLog
@@ -1,3 +1,7 @@
+Sept 18, 2023: version 3.2.1
+
+    * cmake update: add "None" build type, from Antonio Rojas, for Arch Linux
+
 Sept 8, 2023: version 3.2.0
 
     * cmake updates: SuiteSparse:: namespace by Markus Muetzel

diff --git a/CCOLAMD/Include/ccolamd.h b/CCOLAMD/Include/ccolamd.h
@@ -41,10 +41,10 @@ extern "C" {
  *	#endif
  */
 
-#define CCOLAMD_DATE "Sept 8, 2023"
+#define CCOLAMD_DATE "Sept 18, 2023"
 #define CCOLAMD_MAIN_VERSION   3
 #define CCOLAMD_SUB_VERSION    2
-#define CCOLAMD_SUBSUB_VERSION 0
+#define CCOLAMD_SUBSUB_VERSION 1
 
 #define CCOLAMD_VERSION_CODE(main,sub) ((main) * 1000 + (sub))
 #define CCOLAMD_VERSION \