Skip to content

Commit d6e68b3

Browse files
DrTimothyAldenDavisDrTimothyAldenDavis
committed
revise LAGraph memory wrappers: return int, add msg
1 parent 0f7d17b commit d6e68b3

22 files changed

+366
-374
lines changed

‎experimental/algorithm/LAGraph_BF_full.c

+16-15
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,12 @@
4242
GrB_free(&BF_EQ_Tuple3); \
4343
GrB_free(&BF_lMIN_Tuple3_Monoid); \
4444
GrB_free(&BF_lMIN_PLUSrhs_Tuple3); \
45-
LAGraph_Free ((void**)&I); \
46-
LAGraph_Free ((void**)&J); \
47-
LAGraph_Free ((void**)&w); \
48-
LAGraph_Free ((void**)&W); \
49-
LAGraph_Free ((void**)&h); \
50-
LAGraph_Free ((void**)&pi); \
45+
LAGraph_Free ((void**)&I, NULL); \
46+
LAGraph_Free ((void**)&J, NULL); \
47+
LAGraph_Free ((void**)&w, NULL); \
48+
LAGraph_Free ((void**)&W, NULL); \
49+
LAGraph_Free ((void**)&h, NULL); \
50+
LAGraph_Free ((void**)&pi, NULL); \
5151
}
5252

5353
#include <LAGraph.h>
@@ -198,12 +198,12 @@ GrB_Info LAGraph_BF_full
198198
//--------------------------------------------------------------------------
199199
// allocate arrays used for tuplets
200200
//--------------------------------------------------------------------------
201-
I = LAGraph_Malloc (nz, sizeof(GrB_Index)) ;
202-
J = LAGraph_Malloc (nz, sizeof(GrB_Index)) ;
203-
w = LAGraph_Malloc (nz, sizeof(double)) ;
204-
W = LAGraph_Malloc (nz, sizeof(BF_Tuple3_struct)) ;
205-
LG_ASSERT (I != NULL && J != NULL && w != NULL && W != NULL,
206-
GrB_OUT_OF_MEMORY) ;
201+
202+
LAGRAPH_TRY (LAGraph_Malloc ((void **) &I, nz, sizeof(GrB_Index), msg)) ;
203+
LAGRAPH_TRY (LAGraph_Malloc ((void **) &J, nz, sizeof(GrB_Index), msg)) ;
204+
LAGRAPH_TRY (LAGraph_Malloc ((void **) &w, nz, sizeof(double), msg)) ;
205+
LAGRAPH_TRY (LAGraph_Malloc ((void **) &W, nz, sizeof(BF_Tuple3_struct),
206+
msg)) ;
207207

208208
//--------------------------------------------------------------------------
209209
// create matrix Atmp based on A, while its entries become BF_Tuple3 type
@@ -281,10 +281,11 @@ GrB_Info LAGraph_BF_full
281281
//--------------------------------------------------------------------------
282282
// extract tuple from "distance" vector d and create GrB_Vectors for output
283283
//--------------------------------------------------------------------------
284+
284285
GRB_TRY (GrB_Vector_extractTuples_UDT (I, (void *) W, &nz, d));
285-
h = LAGraph_Malloc (nz, sizeof(GrB_Index)) ;
286-
pi = LAGraph_Malloc (nz, sizeof(GrB_Index)) ;
287-
LG_ASSERT (w != NULL && h != NULL && pi != NULL, GrB_OUT_OF_MEMORY) ;
286+
LAGRAPH_TRY (LAGraph_Malloc ((void **) &h , nz, sizeof(GrB_Index), msg)) ;
287+
LAGRAPH_TRY (LAGraph_Malloc ((void **) &pi, nz, sizeof(GrB_Index), msg)) ;
288+
288289
for (GrB_Index k = 0; k < nz; k++)
289290
{
290291
w [k] = W[k].w ;

‎experimental/algorithm/LAGraph_BF_full1.c

+23-23
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,12 @@
5050
GrB_free(&BF_LT_Tuple3); \
5151
GrB_free(&BF_lMIN_Tuple3_Monoid); \
5252
GrB_free(&BF_lMIN_PLUSrhs_Tuple3); \
53-
LAGraph_Free ((void**)&I); \
54-
LAGraph_Free ((void**)&J); \
55-
LAGraph_Free ((void**)&w); \
56-
LAGraph_Free ((void**)&W); \
57-
LAGraph_Free ((void**)&h); \
58-
LAGraph_Free ((void**)&pi); \
53+
LAGraph_Free ((void**)&I, NULL); \
54+
LAGraph_Free ((void**)&J, NULL); \
55+
LAGraph_Free ((void**)&w, NULL); \
56+
LAGraph_Free ((void**)&W, NULL); \
57+
LAGraph_Free ((void**)&h, NULL); \
58+
LAGraph_Free ((void**)&pi, NULL); \
5959
}
6060

