diff --git a/build_graphblas_cffi.py b/build_graphblas_cffi.py index 1c73e1c..81002e9 100644 --- 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 index 2e723bb..2a1ba1e 100644 --- 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 index a268299..66eefda 100644 --- 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 index 8728b2c..05526f9 100644 --- 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 ...