Skip to content

Commit

Permalink
GraphBLAS 9.4.3: remove extraneous defn of 10 semirings in GraphBLAS.h
Browse files Browse the repository at this point in the history
  • Loading branch information
@DrTimothyAldenDavis
DrTimothyAldenDavis committed Dec 20, 2024
1 parent 6626a2f commit 2ac2257
Show file tree
Hide file tree
Showing 11 changed files with 41 additions and 120 deletions.
18 changes: 9 additions & 9 deletions GraphBLAS/Config/GraphBLAS.h.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1930,15 +1930,15 @@ GB_GLOBAL GrB_Semiring

// semirings with multiply op: z = FIRST (x,y), all types x,y,z the same:
GxB_PLUS_FIRST_INT8 , GxB_TIMES_FIRST_INT8 , GxB_ANY_FIRST_INT8 ,
GxB_MAX_FIRST_INT16 , GxB_PLUS_FIRST_INT16 , GxB_TIMES_FIRST_INT16 , GxB_ANY_FIRST_INT16 ,
GxB_MAX_FIRST_INT32 , GxB_PLUS_FIRST_INT32 , GxB_TIMES_FIRST_INT32 , GxB_ANY_FIRST_INT32 ,
GxB_MAX_FIRST_INT64 , GxB_PLUS_FIRST_INT64 , GxB_TIMES_FIRST_INT64 , GxB_ANY_FIRST_INT64 ,
GxB_MAX_FIRST_UINT8 , GxB_PLUS_FIRST_UINT8 , GxB_TIMES_FIRST_UINT8 , GxB_ANY_FIRST_UINT8 ,
GxB_MAX_FIRST_UINT16 , GxB_PLUS_FIRST_UINT16 , GxB_TIMES_FIRST_UINT16 , GxB_ANY_FIRST_UINT16 ,
GxB_MAX_FIRST_UINT32 , GxB_PLUS_FIRST_UINT32 , GxB_TIMES_FIRST_UINT32 , GxB_ANY_FIRST_UINT32 ,
GxB_MAX_FIRST_UINT64 , GxB_PLUS_FIRST_UINT64 , GxB_TIMES_FIRST_UINT64 , GxB_ANY_FIRST_UINT64 ,
GxB_MAX_FIRST_FP32 , GxB_PLUS_FIRST_FP32 , GxB_TIMES_FIRST_FP32 , GxB_ANY_FIRST_FP32 ,
GxB_MAX_FIRST_FP64 , GxB_PLUS_FIRST_FP64 , GxB_TIMES_FIRST_FP64 , GxB_ANY_FIRST_FP64 ,
GxB_PLUS_FIRST_INT16 , GxB_TIMES_FIRST_INT16 , GxB_ANY_FIRST_INT16 ,
GxB_PLUS_FIRST_INT32 , GxB_TIMES_FIRST_INT32 , GxB_ANY_FIRST_INT32 ,
GxB_PLUS_FIRST_INT64 , GxB_TIMES_FIRST_INT64 , GxB_ANY_FIRST_INT64 ,
GxB_PLUS_FIRST_UINT8 , GxB_TIMES_FIRST_UINT8 , GxB_ANY_FIRST_UINT8 ,
GxB_PLUS_FIRST_UINT16 , GxB_TIMES_FIRST_UINT16 , GxB_ANY_FIRST_UINT16 ,
GxB_PLUS_FIRST_UINT32 , GxB_TIMES_FIRST_UINT32 , GxB_ANY_FIRST_UINT32 ,
GxB_PLUS_FIRST_UINT64 , GxB_TIMES_FIRST_UINT64 , GxB_ANY_FIRST_UINT64 ,
GxB_PLUS_FIRST_FP32 , GxB_TIMES_FIRST_FP32 , GxB_ANY_FIRST_FP32 ,
GxB_PLUS_FIRST_FP64 , GxB_TIMES_FIRST_FP64 , GxB_ANY_FIRST_FP64 ,

