Skip to content

Commit 34ab14f

Browse files
houjungithub-actions[bot]jeanbez
authored
Fix issues with PDC tools (#249)
* Fix issues with PDC tools * Correct LOG_ERROR to LOG_INFO * Committing clang-format changes --------- Co-authored-by: github-actions <github-actions[bot]@users.noreply.github.com> Co-authored-by: Jean Luca Bez <jlbez@lbl.gov>
1 parent 3bcd2d2 commit 34ab14f

File tree

6 files changed

+37
-35
lines changed

6 files changed

+37
-35
lines changed

‎src/tools/hdf5_access_eqsim.c‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
#include "mpi.h"
99

1010
#include "hdf5.h"
11+
#include "pdc_logger.h"
1112

1213
int
1314
main(int argc, char **argv)
@@ -43,7 +44,7 @@ main(int argc, char **argv)
4344
readt = ceil(1.0 * dims[0] / chunk_size[0]) * chunk_size[0] / devide_factor;
4445

4546
if (rank == 0)
46-
LOG_ERROR("Round %d, use chunk cache %d, devide factor %d\n", round, use_chunk_cache, devide_factor);
47+
LOG_INFO("Round %d, use chunk cache %d, devide factor %d\n", round, use_chunk_cache, devide_factor);
4748

4849
fapl = H5Pcreate(H5P_FILE_ACCESS);
4950
H5Pset_fapl_mpio(fapl, MPI_COMM_WORLD, MPI_INFO_NULL);
@@ -95,7 +96,7 @@ main(int argc, char **argv)
9596
MPI_Barrier(MPI_COMM_WORLD);
9697
t1 = MPI_Wtime();
9798
if (rank == 0)
98-
LOG_ERROR("Round %d: read metadata took %.4lf\n", r, t1 - t0);
99+
LOG_INFO("Round %d: read metadata took %.4lf\n", r, t1 - t0);
99100
}
100101

101102
H5Dclose(meta_dset);
@@ -122,8 +123,8 @@ main(int argc, char **argv)
122123
data = (double *)malloc(sizeof(double) * size[0] * size[1] * size[2]);
123124

124125
if (nproc <= 16)
125-
LOG_ERROR("Rank %d: offset %llu, %llu, %llu size %llu, %llu, %llu\n", rank, offset[0], offset[1],
126-
offset[2], size[0], size[1], size[2]);
126+
LOG_INFO("Rank %d: offset %llu, %llu, %llu size %llu, %llu, %llu\n", rank, offset[0], offset[1],
127+
offset[2], size[0], size[1], size[2]);
127128

