Skip to content

Commit 6e42d88

Browse files
suvorovraingsvgit
authored andcommitted
fix: remove lagraph. fix binops
Signed-off-by: Rodion Suvorov <rodion.suvorov.94@mail.ru>
1 parent 90893b4 commit 6e42d88

File tree

1 file changed

+10
-23
lines changed

1 file changed

+10
-23
lines changed

src/main.c

Lines changed: 10 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ void check_user_age(bool *z, const User *x, GrB_Index i, GrB_Index j, const uint
6161

6262
bool user_filter_mul(bool *z, const User *x, const bool *y)
6363
{
64-
*z = (x->age > 30) && (*y);
64+
*z = *y;
6565
}
6666

6767
void check_payment_system(bool *z, const Card *x, GrB_Index _i, GrB_Index _j, const uint8_t *y)
@@ -87,11 +87,6 @@ void tx_bool_add(EdgeTX *z, const EdgeTX *x, const EdgeTX *y)
8787
*z = *x;
8888
}
8989

90-
void tx_is_nonempty(bool *z, const EdgeTX *x)
91-
{
92-
*z = (x->count != 0);
93-
}
94-
9590
void exp_binop(double *z, const double *x)
9691
{
9792
*z = exp(*x);
@@ -201,19 +196,20 @@ int banking_pagerank(
201196
int *iters,
202197
// input
203198
GrB_Vector subgraph,
204-
const LAGraph_Graph G,
199+
const GrB_Matrix A,
205200
float tol,
206201
int itermax)
207202
{
208203
GrB_Vector r = NULL, t = NULL;
209-
GrB_Matrix AT = NULL;
210-
AT = G->AT;
204+
GrB_Matrix AT;
205+
GrB_Index n;
206+
GrB_Matrix_nrows(&n, A);
207+
GrB_Matrix_new(&AT, GrB_FP64, n, n);
208+
GrB_transpose(AT, NULL, NULL, A, NULL);
211209

212210
// ------------------------------------------------------------------------
213211
// initialization
214212
// ------------------------------------------------------------------------
215-
GrB_Index n;
216-
GrB_Matrix_nrows(&n, AT);
217213

218214
GrB_Vector_new(&t, GrB_FP64, n);
219215
GrB_Vector_new(&r, GrB_FP64, n);
@@ -407,14 +403,7 @@ GrB_Info analyze_graph(GrB_Matrix tx_edge_mat, GrB_Matrix owns_edge_mat, GrB_Vec
407403
GrB_Vector pagerank_ans;
408404
TRY(GrB_Vector_new(&pagerank_ans, GrB_FP64, VERTICES_NUMBER));
409405

410-
LAGraph_Graph G = NULL;
411-
412-
TRY(LAGraph_New(&G, &M, LAGraph_ADJACENCY_DIRECTED, msg));
413-
TRY(LAGraph_Cached_AT(G, msg));
414-
415-
TRY(LAGraph_Cached_OutDegree(G, msg));
416-
417-
TRY(banking_pagerank(&pagerank_ans, &iteraions, EXPSUMvec, G, 1e-4, 100));
406+
TRY(banking_pagerank(&pagerank_ans, &iteraions, EXPSUMvec, M, 1e-4, 100));
418407
GxB_print(pagerank_ans, GxB_COMPLETE);
419408

420409
// ------------------------------------------------------------------------
@@ -445,15 +434,13 @@ GrB_Info analyze_graph(GrB_Matrix tx_edge_mat, GrB_Matrix owns_edge_mat, GrB_Vec
445434
GrB_free(&M);
446435
GrB_free(&pagerank_ans);
447436

448-
LAGraph_Delete(&G, msg);
449-
450437
return GrB_SUCCESS;
451438
}
452439

453440
int main()
454441
{
455-
LAGraph_Init(msg);
456-
printf("LAGraph initialized.\n\n");
442+
GrB_init(GrB_NONBLOCKING);
443+
printf("GraphBLAS initialized.\n\n");
457444

458445
// ------------------------------------------------------------------------
459446
// init edge matrices

0 commit comments

Comments
 (0)