// semirings with multiply op: z = SECOND (x,y), all types x,y,z the same:
GxB_PLUS_SECOND_INT8 , GxB_TIMES_SECOND_INT8 , GxB_ANY_SECOND_INT8 ,
Expand Down
6 changes: 6 additions & 0 deletions GraphBLAS/Doc/ChangeLog
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
Dec 20, 2024: version 9.4.3

* (57) bug fix: GraphBLAS.h header: remove duplicate definitions of
GxB_MAX_FIRST_* semirings (incompletely moved to 'historical' section
in 9.4.2).

Nov 18, 2024: version 9.4.2

* clarified User Guide: regarding when the hyper-hash is built
Expand Down
Binary file modified GraphBLAS/Doc/GraphBLAS_UserGuide.pdf
View file
Binary file not shown.
8 changes: 8 additions & 0 deletions GraphBLAS/Doc/GraphBLAS_UserGuide.tex
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14832,6 +14832,14 @@ \section{Release Notes}

\begin{itemize}

\item Dec 20, 2024: version 9.4.3

\begin{itemize}
\item (57) bug fix: GraphBLAS.h header: remove duplicate definitions of
\verb'GxB_MAX_FIRST_*' semirings (incompletely moved to 'historical' section
in 9.4.2).
\end{itemize}

\item Nov 20, 2024: version 9.4.2

\begin{itemize}
Expand Down
4 changes: 2 additions & 2 deletions GraphBLAS/Doc/GraphBLAS_version.tex
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
% version of SuiteSparse:GraphBLAS
\date{VERSION
9.4.2,
Nov 18, 2024}
9.4.3,
Dec 20, 2024}

24 changes: 12 additions & 12 deletions GraphBLAS/Include/GraphBLAS.h
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SuiteSparse:GraphBLAS 9.4.2
// SuiteSparse:GraphBLAS 9.4.3
//------------------------------------------------------------------------------
// GraphBLAS.h: definitions for the GraphBLAS package
//------------------------------------------------------------------------------
Expand Down Expand Up @@ -268,10 +268,10 @@

// The version of this implementation, and the GraphBLAS API version:
#define GxB_IMPLEMENTATION_NAME "SuiteSparse:GraphBLAS"
#define GxB_IMPLEMENTATION_DATE "Nov 18, 2024"
#define GxB_IMPLEMENTATION_DATE "Dec 20, 2024"
#define GxB_IMPLEMENTATION_MAJOR 9
#define GxB_IMPLEMENTATION_MINOR 4
#define GxB_IMPLEMENTATION_SUB 2
#define GxB_IMPLEMENTATION_SUB 3
#define GxB_SPEC_DATE "Dec 22, 2023"
#define GxB_SPEC_MAJOR 2
#define GxB_SPEC_MINOR 1
Expand Down Expand Up @@ -1930,15 +1930,15 @@ GB_GLOBAL GrB_Semiring