128129
for (r = 0; r < round; r++) {
129130
if (r == round - 1 && use_chunk_cache > 0)
@@ -142,7 +143,7 @@ main(int argc, char **argv)
142143
MPI_Barrier(MPI_COMM_WORLD);
143144
t1 = MPI_Wtime();
144145
if (rank == 0)
145-
LOG_ERROR("Round %d, Read from HDF5 took %.4lf\n", r, t1 - t0);
146+
LOG_INFO("Round %d, Read from HDF5 took %.4lf\n", r, t1 - t0);
146147

147148
if (r != round - 1) {
148149
// leave dset open for following patterns
@@ -184,11 +185,11 @@ main(int argc, char **argv)
184185
t1 = MPI_Wtime();
185186

186187
if (rank == 0)
187-
LOG_ERROR("Round %d: Scanning data took %.4lf\n", r, t1 - t0);
188+
LOG_INFO("Round %d: Scanning data took %.4lf\n", r, t1 - t0);
188189
}
189190

190-
LOG_ERROR("Rank %d: %d, %d, %d, %d, %d, %d, %d, %d, %d, %d\n", rank, cnt[0], cnt[1], cnt[2], cnt[3],
191-
cnt[4], cnt[5], cnt[6], cnt[7], cnt[8], cnt[9]);
191+
LOG_INFO("Rank %d: %d, %d, %d, %d, %d, %d, %d, %d, %d, %d\n", rank, cnt[0], cnt[1], cnt[2], cnt[3],
192+
cnt[4], cnt[5], cnt[6], cnt[7], cnt[8], cnt[9]);
192193
MPI_Barrier(MPI_COMM_WORLD);
193194

194195
//=============PATTERN 2===============
@@ -210,8 +211,8 @@ main(int argc, char **argv)
210211
mspace = H5Screate_simple(4, size, NULL);
211212

212213
if (nproc <= 16)
213-
LOG_ERROR("Rank %d: offset %llu, %llu, %llu size %llu, %llu, %llu\n", rank, offset[0], offset[1],
214-
offset[2], size[0], size[1], size[2]);
214+
LOG_INFO("Rank %d: offset %llu, %llu, %llu size %llu, %llu, %llu\n", rank, offset[0], offset[1],
215+
offset[2], size[0], size[1], size[2]);
215216

216217
if (rank == 0)
217218
opensees_data = (double *)malloc(sizeof(double) * dims[0] * opensees_size * opensees_size);
@@ -233,7 +234,7 @@ main(int argc, char **argv)
233234
MPI_Barrier(MPI_COMM_WORLD);
234235
t1 = MPI_Wtime();
235236
if (rank == 0)
236-
LOG_ERROR("Round %d: rank 0 read OpenSees 200x200m data took %.6lf\n", r, t1 - t0);
237+
LOG_INFO("Round %d: rank 0 read OpenSees 200x200m data took %.6lf\n", r, t1 - t0);
237238

238239
} // End for round
239240

@@ -276,7 +277,7 @@ main(int argc, char **argv)
276277
MPI_Barrier(MPI_COMM_WORLD);
277278
t1 = MPI_Wtime();
278279
if (rank == 0)
279-
LOG_ERROR("Round %d: all ranks read ssi_downsample data took %.6lf\n", r, t1 - t0);
280+
LOG_INFO("Round %d: all ranks read ssi_downsample data took %.6lf\n", r, t1 - t0);
280281

281282
} // End for round
282283

@@ -319,7 +320,7 @@ main(int argc, char **argv)
319320
MPI_Barrier(MPI_COMM_WORLD);
320321
t1 = MPI_Wtime();
321322
if (rank == 0)
322-
LOG_ERROR("Round %d: all ranks read rec_downsample data took %.6lf\n", r, t1 - t0);
323+
LOG_INFO("Round %d: all ranks read rec_downsample data took %.6lf\n", r, t1 - t0);
323324

324325
} // End for round
325326

@@ -360,7 +361,7 @@ main(int argc, char **argv)
360361
MPI_Barrier(MPI_COMM_WORLD);
361362
t1 = MPI_Wtime();
362363
if (rank == 0)
363-
LOG_ERROR("Round %d: rank 0 read 1 time-history took %.6lf\n", r, t1 - t0);
364+
LOG_INFO("Round %d: rank 0 read 1 time-history took %.6lf\n", r, t1 - t0);
364365

365366
} // End for round
366367

‎src/tools/meta_json/metadata_json_printer.c‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#include "metadata_json_printer.h"
2+
#include "pdc_logger.h"
23

34
int
45
init_printer(MD_JSON_ARGS *md_json_args)
@@ -64,4 +65,4 @@ create_md_json_printer()
6465
md_json_processor->complete_one_json_file = done_printing_one_json;
6566
md_json_processor->finalize_processor = finalize_printer;
6667
return md_json_processor;
67-
}
68+
}

‎src/tools/pdc_access_eqsim.c‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ main(int argc, char **argv)
7474
remote_reg = PDCregion_create(3, pdc_offset, pdc_size);
7575

7676
if (nproc <= 16)
77-
LOG_ERROR("Rank %d: offset %llu, %llu, %llu size %llu, %llu, %llu\n", rank, pdc_offset[0],
78-
pdc_offset[1], pdc_offset[2], pdc_size[0], pdc_size[1], pdc_size[2]);
77+
LOG_INFO("Rank %d: offset %llu, %llu, %llu size %llu, %llu, %llu\n", rank, pdc_offset[0],
78+
pdc_offset[1], pdc_offset[2], pdc_size[0], pdc_size[1], pdc_size[2]);
7979

