Skip to content

Commit 59de33a

Browse files
Mongoose: remove cleanup, reduce output for memory tests
1 parent 8bfbf78 commit 59de33a

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

Mongoose/Source/Mongoose_IO.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ Graph *read_graph(const char *filename)
4949
cs *A = read_matrix(filename, matcode);
5050
if (!A)
5151
{
52-
LogError("Error reading matrix from file\n");
52+
// LogError("Error reading matrix from file\n");
5353
return NULL;
5454
}
5555
cs *sanitized_A = sanitizeMatrix(A, mm_is_symmetric(matcode), false);
@@ -61,7 +61,7 @@ Graph *read_graph(const char *filename)
6161

6262
if (!G)
6363
{
64-
LogError("Ran out of memory in Mongoose::read_graph\n");
64+
// LogError("Ran out of memory in Mongoose::read_graph\n");
6565
cs_spfree(sanitized_A);
6666
Logger::toc(IOTiming);
6767
return NULL;
@@ -125,7 +125,7 @@ cs *read_matrix(const char *filename, MM_typecode &matcode)
125125

126126
if (!I || !J || !val)
127127
{
128-
LogError("Error: Ran out of memory in Mongoose::read_matrix\n");
128+
// LogError("Error: Ran out of memory in Mongoose::read_matrix\n");
129129
SuiteSparse_free(I);
130130
SuiteSparse_free(J);
131131
SuiteSparse_free(val);
@@ -147,7 +147,7 @@ cs *read_matrix(const char *filename, MM_typecode &matcode)
147147
cs *A = (cs *)SuiteSparse_malloc(1, sizeof(cs));
148148
if (!A)
149149
{
150-
LogError("Error: Ran out of memory in Mongoose::read_matrix\n");
150+
// LogError("Error: Ran out of memory in Mongoose::read_matrix\n");
151151
SuiteSparse_free(I);
152152
SuiteSparse_free(J);
153153
SuiteSparse_free(val);
@@ -167,7 +167,7 @@ cs *read_matrix(const char *filename, MM_typecode &matcode)
167167
cs_spfree(A);
168168
if (!compressed_A)
169169
{
170-
LogError("Error: Ran out of memory in Mongoose::read_matrix\n");
170+
// LogError("Error: Ran out of memory in Mongoose::read_matrix\n");
171171
return NULL;
172172
}
173173

Mongoose/Tests/runTests

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ def runTests(args):
105105
status = call([Mongoose_tests_dir + "mongoose_test_memory", matrix_path])
106106
if status:
107107
print("Error! Memory Test Failure")
108-
cleanup(args, row, matrix_exists, gzip_path)
108+
# cleanup(args, row, matrix_exists, gzip_path)
109109
sys.exit(status)
110110
if args.tests == 'valgrind' or args.tests == 'all':
111111
print("Calling Valgrind Test...")
@@ -115,7 +115,7 @@ def runTests(args):
115115
status = call([valgrind + " --leak-check=full " + Mongoose_tests_dir + "mongoose_test_memory", matrix_path])
116116
if status:
117117
print("Error! Valgrind Test Failure")
118-
cleanup(args, row, matrix_exists, gzip_path)
118+
# cleanup(args, row, matrix_exists, gzip_path)
119119
sys.exit(status)
120120
else:
121121
print("\033[91mERROR!\033[0m Unable to find Valgrind. Skipping Valgrind Test...")
@@ -124,27 +124,27 @@ def runTests(args):
124124
status = call([Mongoose_tests_dir + "mongoose_test_io", matrix_path, "1"])
125125
if status:
126126
print("Error! I/O Test Failure")
127-
cleanup(args, row, matrix_exists, gzip_path)
127+
# cleanup(args, row, matrix_exists, gzip_path)
128128
sys.exit(status)
129129
if args.tests == 'edgesep' or args.tests == 'all':
130130
print("Calling Edge Separator Test...")
131131
target_split = args.target_split
132132
status = call([Mongoose_tests_dir + "mongoose_test_edgesep", matrix_path, str(target_split)])
133133
if status:
134134
print("Error! Edge Separator Test Failure")
135-
cleanup(args, row, matrix_exists, gzip_path)
135+
# cleanup(args, row, matrix_exists, gzip_path)
136136
sys.exit(status)
137137
if args.tests == 'performance' or args.tests == 'all':
138138
print("Calling Performance Test...")
139139
status = call([Mongoose_tests_dir + "mongoose_test_performance", matrix_path, row[0] + '_' + row[1] + '_performance.txt'])
140140
if status:
141141
print("Error! Performance Test Failure")
142-
cleanup(args, row, matrix_exists, gzip_path)
142+
# cleanup(args, row, matrix_exists, gzip_path)
143143
sys.exit(status)
144144

145145
# Delete the matrix only if we downloaded it and the keep
146146
# flag is off
147-
cleanup(args, row, matrix_exists, gzip_path)
147+
# cleanup(args, row, matrix_exists, gzip_path)
148148

149149
# delete the ssstats.csv file
150150
os.remove(stats_file)

0 commit comments

Comments
 (0)