Skip to content

Commit d62650f

Browse files
Merge pull request #270 from GraphBLAS/v1.1_branch
V1.1 branch for v1.1.5
2 parents 5e10874 + ae591a1 commit d62650f

File tree

4 files changed

+22
-17
lines changed

4 files changed

+22
-17
lines changed

Diff for: CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@
3939
cmake_minimum_required ( VERSION 3.20 ) # LAGraph can be built stand-alone
4040

4141
# version of LAGraph
42-
set ( LAGraph_DATE "Aug 20, 2024" )
42+
set ( LAGraph_DATE "Feb 20, 2025" )
4343
set ( LAGraph_VERSION_MAJOR 1 CACHE STRING "" FORCE )
4444
set ( LAGraph_VERSION_MINOR 1 CACHE STRING "" FORCE )
45-
set ( LAGraph_VERSION_SUB 4 CACHE STRING "" FORCE )
45+
set ( LAGraph_VERSION_SUB 5 CACHE STRING "" FORCE )
4646

4747
message ( STATUS "Building LAGraph version: v"
4848
${LAGraph_VERSION_MAJOR}.

Diff for: ChangeLog

+5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
Feb 20, 2025: version 1.1.5
2+
3+
* minor updates to github CI
4+
* typos: in helloworld demos
5+
16
Aug 20, 2024: version 1.1.4
27

38
* fix MMWrite when matrix is dense

Diff for: include/LAGraph.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@
3737
// See also the LAGraph_Version utility method, which returns these values.
3838
// These definitions are derived from LAGraph/CMakeLists.txt.
3939

40-
#define LAGRAPH_DATE "Aug 20, 2024"
40+
#define LAGRAPH_DATE "Feb 20, 2025"
4141
#define LAGRAPH_VERSION_MAJOR 1
4242
#define LAGRAPH_VERSION_MINOR 1
43-
#define LAGRAPH_VERSION_UPDATE 4
43+
#define LAGRAPH_VERSION_UPDATE 5
4444

4545
//==============================================================================
4646
// include files and helper macros

Diff for: src/utility/LAGraph_Vector_Print.c

+13-13
Original file line numberDiff line numberDiff line change
@@ -85,21 +85,21 @@ int LG_Vector_Print_ ## suffix \
8585
return (GrB_SUCCESS) ; \
8686
}
8787

88-
LG_VECTOR_PRINT (BOOL , bool , GrB_BOOL , "%d" , "%d" ) ;
89-
LG_VECTOR_PRINT (INT8 , int8_t , GrB_INT8 , "%d" , "%d" ) ;
90-
LG_VECTOR_PRINT (INT16 , int16_t , GrB_INT16 , "%d" , "%d" ) ;
91-
LG_VECTOR_PRINT (INT32 , int32_t , GrB_INT32 , "%" PRId32, "%" PRId32 ) ;
92-
LG_VECTOR_PRINT (INT64 , int64_t , GrB_INT64 , "%" PRId64, "%" PRId64 ) ;
93-
LG_VECTOR_PRINT (UINT8 , uint8_t , GrB_UINT8 , "%d" , "%d" ) ;
94-
LG_VECTOR_PRINT (UINT16, uint16_t, GrB_UINT16, "%d" , "%d" ) ;
95-
LG_VECTOR_PRINT (UINT32, uint32_t, GrB_UINT32, "%" PRIu32, "%" PRIu32 ) ;
96-
LG_VECTOR_PRINT (UINT64, uint64_t, GrB_UINT64, "%" PRIu64, "%" PRIu64 ) ;
97-
LG_VECTOR_PRINT (FP32 , float , GrB_FP32 , "%g" , "%0.7g" ) ;
98-
LG_VECTOR_PRINT (FP64 , double , GrB_FP64 , "%g" , "%0.15g") ;
88+
LG_VECTOR_PRINT (BOOL , bool , GrB_BOOL , "%d" , "%d" )
89+
LG_VECTOR_PRINT (INT8 , int8_t , GrB_INT8 , "%d" , "%d" )
90+
LG_VECTOR_PRINT (INT16 , int16_t , GrB_INT16 , "%d" , "%d" )
91+
LG_VECTOR_PRINT (INT32 , int32_t , GrB_INT32 , "%" PRId32, "%" PRId32 )
92+
LG_VECTOR_PRINT (INT64 , int64_t , GrB_INT64 , "%" PRId64, "%" PRId64 )
93+
LG_VECTOR_PRINT (UINT8 , uint8_t , GrB_UINT8 , "%d" , "%d" )
94+
LG_VECTOR_PRINT (UINT16, uint16_t, GrB_UINT16, "%d" , "%d" )
95+
LG_VECTOR_PRINT (UINT32, uint32_t, GrB_UINT32, "%" PRIu32, "%" PRIu32 )
96+
LG_VECTOR_PRINT (UINT64, uint64_t, GrB_UINT64, "%" PRIu64, "%" PRIu64 )
97+
LG_VECTOR_PRINT (FP32 , float , GrB_FP32 , "%g" , "%0.7g" )
98+
LG_VECTOR_PRINT (FP64 , double , GrB_FP64 , "%g" , "%0.15g")
9999
#if 0
100100
// would need to pass in an iscomplex flag to print creal(x) and cimag(x)
101-
LG_VECTOR_PRINT (FC32 , GxB_FC32_t, GxB_FC32, ...) ;
102-
LG_VECTOR_PRINT (FC64 , GxB_FC64_t, GxB_FC64, ...) ;
101+
LG_VECTOR_PRINT (FC32 , GxB_FC32_t, GxB_FC32, ...)
102+
LG_VECTOR_PRINT (FC64 , GxB_FC64_t, GxB_FC64, ...)
103103
#endif
104104

105105
#undef LG_FREE_WORK

0 commit comments

Comments
 (0)