// semirings with multiply op: z = FIRST (x,y), all types x,y,z the same:
GxB_PLUS_FIRST_INT8 , GxB_TIMES_FIRST_INT8 , GxB_ANY_FIRST_INT8 ,
GxB_MAX_FIRST_INT16 , GxB_PLUS_FIRST_INT16 , GxB_TIMES_FIRST_INT16 , GxB_ANY_FIRST_INT16 ,
GxB_MAX_FIRST_INT32 , GxB_PLUS_FIRST_INT32 , GxB_TIMES_FIRST_INT32 , GxB_ANY_FIRST_INT32 ,
GxB_MAX_FIRST_INT64 , GxB_PLUS_FIRST_INT64 , GxB_TIMES_FIRST_INT64 , GxB_ANY_FIRST_INT64 ,
GxB_MAX_FIRST_UINT8 , GxB_PLUS_FIRST_UINT8 , GxB_TIMES_FIRST_UINT8 , GxB_ANY_FIRST_UINT8 ,
GxB_MAX_FIRST_UINT16 , GxB_PLUS_FIRST_UINT16 , GxB_TIMES_FIRST_UINT16 , GxB_ANY_FIRST_UINT16 ,
GxB_MAX_FIRST_UINT32 , GxB_PLUS_FIRST_UINT32 , GxB_TIMES_FIRST_UINT32 , GxB_ANY_FIRST_UINT32 ,
GxB_MAX_FIRST_UINT64 , GxB_PLUS_FIRST_UINT64 , GxB_TIMES_FIRST_UINT64 , GxB_ANY_FIRST_UINT64 ,
GxB_MAX_FIRST_FP32 , GxB_PLUS_FIRST_FP32 , GxB_TIMES_FIRST_FP32 , GxB_ANY_FIRST_FP32 ,
GxB_MAX_FIRST_FP64 , GxB_PLUS_FIRST_FP64 , GxB_TIMES_FIRST_FP64 , GxB_ANY_FIRST_FP64 ,
GxB_PLUS_FIRST_INT16 , GxB_TIMES_FIRST_INT16 , GxB_ANY_FIRST_INT16 ,
GxB_PLUS_FIRST_INT32 , GxB_TIMES_FIRST_INT32 , GxB_ANY_FIRST_INT32 ,
GxB_PLUS_FIRST_INT64 , GxB_TIMES_FIRST_INT64 , GxB_ANY_FIRST_INT64 ,
GxB_PLUS_FIRST_UINT8 , GxB_TIMES_FIRST_UINT8 , GxB_ANY_FIRST_UINT8 ,
GxB_PLUS_FIRST_UINT16 , GxB_TIMES_FIRST_UINT16 , GxB_ANY_FIRST_UINT16 ,
GxB_PLUS_FIRST_UINT32 , GxB_TIMES_FIRST_UINT32 , GxB_ANY_FIRST_UINT32 ,
GxB_PLUS_FIRST_UINT64 , GxB_TIMES_FIRST_UINT64 , GxB_ANY_FIRST_UINT64 ,
GxB_PLUS_FIRST_FP32 , GxB_TIMES_FIRST_FP32 , GxB_ANY_FIRST_FP32 ,
GxB_PLUS_FIRST_FP64 , GxB_TIMES_FIRST_FP64 , GxB_ANY_FIRST_FP64 ,

// semirings with multiply op: z = SECOND (x,y), all types x,y,z the same:
GxB_PLUS_SECOND_INT8 , GxB_TIMES_SECOND_INT8 , GxB_ANY_SECOND_INT8 ,
Expand Down
2 changes: 1 addition & 1 deletion GraphBLAS/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved.

SPDX-License-Identifier: Apache-2.0

VERSION 9.4.2, Nov 18, 2024
VERSION 9.4.3, Dec 20, 2024

SuiteSparse:GraphBLAS is a complete implementation of the GraphBLAS standard,
which defines a set of sparse matrix operations on an extended algebra of
Expand Down
8 changes: 1 addition & 7 deletions GraphBLAS/Source/builder/GB_build.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -295,8 +295,6 @@ GrB_Info GB_build // build matrix
Werk
)) ;

double tt = GB_OPENMP_GET_WTIME ;

//--------------------------------------------------------------------------
// return an error if any duplicates found when they were not expected
//--------------------------------------------------------------------------
Expand Down Expand Up @@ -344,10 +342,6 @@ GrB_Info GB_build // build matrix
ASSERT (!GB_ZOMBIES (T)) ;
ASSERT (!GB_JUMBLED (T)) ;
ASSERT (!GB_PENDING (T)) ;
info = GB_transplant_conform (C, C->type, &T, Werk) ;

tt = GB_OPENMP_GET_WTIME - tt;
GB_BURBLE_MATRIX (T, "(wrapup ORIG 64/64 time: %g) ", tt) ;
return (info) ;
return (GB_transplant_conform (C, C->type, &T, Werk)) ;
}

25 changes: 0 additions & 25 deletions GraphBLAS/Source/builder/GB_builder.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -178,9 +178,6 @@ GrB_Info GB_builder // build a matrix from tuples
ASSERT (J_work_size_handle != NULL) ;
ASSERT (S_work_size_handle != NULL) ;