6161
#define LG_FREE_ALL \
@@ -228,12 +228,12 @@ GrB_Info LAGraph_BF_full1
228228
//--------------------------------------------------------------------------
229229
// allocate arrays used for tuplets
230230
//--------------------------------------------------------------------------
231-
I = LAGraph_Malloc (nz, sizeof(GrB_Index)) ;
232-
J = LAGraph_Malloc (nz, sizeof(GrB_Index)) ;
233-
w = LAGraph_Malloc (nz, sizeof(double)) ;
234-
W = LAGraph_Malloc (nz, sizeof(BF1_Tuple3_struct)) ;
235-
LG_ASSERT (I != NULL && J != NULL && w != NULL && W != NULL,
236-
GrB_OUT_OF_MEMORY) ;
231+
232+
LAGRAPH_TRY (LAGraph_Malloc ((void **) &I, nz, sizeof(GrB_Index), msg)) ;
233+
LAGRAPH_TRY (LAGraph_Malloc ((void **) &J, nz, sizeof(GrB_Index), msg)) ;
234+
LAGRAPH_TRY (LAGraph_Malloc ((void **) &w, nz, sizeof(double), msg)) ;
235+
LAGRAPH_TRY (LAGraph_Malloc ((void **) &W, nz, sizeof(BF1_Tuple3_struct),
236+
msg)) ;
237237

238238
//--------------------------------------------------------------------------
239239
// create matrix Atmp based on A, while its entries become BF_Tuple3 type
@@ -249,10 +249,10 @@ GrB_Info LAGraph_BF_full1
249249
}
250250
GRB_TRY (GrB_Matrix_new(&Atmp, BF_Tuple3, n, n));
251251
GRB_TRY (GrB_Matrix_build_UDT(Atmp, I, J, W, nz, BF_lMIN_Tuple3));
252-
LAGraph_Free ((void**)&I);
253-
LAGraph_Free ((void**)&J);
254-
LAGraph_Free ((void**)&W);
255-
LAGraph_Free ((void**)&w);
252+
LAGraph_Free ((void**)&I, NULL);
253+
LAGraph_Free ((void**)&J, NULL);
254+
LAGraph_Free ((void**)&W, NULL);
255+
LAGraph_Free ((void**)&w, NULL);
256256

257257
//--------------------------------------------------------------------------
258258
// create and initialize "distance" vector d, dmasked and dless
@@ -334,13 +334,13 @@ GrB_Info LAGraph_BF_full1
334334
//--------------------------------------------------------------------------
335335
// extract tuple from "distance" vector d and create GrB_Vectors for output
336336
//--------------------------------------------------------------------------
337-
I = LAGraph_Malloc (n, sizeof(GrB_Index)) ;
338-
W = LAGraph_Malloc (n, sizeof(BF1_Tuple3_struct)) ;
339-
w = LAGraph_Malloc (n, sizeof(double)) ;
340-
h = LAGraph_Malloc (n, sizeof(GrB_Index)) ;
341-
pi = LAGraph_Malloc (n, sizeof(GrB_Index)) ;
342-
LG_ASSERT (I != NULL && W != NULL && w != NULL && h != NULL && pi != NULL,
343-
GrB_OUT_OF_MEMORY) ;
337+
338+
LAGRAPH_TRY (LAGraph_Malloc ((void **) &I, n, sizeof(GrB_Index), msg)) ;
339+
LAGRAPH_TRY (LAGraph_Malloc ((void **) &W, n, sizeof(BF1_Tuple3_struct),
340+
msg)) ;
341+
LAGRAPH_TRY (LAGraph_Malloc ((void **) &w, n, sizeof(double), msg)) ;
342+
LAGRAPH_TRY (LAGraph_Malloc ((void **) &h, n, sizeof(GrB_Index), msg)) ;
343+
LAGRAPH_TRY (LAGraph_Malloc ((void **) &pi, n, sizeof(GrB_Index), msg)) ;
344344

