Merge pull request #233 from DrTimothyAldenDavis/dev

v6.0.3
DrTimothyAldenDavis · Dec 25, 2022 · 3fb9440 · 3fb9440
2 parents 648d6bd + fe843fb
commit 3fb9440
Show file tree

Hide file tree

Showing 38 changed files with 2,676 additions and 60 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -78,13 +78,16 @@ jobs:
 
       - name: build
         run: |
-          make CMAKE_OPTIONS="-G\"Unix Makefiles\" \
-                              -DCMAKE_BUILD_TYPE=Release \
+          make CMAKE_OPTIONS="-DCMAKE_BUILD_TYPE=Release \
                               -DCMAKE_C_COMPILER_LAUNCHER='ccache' \
                               -DCMAKE_CXX_COMPILER_LAUNCHER='ccache' \
                               -DCMAKE_Fortran_COMPILER_LAUNCHER='ccache' \
                               -DBLA_VENDOR=OpenBLAS"
 
+      - name: check
+        run: |
+          make demos
+
       - name: ccache status
         continue-on-error: true
         run: ccache -s
@@ -182,13 +185,19 @@ jobs:
 
       - name: build
         run: |
-          make CMAKE_OPTIONS="-DCMAKE_BUILD_TYPE=Release \
+          make CMAKE_OPTIONS="-DCMAKE_INSTALL_PREFIX=\"${MINGW_PREFIX}\" \
+                              -DCMAKE_BUILD_TYPE=Release \
                               -DCMAKE_C_COMPILER_LAUNCHER='ccache' \
                               -DCMAKE_CXX_COMPILER_LAUNCHER='ccache' \
                               -DCMAKE_Fortran_COMPILER_LAUNCHER='ccache' \
-                              -DENABLE_CUDA=OFF \
                               -DBLA_VENDOR=OpenBLAS"
 
+      - name: check
+        # Need to install the libraries for the tests
+        run: |
+          make install
+          make demos
+
       - name: ccache status
         continue-on-error: true
         run: ccache -s
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+Dec 23, 2022: SuiteSparse 6.0.3
+
+    * GraphBLAS v7.4.0:  added non-va_arg get/set methods.
+    * Mongoose v3.0.3:  change in build for test coverage
+
 Dec 9, 2022: SuiteSparse 6.0.2
 
     * minor change to build system for nearly all packages: (except CSparse,

diff --git a/GraphBLAS/CMakeLists.txt b/GraphBLAS/CMakeLists.txt
@@ -14,10 +14,10 @@
 cmake_minimum_required ( VERSION 3.19 )
 
 # version of SuiteSparse:GraphBLAS
-set ( GraphBLAS_DATE "Dec 9, 2022" )
+set ( GraphBLAS_DATE "Dec 23, 2022" )
 set ( GraphBLAS_VERSION_MAJOR 7 )
-set ( GraphBLAS_VERSION_MINOR 3 )
-set ( GraphBLAS_VERSION_SUB   3 )
+set ( GraphBLAS_VERSION_MINOR 4 )
+set ( GraphBLAS_VERSION_SUB   0 )
 
 # GraphBLAS C API Specification version, at graphblas.org
 set ( GraphBLAS_API_DATE "Nov 15, 2021" )

diff --git a/GraphBLAS/Config/GraphBLAS.h.in b/GraphBLAS/Config/GraphBLAS.h.in
@@ -577,6 +577,22 @@ GrB_Info GxB_Desc_set           // set a parameter in a descriptor
     ...                         // value to change it to
 ) ;
 
+GB_PUBLIC
+GrB_Info GxB_Desc_set_INT32     // set a parameter in a descriptor
+(
+    GrB_Descriptor desc,        // descriptor to modify
+    GrB_Desc_Field field,       // parameter to change
+    int32_t value               // value to change it to
+) ;
+
+GB_PUBLIC
+GrB_Info GxB_Desc_set_FP64      // set a parameter in a descriptor
+(
+    GrB_Descriptor desc,        // descriptor to modify
+    GrB_Desc_Field field,       // parameter to change
+    double value                // value to change it to
+) ;
+
 GB_PUBLIC
 GrB_Info GxB_Desc_get           // get a parameter from a descriptor
 (
@@ -585,6 +601,22 @@ GrB_Info GxB_Desc_get           // get a parameter from a descriptor
     ...                         // value of the parameter
 ) ;
 
+GB_PUBLIC
+GrB_Info GxB_Desc_get_INT32     // get a parameter from a descriptor
+(
+    GrB_Descriptor desc,        // descriptor to query; NULL is ok
+    GrB_Desc_Field field,       // parameter to query
+    int32_t *value              // return value of the descriptor
+) ;
+
+GB_PUBLIC
+GrB_Info GxB_Desc_get_FP64      // get a parameter from a descriptor
+(
+    GrB_Descriptor desc,        // descriptor to query; NULL is ok
+    GrB_Desc_Field field,       // parameter to query
+    double *value               // return value of the descriptor
+) ;
+
 GB_PUBLIC
 GrB_Info GrB_Descriptor_free    // free a descriptor
 (
@@ -4530,6 +4562,22 @@ GrB_Info GxB_Matrix_Option_set      // set an option in a matrix
     ...                             // value to change it to
 ) ;
 
