Skip to content

Commit 879aadd

Browse files
eriknweriknw
committed
Update to alpha16
1 parent cbe3908 commit 879aadd

File tree

3 files changed

+37
-29
lines changed

3 files changed

+37
-29
lines changed

‎.github/workflows/test.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ jobs:
3131
activate-environment: suitesparse-graphblas
3232
- name: Build
3333
run: |
34-
# sh suitesparse.sh refs/tags/6.0.0.alpha12
35-
curl -L https://github.com/DrTimothyAldenDavis/GraphBLAS/archive/refs/tags/v6.0.0.alpha12.tar.gz | tar xzf -
36-
pushd GraphBLAS-6.0.0.alpha12/build
34+
# sh suitesparse.sh refs/tags/6.0.0.alpha16
35+
curl -L https://github.com/DrTimothyAldenDavis/GraphBLAS/archive/refs/tags/v6.0.0.alpha16.tar.gz | tar xzf -
36+
pushd GraphBLAS-6.0.0.alpha16/build
3737
echo ${CONDA_PREFIX}
3838
3939
cmake -DCMAKE_INSTALL_PREFIX=${CONDA_PREFIX} -DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_BUILD_TYPE=Release ..

‎suitesparse_graphblas/suitesparse_graphblas.h‎

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ typedef struct GB_Scalar_opaque *GxB_Scalar;
1919
typedef struct GB_SelectOp_opaque *GxB_SelectOp;
2020

2121
/* GxB typedefs (functions) */
22-
typedef bool (*GxB_select_function)(int64_t i, int64_t j, const void *x, const void *thunk);
22+
typedef bool (*GxB_select_function)(GrB_Index i, GrB_Index j, const void *x, const void *thunk);
2323
typedef void (*GxB_binary_function)(void *, const void *, const void *);
24-
typedef void (*GxB_index_unary_function)(void *z, const void *x, int64_t i, int64_t j, const void *y);
24+
typedef void (*GxB_index_unary_function)(void *z, const void *x, GrB_Index i, GrB_Index j, const void *y);
2525
typedef void (*GxB_unary_function)(void *, const void *);
2626

2727
/* GrB enums */
@@ -61,9 +61,7 @@ typedef enum
6161
{
6262
GrB_CSR_FORMAT = 0,
6363
GrB_CSC_FORMAT = 1,
64-
GrB_COO_FORMAT = 2,
65-
GrB_DENSE_ROW_FORMAT = 3,
66-
GrB_DENSE_COL_FORMAT = 4
64+
GrB_COO_FORMAT = 2
6765
} GrB_Format;
6866