345345
GRB_TRY (GrB_Vector_extractTuples_UDT (I, (void *) W, &n, d));
346346

‎experimental/algorithm/LAGraph_BF_full1a.c

+21-23
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,12 @@
5252
GrB_free(&BF_LT_Tuple3); \
5353
GrB_free(&BF_lMIN_Tuple3_Monoid); \
5454
GrB_free(&BF_lMIN_PLUSrhs_Tuple3); \
55-
LAGraph_Free ((void**)&I); \
56-
LAGraph_Free ((void**)&J); \
57-
LAGraph_Free ((void**)&w); \
58-
LAGraph_Free ((void**)&W); \
59-
LAGraph_Free ((void**)&h); \
60-
LAGraph_Free ((void**)&pi); \
55+
LAGraph_Free ((void**)&I, NULL); \
56+
LAGraph_Free ((void**)&J, NULL); \
57+
LAGraph_Free ((void**)&w, NULL); \
58+
LAGraph_Free ((void**)&W, NULL); \
59+
LAGraph_Free ((void**)&h, NULL); \
60+
LAGraph_Free ((void**)&pi, NULL); \
6161
}
6262

6363
#define LG_FREE_ALL \
@@ -221,12 +221,11 @@ GrB_Info LAGraph_BF_full1a
221221
// allocate arrays used for tuplets
222222
//--------------------------------------------------------------------------
223223
#if 1
224-
I = LAGraph_Malloc (nz, sizeof(GrB_Index)) ;
225-
J = LAGraph_Malloc (nz, sizeof(GrB_Index)) ;
226-
w = LAGraph_Malloc (nz, sizeof(double)) ;
227-
W = LAGraph_Malloc (nz, sizeof(BF_Tuple3_struct)) ;
228-
LG_ASSERT (I != NULL && J != NULL && w != NULL && W != NULL,
229-
GrB_OUT_OF_MEMORY) ;
224+
LAGRAPH_TRY (LAGraph_Malloc ((void **) &I, nz, sizeof(GrB_Index), msg)) ;
225+
LAGRAPH_TRY (LAGraph_Malloc ((void **) &J, nz, sizeof(GrB_Index), msg)) ;
226+
LAGRAPH_TRY (LAGraph_Malloc ((void **) &w, nz, sizeof(double), msg)) ;
227+
LAGRAPH_TRY (LAGraph_Malloc ((void **) &W, nz, sizeof(BF_Tuple3_struct),
228+
msg)) ;
230229

231230
//--------------------------------------------------------------------------
232231
// create matrix Atmp based on A, while its entries become BF_Tuple3 type
@@ -242,10 +241,10 @@ GrB_Info LAGraph_BF_full1a
242241
}
243242
GRB_TRY (GrB_Matrix_new(&Atmp, BF_Tuple3, n, n));
244243
GRB_TRY (GrB_Matrix_build_UDT(Atmp, I, J, W, nz, BF_lMIN_Tuple3));
245-
LAGraph_Free ((void**)&I);
246-
LAGraph_Free ((void**)&J);
247-
LAGraph_Free ((void**)&W);
248-
LAGraph_Free ((void**)&w);
244+
LAGraph_Free ((void**)&I, NULL);
245+
LAGraph_Free ((void**)&J, NULL);
246+
LAGraph_Free ((void**)&W, NULL);
247+
LAGraph_Free ((void**)&w, NULL);
249248

250249
#else
251250

@@ -357,13 +356,12 @@ GrB_Info LAGraph_BF_full1a
357356
// extract tuple from "distance" vector d and create GrB_Vectors for output
358357
//--------------------------------------------------------------------------
359358