+GB_PUBLIC
+GrB_Info GxB_Matrix_Option_set_INT32    // set an option in a matrix
+(
+    GrB_Matrix A,                   // matrix to modify
+    GxB_Option_Field field,         // option to change
+    int32_t value                   // value to change it to
+) ;
+
+GB_PUBLIC
+GrB_Info GxB_Matrix_Option_set_FP64     // set an option in a matrix
+(
+    GrB_Matrix A,                   // matrix to modify
+    GxB_Option_Field field,         // option to change
+    double value                    // value to change it to
+) ;
+
 GB_PUBLIC
 GrB_Info GxB_Matrix_Option_get      // gets the current option of a matrix
 (
@@ -4538,6 +4586,22 @@ GrB_Info GxB_Matrix_Option_get      // gets the current option of a matrix
     ...                             // return value of the matrix option
 ) ;
 
+GB_PUBLIC
+GrB_Info GxB_Matrix_Option_get_INT32    // gets the current option of a matrix
+(
+    GrB_Matrix A,                   // matrix to query
+    GxB_Option_Field field,         // option to query
+    int32_t *value                  // return value of the matrix option
+) ;
+
+GB_PUBLIC
+GrB_Info GxB_Matrix_Option_get_FP64     // gets the current option of a matrix
+(
+    GrB_Matrix A,                   // matrix to query
+    GxB_Option_Field field,         // option to query
+    double *value                   // return value of the matrix option
+) ;
+
 GB_PUBLIC
 GrB_Info GxB_Vector_Option_set      // set an option in a vector
 (
@@ -4546,6 +4610,22 @@ GrB_Info GxB_Vector_Option_set      // set an option in a vector
     ...                             // value to change it to
 ) ;
 
+GB_PUBLIC
+GrB_Info GxB_Vector_Option_set_INT32    // set an option in a vector
+(
+    GrB_Vector v,                   // vector to modify
+    GxB_Option_Field field,         // option to change
+    int32_t value                   // value to change it to
+) ;
+
+GB_PUBLIC
+GrB_Info GxB_Vector_Option_set_FP64    // set an option in a vector
+(
+    GrB_Vector v,                   // vector to modify
+    GxB_Option_Field field,         // option to change
+    double value                    // value to change it to
+) ;
+
 GB_PUBLIC
 GrB_Info GxB_Vector_Option_get      // gets the current option of a vector
 (
@@ -4554,6 +4634,22 @@ GrB_Info GxB_Vector_Option_get      // gets the current option of a vector
     ...                             // return value of the vector option
 ) ;
 
+GB_PUBLIC
+GrB_Info GxB_Vector_Option_get_INT32    // gets the current option of a vector
+(
+    GrB_Vector v,                   // vector to query
+    GxB_Option_Field field,         // option to query
+    int32_t *value                  // return value of the vector option
+) ;
+
+GB_PUBLIC
+GrB_Info GxB_Vector_Option_get_FP64      // gets the current option of a vector
+(
+    GrB_Vector v,                   // vector to query
+    GxB_Option_Field field,         // option to query
+    double *value                   // return value of the vector option
+) ;
+
 // GxB_Global_Option_set controls the global defaults used when a new matrix is
 // created.  GrB_init defines the following initial settings:
 //
@@ -4576,13 +4672,83 @@ GrB_Info GxB_Global_Option_set      // set a global default option
     ...                             // value to change it to
 ) ;
 
+GB_PUBLIC
+GrB_Info GxB_Global_Option_set_INT32      // set a global default option
+(
+    GxB_Option_Field field,         // option to change
+    int32_t value                   // value to change it to
+) ;
+
+GB_PUBLIC
+GrB_Info GxB_Global_Option_set_FP64      // set a global default option
+(
+    GxB_Option_Field field,         // option to change
+    double value                    // value to change it to
+) ;
+
+GB_PUBLIC
+GrB_Info GxB_Global_Option_set_FP64_ARRAY      // set a global default option
+(
+    GxB_Option_Field field,         // option to change
+    double *value                   // value to change it to
+) ;
+
+GB_PUBLIC
+GrB_Info GxB_Global_Option_set_INT64_ARRAY      // set a global default option
+(
+    GxB_Option_Field field,         // option to change
+    int64_t *value                  // value to change it to
+) ;
+
+GB_PUBLIC
+GrB_Info GxB_Global_Option_set_FUNCTION      // set a global default option
+(
+    GxB_Option_Field field,         // option to change
+    void *value                     // value to change it to
+) ;
+
 GB_PUBLIC
 GrB_Info GxB_Global_Option_get      // gets the current global default option
 (
     GxB_Option_Field field,         // option to query
     ...                             // return value of the global option
 ) ;
 
