Merge pull request #85 from DrTimothyAldenDavis/master

Master
DrTimothyAldenDavis · Jan 1, 2022 · 3c2b40c · 3c2b40c
2 parents 7d54a26 + 316df32
commit 3c2b40c
Show file tree

Hide file tree

Showing 19 changed files with 933 additions and 291 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -26,10 +26,10 @@ endif ( )
 set ( CMAKE_MACOSX_RPATH TRUE )
 
 # version of SuiteSparse:GraphBLAS
-set ( GraphBLAS_DATE "Dec 28, 2021")
+set ( GraphBLAS_DATE "Dec 31, 2021")
 set ( GraphBLAS_VERSION_MAJOR 6 )
 set ( GraphBLAS_VERSION_MINOR 1 )
-set ( GraphBLAS_VERSION_SUB   1 )
+set ( GraphBLAS_VERSION_SUB   2 )
 
 message ( STATUS "Building SuiteSparse:GraphBLAS version: v" ${GraphBLAS_VERSION_MAJOR}.${GraphBLAS_VERSION_MINOR}.${GraphBLAS_VERSION_SUB}  " date: " ${GraphBLAS_DATE} )
 

diff --git a/Config/GraphBLAS.h.in b/Config/GraphBLAS.h.in
@@ -751,7 +751,7 @@ GrB_Info GRB (Type_new)         // create a new GraphBLAS type
 // characters, including the required null-terminating character) that may
 // appear as the name of a C type created by a C "typedef" statement.  It must
 // not contain any white-space characters.  Example, creating a type of size
-// 16*4+1 = 65 bytes, with a 4-by-4 dense float array and a 32-bit integer:
+// 16*4+4 = 68 bytes, with a 4-by-4 dense float array and a 32-bit integer:
 //
 //      typedef struct { float x [4][4] ; int color ; } myquaternion ;
 //      GrB_Type MyQtype ;

diff --git a/Doc/ChangeLog b/Doc/ChangeLog
@@ -1,3 +1,10 @@
+Version 6.1.2, Dec 31, 2021
+
+    * performance: revised swap_rule in GrB_mxm, which decides whether
+        to compute C=A*B or C=(B'*A')', and variants, resulting in up
+        to 3x performance gain over v6.1.1 for GrB_mxm (observed;
+        could be higher in other cases).
+
 Version 6.1.1, Dec 28, 2021
 
     * minor revision to AVX2 and AVX512f selection

diff --git a/Doc/GraphBLAS_UserGuide.pdf b/Doc/GraphBLAS_UserGuide.pdf
diff --git a/Doc/GraphBLAS_UserGuide.tex b/Doc/GraphBLAS_UserGuide.tex
@@ -148,7 +148,16 @@ \subsection{Release Notes}
 
 \begin{itemize}
 
-\item Version 6.1.1 (Dec 28, 2021)  % FIXME
+\item Version 6.1.2 (Dec 31, 2021)
+
+    \begin{packed_itemize}
+    \item performance: revised \verb'swap_rule' in \verb'GrB_mxm', which decides whether
+        to compute \verb"C=A*B" or \verb"C=(B'*A')'", and variants, resulting in up
+        to 3x performance gain over v6.1.1 for \verb'GrB_mxm' (observed;
+        could be higher in other cases).
+    \end{packed_itemize}
+
+\item Version 6.1.1 (Dec 28, 2021) 
 
     \begin{packed_itemize}
     \item minor revision to AVX2 and AVX512f selection

diff --git a/Doc/GraphBLAS_version.tex b/Doc/GraphBLAS_version.tex
@@ -1,5 +1,5 @@
 % version of SuiteSparse:GraphBLAS
 \date{VERSION
-6.1.1,
-Dec 28, 2021}
+6.1.2,
+Dec 31, 2021}