maybe fix? (path and extra constant)

eriknw · May 29, 2024 · 858df89 · 858df89
1 parent e35d3c4
commit 858df89
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/build_graphblas_cffi.py b/build_graphblas_cffi.py
@@ -19,12 +19,15 @@
     graphblas_root = "C:\\GraphBLAS" if is_win else sys.prefix
 
 include_dirs = [os.path.join(graphblas_root, "include")]
+include_dirs.append(os.path.join(graphblas_root, "include", "suitesparse"))
 library_dirs = [os.path.join(graphblas_root, "lib")]
 if is_win:
     include_dirs.append(os.path.join(sys.prefix, "Library", "include"))
+    include_dirs.append(os.path.join(sys.prefix, "Library", "include", "suitesparse"))
     library_dirs.append(os.path.join(sys.prefix, "Library", "lib"))
 
     include_dirs.append(os.path.join(graphblas_root, "include"))
+    include_dirs.append(os.path.join(graphblas_root, "include", "suitesparse"))
     library_dirs.append(os.path.join(graphblas_root, "lib"))
     library_dirs.append(os.path.join(graphblas_root, "bin"))
 

diff --git a/suitesparse_graphblas/create_headers.py b/suitesparse_graphblas/create_headers.py
@@ -298,7 +298,7 @@ def groupby(index, seq):
     "GxB_COMPRESSION_LZ4HC",
     "GxB_COMPRESSION_ZSTD",
     "GxB_COMPRESSION_NONE",
-    "GxB_HAVE_COMPLEX_C99",  # Added in 9.2.0
+    # "GxB_HAVE_COMPLEX_C99",  # Added in 9.2.0
 }
 
 CHAR_DEFINES = {

diff --git a/suitesparse_graphblas/suitesparse_graphblas.h b/suitesparse_graphblas/suitesparse_graphblas.h
@@ -3663,7 +3663,6 @@ GrB_Info GxB_Vector_unpack_Full(GrB_Vector v, void **vx, GrB_Index *vx_size, boo
 #define GxB_FAST_IMPORT ...
 #define GxB_FULL ...
 #define GxB_GPU_ID ...
-#define GxB_HAVE_COMPLEX_C99 ...
 #define GxB_HYPERSPARSE ...
 #define GxB_IMPLEMENTATION ...
 #define GxB_IMPLEMENTATION_MAJOR ...

diff --git a/suitesparse_graphblas/suitesparse_graphblas_no_complex.h b/suitesparse_graphblas/suitesparse_graphblas_no_complex.h
@@ -3429,7 +3429,6 @@ GrB_Info GxB_Vector_unpack_Full(GrB_Vector v, void **vx, GrB_Index *vx_size, boo
 #define GxB_FAST_IMPORT ...
 #define GxB_FULL ...
 #define GxB_GPU_ID ...
-#define GxB_HAVE_COMPLEX_C99 ...
 #define GxB_HYPERSPARSE ...
 #define GxB_IMPLEMENTATION ...
 #define GxB_IMPLEMENTATION_MAJOR ...