+GB_PUBLIC
+GrB_Info GxB_Global_Option_get_INT32    // gets the current global option
+(
+    GxB_Option_Field field,         // option to query
+    int32_t *value                  // return value of the global option
+) ;
+
+GB_PUBLIC
+GrB_Info GxB_Global_Option_get_FP64     // gets the current global option
+(
+    GxB_Option_Field field,         // option to query
+    double *value                   // return value of the global option
+) ;
+
+GB_PUBLIC
+GrB_Info GxB_Global_Option_get_INT64        // gets the current global option
+(
+    GxB_Option_Field field,         // option to query
+    int64_t *value                  // return value of the global option
+) ;
+
+GB_PUBLIC
+GrB_Info GxB_Global_Option_get_CHAR         // gets the current global option
+(
+    GxB_Option_Field field,         // option to query
+    char **value                    // return value of the global option
+) ;
+
+GB_PUBLIC
+GrB_Info GxB_Global_Option_get_FUNCTION // gets the current global option
+(
+    GxB_Option_Field field,         // option to query
+    void **value                    // return value of the global option
+) ;
+
 //------------------------------------------------------------------------------
 // GxB_set and GxB_get
 //------------------------------------------------------------------------------

diff --git a/GraphBLAS/Doc/ChangeLog b/GraphBLAS/Doc/ChangeLog
@@ -1,3 +1,14 @@
+Version 7.4.0, Dec 23, 2022
+
+    * added non-va_arg methods: va_arg-based GxB_get/set methods are ANSI C11
+        but cause issues for cffi in Python.  As a temporary workaround, new
+        methods have been added that do not use va_arg.  The existing
+        GxB_get/set methods are not changed.  The new methods are not in the
+        user guide, since all of the GxB_get/set methods will be superceded
+        with GrB_get/set in the v2.1 C API.  At that point, all GxB_get/set
+        methods will become historical (kept, not deprecated, but removed from
+        the user guide).
+
 Version 7.3.3, Dec 9, 2022
 
     * minor change to build system

diff --git a/GraphBLAS/Doc/GraphBLAS_UserGuide.pdf b/GraphBLAS/Doc/GraphBLAS_UserGuide.pdf
diff --git a/GraphBLAS/Doc/GraphBLAS_UserGuide.tex b/GraphBLAS/Doc/GraphBLAS_UserGuide.tex
@@ -15488,6 +15488,20 @@ \section{Release Notes}
 
 \begin{itemize}
 
+\item Version 7.4.0 (Dec 23, 2022)
+
+    \begin{itemize}
+    \item add non-\verb'va_arg' methods: \verb'va_arg'-based \verb'GxB_get/set'
+        methods are ANSI C11 but cause issues for cffi in Python.  As a
+        temporary workaround, new methods have been added that do not use
+        \verb'va_arg'.  The existing \verb'GxB_get/set' methods are not
+        changed.  The new methods are not in the user guide, since all of the
+        \verb'GxB_get/set' methods will be superceded with \verb'GrB_get/set'
+        in the v2.1 C API.  At that point, all \verb'GxB_get/set' methods will
+        become historical (kept, not deprecated, but removed from the user
+        guide).
+    \end{itemize}
+
 \item Version 7.3.3 (Dec 9, 2022)
 
     \begin{itemize}

diff --git a/GraphBLAS/Doc/GraphBLAS_version.tex b/GraphBLAS/Doc/GraphBLAS_version.tex
@@ -1,5 +1,5 @@
 % version of SuiteSparse:GraphBLAS
 \date{VERSION
-7.3.3,
-Dec 9, 2022}
+7.4.0,
+Dec 23, 2022}
 
diff --git a/GraphBLAS/GraphBLAS/CMakeLists.txt b/GraphBLAS/GraphBLAS/CMakeLists.txt
@@ -17,10 +17,10 @@ cmake_minimum_required ( VERSION 3.19 )
 
 # date version must match ../CMakeLists.txt:
 # version of SuiteSparse:GraphBLAS
-set ( GraphBLAS_DATE "Dec 9, 2022" )
+set ( GraphBLAS_DATE "Dec 23, 2022" )
 set ( GraphBLAS_VERSION_MAJOR 7 )
-set ( GraphBLAS_VERSION_MINOR 3 )
-set ( GraphBLAS_VERSION_SUB   3 )
+set ( GraphBLAS_VERSION_MINOR 4 )
+set ( GraphBLAS_VERSION_SUB   0 )
 
 message ( STATUS "Building SuiteSparse:GraphBLAS version: v"
     ${GraphBLAS_VERSION_MAJOR}.${GraphBLAS_VERSION_MINOR}.${GraphBLAS_VERSION_SUB}