360-
I = LAGraph_Malloc (n, sizeof(GrB_Index)) ;
361-
W = LAGraph_Malloc (n, sizeof(BF_Tuple3_struct)) ;
362-
w = LAGraph_Malloc (n, sizeof(double)) ;
363-
h = LAGraph_Malloc (n, sizeof(GrB_Index)) ;
364-
pi = LAGraph_Malloc (n, sizeof(GrB_Index)) ;
365-
LG_ASSERT (I != NULL && W != NULL && w != NULL && h != NULL && pi != NULL,
366-
GrB_OUT_OF_MEMORY) ;
359+
LAGRAPH_TRY (LAGraph_Malloc ((void **) &I, n, sizeof(GrB_Index), msg)) ;
360+
LAGRAPH_TRY (LAGraph_Malloc ((void **) &W, n, sizeof(BF_Tuple3_struct),
361+
msg)) ;
362+
LAGRAPH_TRY (LAGraph_Malloc ((void **) &w, n, sizeof(double), msg)) ;
363+
LAGRAPH_TRY (LAGraph_Malloc ((void **) &h, n, sizeof(GrB_Index), msg)) ;
364+
LAGRAPH_TRY (LAGraph_Malloc ((void **) &pi, n, sizeof(GrB_Index), msg)) ;
367365

368366
// todo: create 3 unary ops, and use GrB_apply?
369367

‎experimental/algorithm/LAGraph_BF_full2.c

+23-23
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,12 @@
5151
GrB_free(&BF_EQ_Tuple3); \
5252
GrB_free(&BF_lMIN_Tuple3_Monoid); \
5353
GrB_free(&BF_lMIN_PLUSrhs_Tuple3); \
54-
LAGraph_Free ((void**)&I); \
55-
LAGraph_Free ((void**)&J); \
56-
LAGraph_Free ((void**)&w); \
57-
LAGraph_Free ((void**)&W); \
58-
LAGraph_Free ((void**)&h); \
59-
LAGraph_Free ((void**)&pi); \
54+
LAGraph_Free ((void**)&I, NULL); \
55+
LAGraph_Free ((void**)&J, NULL); \
56+
LAGraph_Free ((void**)&w, NULL); \
57+
LAGraph_Free ((void**)&W, NULL); \
58+
LAGraph_Free ((void**)&h, NULL); \
59+
LAGraph_Free ((void**)&pi, NULL); \
6060
}
6161

6262
#define LG_FREE_ALL \
@@ -218,12 +218,12 @@ GrB_Info LAGraph_BF_full2
218218
//--------------------------------------------------------------------------
219219
// allocate arrays used for tuplets
220220
//--------------------------------------------------------------------------
221-
I = LAGraph_Malloc (nz, sizeof(GrB_Index)) ;
222-
J = LAGraph_Malloc (nz, sizeof(GrB_Index)) ;
223-
w = LAGraph_Malloc (nz, sizeof(double)) ;
224-
W = LAGraph_Malloc (nz, sizeof(BF2_Tuple3_struct)) ;
225-
LG_ASSERT (I != NULL && J != NULL && w != NULL && W != NULL,
226-
GrB_OUT_OF_MEMORY) ;
221+
222+
LAGRAPH_TRY (LAGraph_Malloc ((void **) &I, nz, sizeof(GrB_Index), msg)) ;
223+
LAGRAPH_TRY (LAGraph_Malloc ((void **) &J, nz, sizeof(GrB_Index), msg)) ;
224+
LAGRAPH_TRY (LAGraph_Malloc ((void **) &w, nz, sizeof(double), msg)) ;
225+
LAGRAPH_TRY (LAGraph_Malloc ((void **) &W, nz, sizeof(BF2_Tuple3_struct),
226+
msg)) ;
227227

228228
//--------------------------------------------------------------------------
229229
// create matrix Atmp based on A, while its entries become BF_Tuple3 type
@@ -246,10 +246,10 @@ GrB_Info LAGraph_BF_full2
246246
}
247247
GRB_TRY (GrB_Matrix_new(&Atmp, BF_Tuple3, n, n));
248248
GRB_TRY (GrB_Matrix_build_UDT(Atmp, I, J, W, nz, BF_lMIN_Tuple3));
249-
LAGraph_Free ((void**)&I);
250-
LAGraph_Free ((void**)&J);
251-
LAGraph_Free ((void**)&W);
252-
LAGraph_Free ((void**)&w);
249+
LAGraph_Free ((void**)&I, NULL);
250+
LAGraph_Free ((void**)&J, NULL);
251+
LAGraph_Free ((void**)&W, NULL);
252+
LAGraph_Free ((void**)&w, NULL);
253253