8080
// Tag retrieval
8181
sprintf(tag_name, "%llu-%llu\n", pdc_offset[1], pdc_offset[2]);
@@ -91,11 +91,11 @@ main(int argc, char **argv)
9191
MPI_Barrier(MPI_COMM_WORLD);
9292
t1 = MPI_Wtime();
9393
if (rank == 0)
94-
LOG_ERROR("Round %d: tag retrival query took %.6lf\n", r, t1 - t0);
94+
LOG_INFO("Round %d: tag retrival query took %.6lf\n", r, t1 - t0);
9595
#endif
9696
if (value_size != 4 * sizeof(double))
97-
LOG_ERROR("Error: Round %d: tag retrival result size %llu / %llu \n", r, value_size,
98-
4 * sizeof(double));
97+
LOG_INFO("Error: Round %d: tag retrival result size %llu / %llu \n", r, value_size,
98+
4 * sizeof(double));
9999
if (tag_value)
100100
free(tag_value);
101101
}
@@ -119,7 +119,7 @@ main(int argc, char **argv)
119119
MPI_Barrier(MPI_COMM_WORLD);
120120
t1 = MPI_Wtime();
121121
if (rank == 0)
122-
LOG_ERROR("Round %d: rank 0 read OpenSees 200x200m data from server took %.6lf\n", r, t1 - t0);
122+
LOG_INFO("Round %d: rank 0 read OpenSees 200x200m data from server took %.6lf\n", r, t1 - t0);
123123
#endif
124124

125125
if (rank == 0)
@@ -178,7 +178,7 @@ main(int argc, char **argv)
178178
MPI_Barrier(MPI_COMM_WORLD);
179179
t1 = MPI_Wtime();
180180
if (rank == 0)
181-
LOG_ERROR("Round %d: all ranks read ssi_downsample data from server took %.6lf\n", r, t1 - t0);
181+
LOG_INFO("Round %d: all ranks read ssi_downsample data from server took %.6lf\n", r, t1 - t0);
182182
#endif
183183

184184
for (i = 0; i < batchsize; i++)
@@ -235,7 +235,7 @@ main(int argc, char **argv)
235235
MPI_Barrier(MPI_COMM_WORLD);
236236
t1 = MPI_Wtime();
237237
if (rank == 0)
238-
LOG_ERROR("Round %d: all ranks read rec_downsample data from server took %.6lf\n", r, t1 - t0);
238+
LOG_INFO("Round %d: all ranks read rec_downsample data from server took %.6lf\n", r, t1 - t0);
239239
#endif
240240

241241
for (i = 0; i < batchsize; i++)
@@ -278,7 +278,7 @@ main(int argc, char **argv)
278278
MPI_Barrier(MPI_COMM_WORLD);
279279
t1 = MPI_Wtime();
280280
if (rank == 0)
281-
LOG_ERROR("Round %d: rank 0 read single time series from server took %.6lf\n", r, t1 - t0);
281+
LOG_INFO("Round %d: rank 0 read single time series from server took %.6lf\n", r, t1 - t0);
282282
#endif
283283
} // End for round
284284

