Skip to content

Commit 10f7e5c

Browse files
committed
Install from conda-forge, and fix GxB_init
1 parent 4557d3f commit 10f7e5c

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

.github/workflows/test.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
matrix:
1717
os: ["ubuntu-latest", "macos-latest", "windows-latest"]
1818
python-version: ["3.7", "3.8", "3.9", "3.10"]
19-
source: ["source"]
19+
source: ["conda-forge", "source"]
2020
graphblas-version: ["6.0.0"]
2121
steps:
2222
- name: Checkout
@@ -41,7 +41,8 @@ jobs:
4141
pushd GraphBLAS-${{ matrix.graphblas-version }}/build
4242
echo ${CONDA_PREFIX}
4343
cmake -DCMAKE_INSTALL_PREFIX=${CONDA_PREFIX} -DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_BUILD_TYPE=Release ..
44-
make library JOBS=16
44+
cat Makefile
45+
make all JOBS=16
4546
make install
4647
popd
4748
- name: Build

suitesparse_graphblas/utils.pxd

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ ctypedef uint64_t (*GxB_init)(
2222
void *(*user_calloc_function)(size_t, size_t),
2323
void *(*user_realloc_function)(void *, size_t),
2424
void (*user_free_function)(void *),
25-
bint, # user_malloc_is_thread_safe
2625
)
2726

2827
cpdef int call_gxb_init(ffi, lib, int mode)

suitesparse_graphblas/utils.pyx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ cpdef int call_gxb_init(ffi, lib, int mode):
2727
# Return: function pointer in Cython!
2828

2929
cdef GxB_init func = <GxB_init><uintptr_t>int(ffi.cast("uintptr_t", ffi.addressof(lib, "GxB_init")))
30-
return func(<GrB_Mode>mode, PyDataMem_NEW, PyDataMem_NEW_ZEROED, PyDataMem_RENEW, PyDataMem_FREE, True)
30+
return func(<GrB_Mode>mode, PyDataMem_NEW, PyDataMem_NEW_ZEROED, PyDataMem_RENEW, PyDataMem_FREE)
3131

3232

3333
cpdef ndarray claim_buffer(ffi, cdata, size_t size, dtype):

0 commit comments

Comments
 (0)