6967
typedef enum
@@ -378,20 +376,20 @@ extern GrB_Descriptor GrB_DESC_ST1;
378376
extern GrB_Descriptor GrB_DESC_T0;
379377
extern GrB_Descriptor GrB_DESC_T0T1;
380378
extern GrB_Descriptor GrB_DESC_T1;
381-
extern GrB_IndexUnaryOp GrB_COLGT_INT64;
379+
extern GrB_IndexUnaryOp GrB_COLGT;
382380
extern GrB_IndexUnaryOp GrB_COLINDEX_INT32;
383381
extern GrB_IndexUnaryOp GrB_COLINDEX_INT64;
384-
extern GrB_IndexUnaryOp GrB_COLLE_INT64;
382+
extern GrB_IndexUnaryOp GrB_COLLE;
383+
extern GrB_IndexUnaryOp GrB_DIAG;
385384
extern GrB_IndexUnaryOp GrB_DIAGINDEX_INT32;
386385
extern GrB_IndexUnaryOp GrB_DIAGINDEX_INT64;
387-
extern GrB_IndexUnaryOp GrB_DIAG_INT64;
388-
extern GrB_IndexUnaryOp GrB_OFFDIAG_INT64;
389-
extern GrB_IndexUnaryOp GrB_ROWGT_INT64;
386+
extern GrB_IndexUnaryOp GrB_OFFDIAG;
387+
extern GrB_IndexUnaryOp GrB_ROWGT;
390388
extern GrB_IndexUnaryOp GrB_ROWINDEX_INT32;
391389
extern GrB_IndexUnaryOp GrB_ROWINDEX_INT64;
392-
extern GrB_IndexUnaryOp GrB_ROWLE_INT64;
393-
extern GrB_IndexUnaryOp GrB_TRIL_INT64;
394-
extern GrB_IndexUnaryOp GrB_TRIU_INT64;
390+
extern GrB_IndexUnaryOp GrB_ROWLE;
391+
extern GrB_IndexUnaryOp GrB_TRIL;
392+
extern GrB_IndexUnaryOp GrB_TRIU;
395393
extern GrB_IndexUnaryOp GrB_VALUEEQ_BOOL;
396394
extern GrB_IndexUnaryOp GrB_VALUEEQ_FP32;
397395
extern GrB_IndexUnaryOp GrB_VALUEEQ_FP64;
@@ -2742,6 +2740,7 @@ extern GrB_Info GrB_Matrix_import(GrB_Matrix *A, GrB_Type type, GrB_Index nrows,
27422740
extern GrB_Info GrB_Matrix_kronecker_BinaryOp(GrB_Matrix C, const GrB_Matrix M, const GrB_BinaryOp accum, const GrB_BinaryOp op, const GrB_Matrix A, const GrB_Matrix B, const GrB_Descriptor desc);
27432741
extern GrB_Info GrB_Matrix_kronecker_Monoid(GrB_Matrix C, const GrB_Matrix M, const GrB_BinaryOp accum, const GrB_Monoid monoid, const GrB_Matrix A, const GrB_Matrix B, const GrB_Descriptor desc);
27442742
extern GrB_Info GrB_Matrix_kronecker_Semiring(GrB_Matrix C, const GrB_Matrix M, const GrB_BinaryOp accum, const GrB_Semiring semiring, const GrB_Matrix A, const GrB_Matrix B, const GrB_Descriptor desc);
2743+
extern GrB_Info GrB_Matrix_nameless(GrB_Scalar S, const GrB_BinaryOp accum, const GrB_BinaryOp op, const GrB_Matrix A, const GrB_Descriptor desc);
27452744
extern GrB_Info GrB_Matrix_ncols(GrB_Index *ncols, const GrB_Matrix A);
27462745
extern GrB_Info GrB_Matrix_new(GrB_Matrix *A, GrB_Type type, GrB_Index nrows, GrB_Index ncols);
27472746
extern GrB_Info GrB_Matrix_nrows(GrB_Index *nrows, const GrB_Matrix A);
@@ -2970,6 +2969,7 @@ extern GrB_Info GrB_Vector_extractTuples_UINT16(GrB_Index *I, uint16_t *X, GrB_I
29702969
extern GrB_Info GrB_Vector_extractTuples_UINT32(GrB_Index *I, uint32_t *X, GrB_Index *nvals, const GrB_Vector v);
29712970
extern GrB_Info GrB_Vector_extractTuples_UINT64(GrB_Index *I, uint64_t *X, GrB_Index *nvals, const GrB_Vector v);
29722971
extern GrB_Info GrB_Vector_free(GrB_Vector *v);
2972+
extern GrB_Info GrB_Vector_nameless(GrB_Scalar c, const GrB_BinaryOp accum, const GrB_BinaryOp op, const GrB_Vector u, const GrB_Descriptor desc);
29732973
extern GrB_Info GrB_Vector_new(GrB_Vector *v, GrB_Type type, GrB_Index n);
29742974
extern GrB_Info GrB_Vector_nvals(GrB_Index *nvals, const GrB_Vector v);
29752975
extern GrB_Info GrB_Vector_reduce_BOOL(bool *c, const GrB_BinaryOp accum, const GrB_Monoid monoid, const GrB_Vector u, const GrB_Descriptor desc);
@@ -3078,6 +3078,7 @@ extern GrB_Info GxB_Matrix_build_Scalar(GrB_Matrix C, const GrB_Index *I, const
30783078
extern GrB_Info GxB_Matrix_concat(GrB_Matrix C, const GrB_Matrix *Tiles, const GrB_Index m, const GrB_Index n, const GrB_Descriptor desc);
30793079
extern GrB_Info GxB_Matrix_deserialize(GrB_Matrix *C, GrB_Type type, const void *blob, GrB_Index blob_size, const GrB_Descriptor desc);
30803080
extern GrB_Info GxB_Matrix_diag(GrB_Matrix C, const GrB_Vector v, int64_t k, const GrB_Descriptor desc);
3081+
extern GrB_Info GxB_Matrix_eWiseUnion(GrB_Matrix C, const GrB_Matrix Mask, const GrB_BinaryOp accum, const GrB_BinaryOp add, const GrB_Matrix A, const GrB_Scalar Amissing, const GrB_Matrix B, const GrB_Scalar Bmissing, const GrB_Descriptor desc);
30813082
extern GrB_Info GxB_Matrix_export_BitmapC(GrB_Matrix *A, GrB_Type *type, GrB_Index *nrows, GrB_Index *ncols, int8_t **Ab, void **Ax, GrB_Index *Ab_size, GrB_Index *Ax_size, bool *iso, GrB_Index *nvals, const GrB_Descriptor desc);
30823083
extern GrB_Info GxB_Matrix_export_BitmapR(GrB_Matrix *A, GrB_Type *type, GrB_Index *nrows, GrB_Index *ncols, int8_t **Ab, void **Ax, GrB_Index *Ab_size, GrB_Index *Ax_size, bool *iso, GrB_Index *nvals, const GrB_Descriptor desc);
30833084
extern GrB_Info GxB_Matrix_export_CSC(GrB_Matrix *A, GrB_Type *type, GrB_Index *nrows, GrB_Index *ncols, GrB_Index **Ap, GrB_Index **Ai, void **Ax, GrB_Index *Ap_size, GrB_Index *Ai_size, GrB_Index *Ax_size, bool *iso, bool *jumbled, const GrB_Descriptor desc);
@@ -3117,6 +3118,7 @@ extern GrB_Info GxB_Matrix_select_FC64(GrB_Matrix C, const GrB_Matrix Mask, cons
31173118
extern GrB_Info GxB_Matrix_serialize(void **blob_handle, GrB_Index *blob_size_handle, GrB_Matrix A, const GrB_Descriptor desc);
31183119
extern GrB_Info GxB_Matrix_setElement_FC32(GrB_Matrix C, GxB_FC32_t x, GrB_Index i, GrB_Index j);
31193120
extern GrB_Info GxB_Matrix_setElement_FC64(GrB_Matrix C, GxB_FC64_t x, GrB_Index i, GrB_Index j);
3121+
extern GrB_Info GxB_Matrix_sort(GrB_Matrix C, GrB_Matrix P, GrB_BinaryOp op, GrB_Matrix A, const GrB_Descriptor desc);
31203122
extern GrB_Info GxB_Matrix_split(GrB_Matrix *Tiles, const GrB_Index m, const GrB_Index n, const GrB_Index *Tile_nrows, const GrB_Index *Tile_ncols, const GrB_Matrix A, const GrB_Descriptor desc);
31213123
extern GrB_Info GxB_Matrix_subassign(GrB_Matrix C, const GrB_Matrix Mask, const GrB_BinaryOp accum, const GrB_Matrix A, const GrB_Index *I, GrB_Index ni, const GrB_Index *J, GrB_Index nj, const GrB_Descriptor desc);
31223124
extern GrB_Info GxB_Matrix_subassign_BOOL(GrB_Matrix C, const GrB_Matrix Mask, const GrB_BinaryOp accum, bool x, const GrB_Index *I, GrB_Index ni, const GrB_Index *J, GrB_Index nj, const GrB_Descriptor desc);
@@ -3255,6 +3257,7 @@ extern GrB_Info GxB_Vector_build_FC32(GrB_Vector w, const GrB_Index *I, const Gx
32553257
extern GrB_Info GxB_Vector_build_FC64(GrB_Vector w, const GrB_Index *I, const GxB_FC64_t *X, GrB_Index nvals, const GrB_BinaryOp dup);
32563258
extern GrB_Info GxB_Vector_build_Scalar(GrB_Vector w, const GrB_Index *I, GrB_Scalar scalar, GrB_Index nvals);
32573259
extern GrB_Info GxB_Vector_deserialize(GrB_Vector *w, GrB_Type type, const void *blob, GrB_Index blob_size, const GrB_Descriptor desc);
3260+
extern GrB_Info GxB_Vector_eWiseUnion(GrB_Vector w, const GrB_Vector mask, const GrB_BinaryOp accum, const GrB_BinaryOp add, const GrB_Vector u, const GrB_Scalar umissing, const GrB_Vector v, const GrB_Scalar vmissing, const GrB_Descriptor desc);
32583261
extern GrB_Info GxB_Vector_export_Bitmap(GrB_Vector *v, GrB_Type *type, GrB_Index *n, int8_t **vb, void **vx, GrB_Index *vb_size, GrB_Index *vx_size, bool *iso, GrB_Index *nvals, const GrB_Descriptor desc);
32593262
extern GrB_Info GxB_Vector_export_CSC(GrB_Vector *v, GrB_Type *type, GrB_Index *n, GrB_Index **vi, void **vx, GrB_Index *vi_size, GrB_Index *vx_size, bool *iso, GrB_Index *nvals, bool *jumbled, const GrB_Descriptor desc);
32603263
extern GrB_Info GxB_Vector_export_Full(GrB_Vector *v, GrB_Type *type, GrB_Index *n, void **vx, GrB_Index *vx_size, bool *iso, const GrB_Descriptor desc);
@@ -3279,6 +3282,7 @@ extern GrB_Info GxB_Vector_select_FC64(GrB_Vector w, const GrB_Vector mask, cons
32793282
extern GrB_Info GxB_Vector_serialize(void **blob_handle, GrB_Index *blob_size_handle, GrB_Vector u, const GrB_Descriptor desc);
32803283
extern GrB_Info GxB_Vector_setElement_FC32(GrB_Vector w, GxB_FC32_t x, GrB_Index i);
32813284
extern GrB_Info GxB_Vector_setElement_FC64(GrB_Vector w, GxB_FC64_t x, GrB_Index i);
3285+
extern GrB_Info GxB_Vector_sort(GrB_Vector w, GrB_Vector p, GrB_BinaryOp op, GrB_Vector u, const GrB_Descriptor desc);
32823286
extern GrB_Info GxB_Vector_subassign(GrB_Vector w, const GrB_Vector mask, const GrB_BinaryOp accum, const GrB_Vector u, const GrB_Index *I, GrB_Index ni, const GrB_Descriptor desc);
32833287
extern GrB_Info GxB_Vector_subassign_BOOL(GrB_Vector w, const GrB_Vector mask, const GrB_BinaryOp accum, bool x, const GrB_Index *I, GrB_Index ni, const GrB_Descriptor desc);
32843288
extern GrB_Info GxB_Vector_subassign_FC32(GrB_Vector w, const GrB_Vector mask, const GrB_BinaryOp accum, GxB_FC32_t x, const GrB_Index *I, GrB_Index ni, const GrB_Descriptor desc);

‎suitesparse_graphblas/suitesparse_graphblas_no_complex.h‎

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ typedef struct GB_Scalar_opaque *GxB_Scalar;
1717
typedef struct GB_SelectOp_opaque *GxB_SelectOp;
1818

1919
/* GxB typedefs (functions) */
20-
typedef bool (*GxB_select_function)(int64_t i, int64_t j, const void *x, const void *thunk);
20+
typedef bool (*GxB_select_function)(GrB_Index i, GrB_Index j, const void *x, const void *thunk);
2121
typedef void (*GxB_binary_function)(void *, const void *, const void *);
22-
typedef void (*GxB_index_unary_function)(void *z, const void *x, int64_t i, int64_t j, const void *y);
22+
typedef void (*GxB_index_unary_function)(void *z, const void *x, GrB_Index i, GrB_Index j, const void *y);
2323
typedef void (*GxB_unary_function)(void *, const void *);
2424

2525
/* GrB enums */
@@ -59,9 +59,7 @@ typedef enum
5959
{
6060
GrB_CSR_FORMAT = 0,
6161
GrB_CSC_FORMAT = 1,
62-
GrB_COO_FORMAT = 2,
63-
GrB_DENSE_ROW_FORMAT = 3,
64-
GrB_DENSE_COL_FORMAT = 4
62+
GrB_COO_FORMAT = 2
6563
} GrB_Format;
6664

6765
typedef enum
@@ -376,20 +374,20 @@ extern GrB_Descriptor GrB_DESC_ST1;
376374
extern GrB_Descriptor GrB_DESC_T0;
377375
extern GrB_Descriptor GrB_DESC_T0T1;
378376
extern GrB_Descriptor GrB_DESC_T1;
379-
extern GrB_IndexUnaryOp GrB_COLGT_INT64;
377+
extern GrB_IndexUnaryOp GrB_COLGT;
380378
extern GrB_IndexUnaryOp GrB_COLINDEX_INT32;
381379
extern GrB_IndexUnaryOp GrB_COLINDEX_INT64;
382-
extern GrB_IndexUnaryOp GrB_COLLE_INT64;
380+
extern GrB_IndexUnaryOp GrB_COLLE;
381+
extern GrB_IndexUnaryOp GrB_DIAG;
383382
extern GrB_IndexUnaryOp GrB_DIAGINDEX_INT32;
384383
extern GrB_IndexUnaryOp GrB_DIAGINDEX_INT64;
385-
extern GrB_IndexUnaryOp GrB_DIAG_INT64;
386-
extern GrB_IndexUnaryOp GrB_OFFDIAG_INT64;
387-
extern GrB_IndexUnaryOp GrB_ROWGT_INT64;
384+
extern GrB_IndexUnaryOp GrB_OFFDIAG;
385+
extern GrB_IndexUnaryOp GrB_ROWGT;
388386
extern GrB_IndexUnaryOp GrB_ROWINDEX_INT32;
389387
extern GrB_IndexUnaryOp GrB_ROWINDEX_INT64;
390-
extern GrB_IndexUnaryOp GrB_ROWLE_INT64;
391-
extern GrB_IndexUnaryOp GrB_TRIL_INT64;
392-
extern GrB_IndexUnaryOp GrB_TRIU_INT64;
388+
extern GrB_IndexUnaryOp GrB_ROWLE;
389+
extern GrB_IndexUnaryOp GrB_TRIL;
390+
extern GrB_IndexUnaryOp GrB_TRIU;
393391
extern GrB_IndexUnaryOp GrB_VALUEEQ_BOOL;
394392
extern GrB_IndexUnaryOp GrB_VALUEEQ_FP32;
395393
extern GrB_IndexUnaryOp GrB_VALUEEQ_FP64;
@@ -2570,6 +2568,7 @@ extern GrB_Info GrB_Matrix_import(GrB_Matrix *A, GrB_Type type, GrB_Index nrows,
25702568
extern GrB_Info GrB_Matrix_kronecker_BinaryOp(GrB_Matrix C, const GrB_Matrix M, const GrB_BinaryOp accum, const GrB_BinaryOp op, const GrB_Matrix A, const GrB_Matrix B, const GrB_Descriptor desc);
25712569
extern GrB_Info GrB_Matrix_kronecker_Monoid(GrB_Matrix C, const GrB_Matrix M, const GrB_BinaryOp accum, const GrB_Monoid monoid, const GrB_Matrix A, const GrB_Matrix B, const GrB_Descriptor desc);
25722570
extern GrB_Info GrB_Matrix_kronecker_Semiring(GrB_Matrix C, const GrB_Matrix M, const GrB_BinaryOp accum, const GrB_Semiring semiring, const GrB_Matrix A, const GrB_Matrix B, const GrB_Descriptor desc);
2571+
extern GrB_Info GrB_Matrix_nameless(GrB_Scalar S, const GrB_BinaryOp accum, const GrB_BinaryOp op, const GrB_Matrix A, const GrB_Descriptor desc);
25732572
extern GrB_Info GrB_Matrix_ncols(GrB_Index *ncols, const GrB_Matrix A);
25742573
extern GrB_Info GrB_Matrix_new(GrB_Matrix *A, GrB_Type type, GrB_Index nrows, GrB_Index ncols);
25752574
extern GrB_Info GrB_Matrix_nrows(GrB_Index *nrows, const GrB_Matrix A);
@@ -2798,6 +2797,7 @@ extern GrB_Info GrB_Vector_extractTuples_UINT16(GrB_Index *I, uint16_t *X, GrB_I
27982797
extern GrB_Info GrB_Vector_extractTuples_UINT32(GrB_Index *I, uint32_t *X, GrB_Index *nvals, const GrB_Vector v);
27992798
extern GrB_Info GrB_Vector_extractTuples_UINT64(GrB_Index *I, uint64_t *X, GrB_Index *nvals, const GrB_Vector v);
28002799
extern GrB_Info GrB_Vector_free(GrB_Vector *v);
2800+
extern GrB_Info GrB_Vector_nameless(GrB_Scalar c, const GrB_BinaryOp accum, const GrB_BinaryOp op, const GrB_Vector u, const GrB_Descriptor desc);
28012801
extern GrB_Info GrB_Vector_new(GrB_Vector *v, GrB_Type type, GrB_Index n);
28022802
extern GrB_Info GrB_Vector_nvals(GrB_Index *nvals, const GrB_Vector v);
28032803
extern GrB_Info GrB_Vector_reduce_BOOL(bool *c, const GrB_BinaryOp accum, const GrB_Monoid monoid, const GrB_Vector u, const GrB_Descriptor desc);
@@ -2896,6 +2896,7 @@ extern GrB_Info GxB_Matrix_build_Scalar(GrB_Matrix C, const GrB_Index *I, const
28962896
extern GrB_Info GxB_Matrix_concat(GrB_Matrix C, const GrB_Matrix *Tiles, const GrB_Index m, const GrB_Index n, const GrB_Descriptor desc);
28972897
extern GrB_Info GxB_Matrix_deserialize(GrB_Matrix *C, GrB_Type type, const void *blob, GrB_Index blob_size, const GrB_Descriptor desc);
28982898
extern GrB_Info GxB_Matrix_diag(GrB_Matrix C, const GrB_Vector v, int64_t k, const GrB_Descriptor desc);
2899+
extern GrB_Info GxB_Matrix_eWiseUnion(GrB_Matrix C, const GrB_Matrix Mask, const GrB_BinaryOp accum, const GrB_BinaryOp add, const GrB_Matrix A, const GrB_Scalar Amissing, const GrB_Matrix B, const GrB_Scalar Bmissing, const GrB_Descriptor desc);
28992900
extern GrB_Info GxB_Matrix_export_BitmapC(GrB_Matrix *A, GrB_Type *type, GrB_Index *nrows, GrB_Index *ncols, int8_t **Ab, void **Ax, GrB_Index *Ab_size, GrB_Index *Ax_size, bool *iso, GrB_Index *nvals, const GrB_Descriptor desc);
29002901
extern GrB_Info GxB_Matrix_export_BitmapR(GrB_Matrix *A, GrB_Type *type, GrB_Index *nrows, GrB_Index *ncols, int8_t **Ab, void **Ax, GrB_Index *Ab_size, GrB_Index *Ax_size, bool *iso, GrB_Index *nvals, const GrB_Descriptor desc);
29012902
extern GrB_Info GxB_Matrix_export_CSC(GrB_Matrix *A, GrB_Type *type, GrB_Index *nrows, GrB_Index *ncols, GrB_Index **Ap, GrB_Index **Ai, void **Ax, GrB_Index *Ap_size, GrB_Index *Ai_size, GrB_Index *Ax_size, bool *iso, bool *jumbled, const GrB_Descriptor desc);
@@ -2925,6 +2926,7 @@ extern GrB_Info GxB_Matrix_pack_HyperCSC(GrB_Matrix A, GrB_Index **Ap, GrB_Index
29252926
extern GrB_Info GxB_Matrix_pack_HyperCSR(GrB_Matrix A, GrB_Index **Ap, GrB_Index **Ah, GrB_Index **Aj, void **Ax, GrB_Index Ap_size, GrB_Index Ah_size, GrB_Index Aj_size, GrB_Index Ax_size, bool iso, GrB_Index nvec, bool jumbled, const GrB_Descriptor desc);
29262927
extern GrB_Info GxB_Matrix_select(GrB_Matrix C, const GrB_Matrix Mask, const GrB_BinaryOp accum, const GxB_SelectOp op, const GrB_Matrix A, const GrB_Scalar Thunk, const GrB_Descriptor desc);
29272928
extern GrB_Info GxB_Matrix_serialize(void **blob_handle, GrB_Index *blob_size_handle, GrB_Matrix A, const GrB_Descriptor desc);
2929+
extern GrB_Info GxB_Matrix_sort(GrB_Matrix C, GrB_Matrix P, GrB_BinaryOp op, GrB_Matrix A, const GrB_Descriptor desc);
29282930
extern GrB_Info GxB_Matrix_split(GrB_Matrix *Tiles, const GrB_Index m, const GrB_Index n, const GrB_Index *Tile_nrows, const GrB_Index *Tile_ncols, const GrB_Matrix A, const GrB_Descriptor desc);
29292931
extern GrB_Info GxB_Matrix_subassign(GrB_Matrix C, const GrB_Matrix Mask, const GrB_BinaryOp accum, const GrB_Matrix A, const GrB_Index *I, GrB_Index ni, const GrB_Index *J, GrB_Index nj, const GrB_Descriptor desc);
29302932
extern GrB_Info GxB_Matrix_subassign_BOOL(GrB_Matrix C, const GrB_Matrix Mask, const GrB_BinaryOp accum, bool x, const GrB_Index *I, GrB_Index ni, const GrB_Index *J, GrB_Index nj, const GrB_Descriptor desc);
@@ -3043,6 +3045,7 @@ extern GrB_Info GxB_Vector_apply_BinaryOp1st(GrB_Vector w, const GrB_Vector mask
30433045
extern GrB_Info GxB_Vector_apply_BinaryOp2nd(GrB_Vector w, const GrB_Vector mask, const GrB_BinaryOp accum, const GrB_BinaryOp op, const GrB_Vector u, const GrB_Scalar y, const GrB_Descriptor desc);
30443046
extern GrB_Info GxB_Vector_build_Scalar(GrB_Vector w, const GrB_Index *I, GrB_Scalar scalar, GrB_Index nvals);
30453047
extern GrB_Info GxB_Vector_deserialize(GrB_Vector *w, GrB_Type type, const void *blob, GrB_Index blob_size, const GrB_Descriptor desc);
3048+
extern GrB_Info GxB_Vector_eWiseUnion(GrB_Vector w, const GrB_Vector mask, const GrB_BinaryOp accum, const GrB_BinaryOp add, const GrB_Vector u, const GrB_Scalar umissing, const GrB_Vector v, const GrB_Scalar vmissing, const GrB_Descriptor desc);
30463049
extern GrB_Info GxB_Vector_export_Bitmap(GrB_Vector *v, GrB_Type *type, GrB_Index *n, int8_t **vb, void **vx, GrB_Index *vb_size, GrB_Index *vx_size, bool *iso, GrB_Index *nvals, const GrB_Descriptor desc);
30473050
extern GrB_Info GxB_Vector_export_CSC(GrB_Vector *v, GrB_Type *type, GrB_Index *n, GrB_Index **vi, void **vx, GrB_Index *vi_size, GrB_Index *vx_size, bool *iso, GrB_Index *nvals, bool *jumbled, const GrB_Descriptor desc);
30483051
extern GrB_Info GxB_Vector_export_Full(GrB_Vector *v, GrB_Type *type, GrB_Index *n, void **vx, GrB_Index *vx_size, bool *iso, const GrB_Descriptor desc);
@@ -3057,6 +3060,7 @@ extern GrB_Info GxB_Vector_pack_CSC(GrB_Vector v, GrB_Index **vi, void **vx, GrB
30573060
extern GrB_Info GxB_Vector_pack_Full(GrB_Vector v, void **vx, GrB_Index vx_size, bool iso, const GrB_Descriptor desc);
30583061
extern GrB_Info GxB_Vector_select(GrB_Vector w, const GrB_Vector mask, const GrB_BinaryOp accum, const GxB_SelectOp op, const GrB_Vector u, const GrB_Scalar Thunk, const GrB_Descriptor desc);
30593062
extern GrB_Info GxB_Vector_serialize(void **blob_handle, GrB_Index *blob_size_handle, GrB_Vector u, const GrB_Descriptor desc);
3063+
extern GrB_Info GxB_Vector_sort(GrB_Vector w, GrB_Vector p, GrB_BinaryOp op, GrB_Vector u, const GrB_Descriptor desc);
30603064
extern GrB_Info GxB_Vector_subassign(GrB_Vector w, const GrB_Vector mask, const GrB_BinaryOp accum, const GrB_Vector u, const GrB_Index *I, GrB_Index ni, const GrB_Descriptor desc);
30613065
extern GrB_Info GxB_Vector_subassign_BOOL(GrB_Vector w, const GrB_Vector mask, const GrB_BinaryOp accum, bool x, const GrB_Index *I, GrB_Index ni, const GrB_Descriptor desc);
30623066
extern GrB_Info GxB_Vector_subassign_FP32(GrB_Vector w, const GrB_Vector mask, const GrB_BinaryOp accum, float x, const GrB_Index *I, GrB_Index ni, const GrB_Descriptor desc);

0 commit comments

Comments
 (0)