‎src/tools/pdc_export.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ main(int argc, char *argv[])
216216
}
217217
}
218218
if (head == NULL) {
219-
LOG_ERRO("Unable to open/locate checkpoint file(s).\n");
219+
LOG_ERROR("Unable to open/locate checkpoint file(s).\n");
220220
return 1;
221221
}
222222
else {

‎src/tools/pdc_import_eqsim.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,8 @@ main(int argc, char **argv)
9191
data = (double *)malloc(sizeof(double) * local_size[0] * local_size[1] * local_size[2]);
9292

9393
if (nproc <= 16)
94-
LOG_ERROR("Rank %d: offset %llu, %llu, %llu size %llu, %llu, %llu\n", rank, offset[0], offset[1],
95-
offset[2], size[0], size[1], size[2]);
94+
LOG_INFO("Rank %d: offset %llu, %llu, %llu size %llu, %llu, %llu\n", rank, offset[0], offset[1],
95+
offset[2], size[0], size[1], size[2]);
9696

9797
#ifdef ENABLE_MPI
9898
t0 = MPI_Wtime();
@@ -104,7 +104,7 @@ main(int argc, char **argv)
104104
MPI_Barrier(MPI_COMM_WORLD);
105105
t1 = MPI_Wtime();
106106
if (rank == 0)
107-
LOG_ERROR("Read from HDF5 took %.4lf\n", t1 - t0);
107+
LOG_INFO("Read from HDF5 took %.4lf\n", t1 - t0);
108108
#endif
109109

110110
H5Sclose(mspace);
@@ -126,7 +126,7 @@ main(int argc, char **argv)
126126
pdc_dims[0] = dims[0];
127127
pdc_dims[1] = max_start_x + chunk_size[1];
128128
pdc_dims[2] = max_start_y + chunk_size[2];
129-
LOG_ERROR("Rank %d: create obj dims %llu %llu %llu\n", rank, pdc_dims[0], pdc_dims[1], pdc_dims[2]);
129+
LOG_INFO("Rank %d: create obj dims %llu %llu %llu\n", rank, pdc_dims[0], pdc_dims[1], pdc_dims[2]);
130130

131131
for (i = 0; i < 3; i++) {
132132
pdc_offset[i] = (uint64_t)offset[i];
@@ -183,7 +183,7 @@ main(int argc, char **argv)
183183
MPI_Barrier(MPI_COMM_WORLD);
184184
t1 = MPI_Wtime();
185185
if (rank == 0)
186-
LOG_ERROR("Write data to server took %.4lf\n", t1 - t0);
186+
LOG_INFO("Write data to server took %.4lf\n", t1 - t0);
187187
#endif
188188

189189
free(data);

‎src/tools/pdc_query_eqsim.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,8 @@ main(int argc, char **argv)
9292
data = (double *)malloc(sizeof(double) * local_size[0] * local_size[1] * local_size[2]);
9393

9494
if (nproc <= 16)
95-
LOG_ERROR("Rank %d: offset %llu, %llu, %llu size %llu, %llu, %llu\n", rank, offset[0], offset[1],
96-
offset[2], size[0], size[1], size[2]);
95+
LOG_INFO("Rank %d: offset %llu, %llu, %llu size %llu, %llu, %llu\n", rank, offset[0], offset[1],
96+
offset[2], size[0], size[1], size[2]);
9797

9898
#ifdef ENABLE_MPI
9999
t0 = MPI_Wtime();
@@ -105,7 +105,7 @@ main(int argc, char **argv)
105105
MPI_Barrier(MPI_COMM_WORLD);
106106
t1 = MPI_Wtime();
107107
if (rank == 0)
108-
LOG_ERROR("Read from HDF5 took %.4lf\n", t1 - t0);
108+
LOG_INFO("Read from HDF5 took %.4lf\n", t1 - t0);
109109
#endif
110110

111111
H5Sclose(mspace);
@@ -185,7 +185,7 @@ main(int argc, char **argv)
185185
MPI_Barrier(MPI_COMM_WORLD);
186186
t1 = MPI_Wtime();
187187
if (rank == 0)
188-
LOG_ERROR("Write data to server took %.4lf\n", t1 - t0);
188+
LOG_INFO("Write data to server took %.4lf\n", t1 - t0);
189189
#endif
190190

191191
// Construct query constraints
@@ -206,7 +206,7 @@ main(int argc, char **argv)
206206
MPI_Barrier(MPI_COMM_WORLD);
207207
t1 = MPI_Wtime();
208208
if (rank == 0)
209-
LOG_ERROR("Query data took %.4lf\n", t1 - t0);
209+
LOG_INFO("Query data took %.4lf\n", t1 - t0);
210210
#endif
211211

212212
/* PDCselection_print(&sel); */

0 commit comments

Comments
 (0)