254254
//--------------------------------------------------------------------------
255255
// create and initialize "distance" vector d
@@ -314,13 +314,13 @@ GrB_Info LAGraph_BF_full2
314314
//--------------------------------------------------------------------------
315315
// extract tuple from "distance" vector d and create GrB_Vectors for output
316316
//--------------------------------------------------------------------------
317-
I = LAGraph_Malloc (n, sizeof(GrB_Index)) ;
318-
W = LAGraph_Malloc (n, sizeof(BF2_Tuple3_struct)) ;
319-
w = LAGraph_Malloc (n, sizeof(double)) ;
320-
h = LAGraph_Malloc (n, sizeof(GrB_Index)) ;
321-
pi = LAGraph_Malloc (n, sizeof(GrB_Index)) ;
322-
LG_ASSERT (I != NULL && W != NULL && w != NULL && h != NULL && pi != NULL,
323-
GrB_OUT_OF_MEMORY) ;
317+
318+
LAGRAPH_TRY (LAGraph_Malloc ((void **) &I, n, sizeof(GrB_Index), msg)) ;
319+
LAGRAPH_TRY (LAGraph_Malloc ((void **) &W, n, sizeof(BF2_Tuple3_struct),
320+
msg)) ;
321+
LAGRAPH_TRY (LAGraph_Malloc ((void **) &w, n, sizeof(double), msg)) ;
322+
LAGRAPH_TRY (LAGraph_Malloc ((void **) &h, n, sizeof(GrB_Index), msg)) ;
323+
LAGRAPH_TRY (LAGraph_Malloc ((void **) &pi, n, sizeof(GrB_Index), msg)) ;
324324

325325
nz = n ;
326326
GRB_TRY (GrB_Vector_extractTuples_UDT (I, (void *) W, &nz, d));

‎experimental/algorithm/LAGraph_BF_full_mxv.c

+23-23
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,12 @@
5353
GrB_free(&BF_EQ_Tuple3); \
5454
GrB_free(&BF_lMIN_Tuple3_Monoid); \
5555
GrB_free(&BF_lMIN_PLUSrhs_Tuple3); \
56-
LAGraph_Free ((void**)&I); \
57-
LAGraph_Free ((void**)&J); \
58-
LAGraph_Free ((void**)&w); \
59-
LAGraph_Free ((void**)&W); \
60-
LAGraph_Free ((void**)&h); \
61-
LAGraph_Free ((void**)&pi); \
56+
LAGraph_Free ((void**)&I, NULL); \
57+
LAGraph_Free ((void**)&J, NULL); \
58+
LAGraph_Free ((void**)&w, NULL); \
59+
LAGraph_Free ((void**)&W, NULL); \
60+
LAGraph_Free ((void**)&h, NULL); \
61+
LAGraph_Free ((void**)&pi, NULL); \
6262
}
6363

6464
#define LG_FREE_ALL \
@@ -221,12 +221,12 @@ GrB_Info LAGraph_BF_full_mxv
221221
//--------------------------------------------------------------------------
222222
// allocate arrays used for tuplets
223223
//--------------------------------------------------------------------------
224-
I = LAGraph_Malloc (nz, sizeof(GrB_Index)) ;
225-
J = LAGraph_Malloc (nz, sizeof(GrB_Index)) ;
226-
w = LAGraph_Malloc (nz, sizeof(double)) ;
227-
W = LAGraph_Malloc (nz, sizeof(BF_Tuple3_struct)) ;
228-
LG_ASSERT (I != NULL && J != NULL && w != NULL && W != NULL,
229-
GrB_OUT_OF_MEMORY) ;
224+
225+
LAGRAPH_TRY (LAGraph_Malloc ((void **) &I, nz, sizeof(GrB_Index), msg)) ;
226+
LAGRAPH_TRY (LAGraph_Malloc ((void **) &J, nz, sizeof(GrB_Index), msg)) ;
227+
LAGRAPH_TRY (LAGraph_Malloc ((void **) &w, nz, sizeof(double), msg)) ;
228+
LAGRAPH_TRY (LAGraph_Malloc ((void **) &W, nz, sizeof(BF_Tuple3_struct),
229+
msg)) ;
230230

