date, MSVC 2019+ workaround, MSVC locations

DrTimothyAldenDavis · Jan 5, 2023 · 8593844 · 8593844
1 parent bca0767
commit 8593844
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 20 deletions.
diff --git a/Doc/ChangeLog b/Doc/ChangeLog
@@ -1,4 +1,4 @@
-Version 7.4.1, Jan 1, 2023
+Version 7.4.1, Jan 9, 2023
 
     * global free pool: disabled.  Benefit for single-thread user applications
         was modest, and it causes too much contention in a critical section

diff --git a/Doc/GraphBLAS_version.tex b/Doc/GraphBLAS_version.tex
@@ -1,5 +1,5 @@
 % version of SuiteSparse:GraphBLAS
 \date{VERSION
 7.4.1,
-Jan 1, 2023}
+Jan 9, 2023}
 
diff --git a/Include/GraphBLAS.h b/Include/GraphBLAS.h
@@ -230,7 +230,7 @@
 
 // The version of this implementation, and the GraphBLAS API version:
 #define GxB_IMPLEMENTATION_NAME "SuiteSparse:GraphBLAS"
-#define GxB_IMPLEMENTATION_DATE "Jan 1, 2023"
+#define GxB_IMPLEMENTATION_DATE "Jan 9, 2023"
 #define GxB_IMPLEMENTATION_MAJOR 7
 #define GxB_IMPLEMENTATION_MINOR 4
 #define GxB_IMPLEMENTATION_SUB   1

diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@ SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2022, All Rights Reserved.
 
 SPDX-License-Identifier: Apache-2.0
 
-VERSION 7.4.1, Jan 1, 2023
+VERSION 7.4.1, Jan 9, 2023
 
 SuiteSparse:GraphBLAS is a complete implementation of the GraphBLAS standard,
 which defines a set of sparse matrix operations on an extended algebra of

diff --git a/Source/GB_compiler.h b/Source/GB_compiler.h
@@ -125,14 +125,14 @@
 // Workaround for compiler bug in Microsoft Visual Studio 2019
 //------------------------------------------------------------------------------
 
-// The GB_COMPILER_MSC_2019 flag disables the FIRST_FC32 and SECOND_FC32 binary
-// operators for the MS Visual Studio 2019 compiler (MSC versions 19.20 to
-// 19.29).  It's possible that the compiler bug appears in 19.30 and later (VS
-// 2022), but this hasn't been tested.  This macro optimistically assumes the
-// bug will be fixed in that version.
-
-#define GB_COMPILER_MSC_2019 ( GB_COMPILER_MSC && (GB_COMPILER_MAJOR == 19) \
-    && (GB_COMPILER_MINOR >= 20) && (GB_COMPILER_MINOR <= 29) )
+// The GB_COMPILER_MSC_2019_OR_NEWER flag disables the FIRST_FC32 and
+// SECOND_FC32 binary operators for the MS Visual Studio 2019 or newer compilers
+// (MSC versions 19.20 or newer).  It's possible that the compiler bug will be
+// fixed in later versions of the MSC.  In that case, an upper version bound
+// should be added to this macro.
+
+#define GB_COMPILER_MSC_2019_OR_NEWER ( GB_COMPILER_MSC \
+    && (GB_COMPILER_MAJOR == 19) && (GB_COMPILER_MINOR >= 20))
 
 //------------------------------------------------------------------------------
 // malloc.h: required include file for Microsoft Visual Studio

diff --git a/Source/Generated2/GB_binop__first_fc32.c b/Source/Generated2/GB_binop__first_fc32.c
@@ -118,7 +118,7 @@
 
 // disable this operator and use the generic case if these conditions hold
 #define GB_DISABLE \
-    (GxB_NO_FIRST || GxB_NO_FC32 || GxB_NO_FIRST_FC32 || GB_COMPILER_MSC_2019)
+    (GxB_NO_FIRST || GxB_NO_FC32 || GxB_NO_FIRST_FC32 || GB_COMPILER_MSC_2019_OR_NEWER)
 
 //------------------------------------------------------------------------------
 // C += A+B, all 3 matrices dense

diff --git a/Source/Generated2/GB_binop__second_fc32.c b/Source/Generated2/GB_binop__second_fc32.c
@@ -118,7 +118,7 @@
 
 // disable this operator and use the generic case if these conditions hold
 #define GB_DISABLE \
-    (GxB_NO_SECOND || GxB_NO_FC32 || GxB_NO_SECOND_FC32 || GB_COMPILER_MSC_2019)
+    (GxB_NO_SECOND || GxB_NO_FC32 || GxB_NO_SECOND_FC32 || GB_COMPILER_MSC_2019_OR_NEWER)
 
 //------------------------------------------------------------------------------
 // C += A+B, all 3 matrices dense

diff --git a/Source/codegen_binop_method.m b/Source/codegen_binop_method.m
@@ -228,7 +228,7 @@ function codegen_binop_method (binop, op, xtype)
     (isequal (binop, 'first') || isequal (binop, 'second')))
     % disable the FIRST_FC32 and SECOND_FC32 binary operators for
     % MS Visual Studio 2019.  These files trigger a bug in the compiler.
-    disable = [disable ' || GB_COMPILER_MSC_2019'] ;
+    disable = [disable ' || GB_COMPILER_MSC_2019_OR_NEWER'] ;
 end
 fprintf (f, 'define(`GB_disable'', `(%s)'')\n', disable) ;
 

diff --git a/cmake_modules/FindGraphBLAS.cmake b/cmake_modules/FindGraphBLAS.cmake
@@ -74,15 +74,15 @@ find_path ( GRAPHBLAS_INCLUDE_DIR
   PATH_SUFFIXES include Include
   )
 
-# dynamic SuiteSparse:GraphBLAS library
+# dynamic SuiteSparse:GraphBLAS library (or static if no dynamic library was built)
 find_library ( GRAPHBLAS_LIBRARY
-  NAMES graphblas
+  NAMES graphblas graphblas_static
   HINTS ${GRAPHBLAS_ROOT}
   HINTS ENV GRAPHBLAS_ROOT
   HINTS ${CMAKE_SOURCE_DIR}/..
   HINTS ${CMAKE_SOURCE_DIR}/../GraphBLAS
   HINTS ${CMAKE_SOURCE_DIR}/../SuiteSparse/GraphBLAS
-  PATH_SUFFIXES lib build alternative
+  PATH_SUFFIXES lib build build/Release build/Debug alternative
   )
 
 if ( MSVC )
@@ -102,7 +102,7 @@ find_library ( GRAPHBLAS_STATIC
   HINTS ${CMAKE_SOURCE_DIR}/..
   HINTS ${CMAKE_SOURCE_DIR}/../GraphBLAS
   HINTS ${CMAKE_SOURCE_DIR}/../SuiteSparse/GraphBLAS
-  PATH_SUFFIXES lib build alternative
+  PATH_SUFFIXES lib build build/Release build/Debug alternative
   )
 
 if ( NOT MSVC )

diff --git a/cmake_modules/GraphBLAS_version.cmake b/cmake_modules/GraphBLAS_version.cmake
@@ -6,7 +6,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 # version of SuiteSparse:GraphBLAS
-set ( GraphBLAS_DATE "Jan 1, 2023" )
+set ( GraphBLAS_DATE "Jan 9, 2023" )
 set ( GraphBLAS_VERSION_MAJOR 7 )
 set ( GraphBLAS_VERSION_MINOR 4 )
 set ( GraphBLAS_VERSION_SUB   1 )