double tt = GB_OPENMP_GET_WTIME ;
double t1 = GB_OPENMP_GET_WTIME ;

//--------------------------------------------------------------------------
// get Sx
//--------------------------------------------------------------------------
Expand Down Expand Up @@ -516,10 +513,6 @@ GrB_Info GB_builder // build a matrix from tuples
known_no_duplicates = known_sorted && no_duplicates_found ;
}

t1 = GB_OPENMP_GET_WTIME - t1 ;
GBURBLE (" (step1: %g sec)", t1) ;
t1 = GB_OPENMP_GET_WTIME ;

//--------------------------------------------------------------------------
// STEP 2: sort the tuples in ascending order
//--------------------------------------------------------------------------
Expand Down Expand Up @@ -640,10 +633,6 @@ GrB_Info GB_builder // build a matrix from tuples
}
}

t1 = GB_OPENMP_GET_WTIME - t1 ;
GBURBLE (" (step2: %g sec)", t1) ;
t1 = GB_OPENMP_GET_WTIME ;

//--------------------------------------------------------------------------
// STEP 3: count vectors and duplicates in each slice
//--------------------------------------------------------------------------
Expand Down Expand Up @@ -846,10 +835,6 @@ GrB_Info GB_builder // build a matrix from tuples
}
}

t1 = GB_OPENMP_GET_WTIME - t1 ;
GBURBLE (" (step3: %g sec)", t1) ;
t1 = GB_OPENMP_GET_WTIME ;

//--------------------------------------------------------------------------
// STEP 4: construct the vector pointers and hyperlist for T
//--------------------------------------------------------------------------
Expand Down Expand Up @@ -998,10 +983,6 @@ GrB_Info GB_builder // build a matrix from tuples

int64_t *restrict Ti = T->i ;

t1 = GB_OPENMP_GET_WTIME - t1 ;
GBURBLE (" (step4: %g sec)", t1) ;
t1 = GB_OPENMP_GET_WTIME ;

//==========================================================================
// numerical phase of the build: assemble any duplicates
//==========================================================================
Expand Down Expand Up @@ -1436,10 +1417,6 @@ GrB_Info GB_builder // build a matrix from tuples
}
}

t1 = GB_OPENMP_GET_WTIME - t1 ;
GBURBLE (" (step5: %g sec)", t1) ;
t1 = GB_OPENMP_GET_WTIME ;

//--------------------------------------------------------------------------
// free workspace and return result
//--------------------------------------------------------------------------
Expand All @@ -1451,8 +1428,6 @@ GrB_Info GB_builder // build a matrix from tuples
ASSERT_MATRIX_OK (T, "T built", GB0) ;
ASSERT (GB_IS_HYPERSPARSE (T)) ;
}
tt = GB_OPENMP_GET_WTIME - tt;
GB_BURBLE_MATRIX (T, "(build ORIG 64/64 time: %g) ", tt) ;
return (info) ;
}

62 changes: 0 additions & 62 deletions GraphBLAS/Test/test287.m
View file

This file was deleted.

4 changes: 2 additions & 2 deletions GraphBLAS/cmake_modules/GraphBLAS_version.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
#-------------------------------------------------------------------------------

# version of SuiteSparse:GraphBLAS
set ( GraphBLAS_DATE "Nov 18, 2024" )
set ( GraphBLAS_DATE "Dec 20, 2024" )
set ( GraphBLAS_VERSION_MAJOR 9 CACHE STRING "" FORCE )
set ( GraphBLAS_VERSION_MINOR 4 CACHE STRING "" FORCE )
set ( GraphBLAS_VERSION_SUB 2 CACHE STRING "" FORCE )
set ( GraphBLAS_VERSION_SUB 3 CACHE STRING "" FORCE )

# GraphBLAS C API Specification version, at graphblas.org
set ( GraphBLAS_API_DATE "Dec 22, 2023" )
Expand Down

0 comments on commit 2ac2257

Please sign in to comment.