231231
//--------------------------------------------------------------------------
232232
// create matrix Atmp based on AT, while its entries become BF_Tuple3 type
@@ -247,10 +247,10 @@ GrB_Info LAGraph_BF_full_mxv
247247
}
248248
GRB_TRY (GrB_Matrix_new(&Atmp, BF_Tuple3, n, n));
249249
GRB_TRY (GrB_Matrix_build_UDT(Atmp, I, J, W, nz, BF_lMIN_Tuple3));
250-
LAGraph_Free ((void**)&I);
251-
LAGraph_Free ((void**)&J);
252-
LAGraph_Free ((void**)&W);
253-
LAGraph_Free ((void**)&w);
250+
LAGraph_Free ((void**)&I, NULL);
251+
LAGraph_Free ((void**)&J, NULL);
252+
LAGraph_Free ((void**)&W, NULL);
253+
LAGraph_Free ((void**)&w, NULL);
254254

255255
//--------------------------------------------------------------------------
256256
// create and initialize "distance" vector d
@@ -305,13 +305,13 @@ GrB_Info LAGraph_BF_full_mxv
305305
//--------------------------------------------------------------------------
306306
// extract tuple from "distance" vector d and create GrB_Vectors for output
307307
//--------------------------------------------------------------------------
308-
I = LAGraph_Malloc (n, sizeof(GrB_Index)) ;
309-
W = LAGraph_Malloc (n, sizeof(BF_Tuple3_struct)) ;
310-
w = LAGraph_Malloc (n, sizeof(double)) ;
311-
h = LAGraph_Malloc (n, sizeof(GrB_Index)) ;
312-
pi = LAGraph_Malloc (n, sizeof(GrB_Index)) ;
313-
LG_ASSERT (I != NULL && W != NULL && w != NULL && h != NULL && pi != NULL,
314-
GrB_OUT_OF_MEMORY) ;
308+
309+
LAGRAPH_TRY (LAGraph_Malloc ((void **) &I, n, sizeof(GrB_Index), msg)) ;
310+
LAGRAPH_TRY (LAGraph_Malloc ((void **) &W, n, sizeof(BF_Tuple3_struct),
311+
msg)) ;
312+
LAGRAPH_TRY (LAGraph_Malloc ((void **) &w, n, sizeof(double), msg)) ;
313+
LAGRAPH_TRY (LAGraph_Malloc ((void **) &h, n, sizeof(GrB_Index), msg)) ;
314+
LAGRAPH_TRY (LAGraph_Malloc ((void **) &pi, n, sizeof(GrB_Index), msg)) ;
315315

316316
nz = n ;
317317
GRB_TRY (GrB_Vector_extractTuples_UDT (I, (void *) W, &nz, d));

‎experimental/algorithm/LAGraph_BF_pure_c.c

+8-9
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@
3232

3333
//------------------------------------------------------------------------------
3434

35-
#define LG_FREE_ALL \
36-
{ \
37-
LAGraph_Free ((void**) &d) ; \
38-
LAGraph_Free ((void**) &pi) ; \
35+
#define LG_FREE_ALL \
36+
{ \
37+
LAGraph_Free ((void**) &d, NULL) ; \
38+
LAGraph_Free ((void**) &pi, NULL) ; \
3939
}
4040

4141
#include "LG_internal.h"
@@ -68,15 +68,14 @@ GrB_Info LAGraph_BF_pure_c
6868
LG_ASSERT (I != NULL && J != NULL && W != NULL && pd != NULL &&
6969
ppi != NULL, GrB_NULL_POINTER) ;
7070

71-
LAGraph_Free ((void **) pd) ;
72-
LAGraph_Free ((void **) ppi) ;
71+
LAGraph_Free ((void **) pd, NULL) ;
72+
LAGraph_Free ((void **) ppi, NULL) ;
7373

7474
LG_ASSERT_MSG (s < n, GrB_INVALID_INDEX, "invalid source node") ;
7575

7676
// allocate d and pi
77-
d = LAGraph_Malloc(n, sizeof(int32_t));
78-
pi = LAGraph_Malloc(n, sizeof(int64_t));
79-
LG_ASSERT (d != NULL && pi != NULL, GrB_OUT_OF_MEMORY) ;
77+
LAGRAPH_TRY (LAGraph_Malloc((void **) &d, n, sizeof(int32_t), msg));
78+
LAGRAPH_TRY (LAGraph_Malloc((void **) &pi, n, sizeof(int64_t), msg));
8079

8180
// initialize d to a vector of INF while set d(s) = 0
8281
// and pi to a vector of -1

0 commit comments

Comments
 (0)