Skip to content

Commit ebd4830

Browse files
author
Orcun YILDIZ
committed
fixing the repacking layout for daos and dfs modules which was causing problems with the accumulated metrics on pydarshan
1 parent 113f2dd commit ebd4830

File tree

1 file changed

+24
-4
lines changed

1 file changed

+24
-4
lines changed

darshan-util/pydarshan/darshan/backend/cffi_backend.py

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -736,10 +736,30 @@ def _df_to_rec(rec_dict, mod_name, rec_index_of_interest=None):
736736
num_recs = 1
737737
# id and rank columns are duplicated
738738
# in counters and fcounters
739-
rec_arr = np.recarray(shape=(num_recs), dtype=[("id", "<u8", (1,)),
740-
("rank", "<i8", (1,)),
741-
("counters", "<i8", (counters_n_cols - 2,)),
742-
("fcounters", "<f8", (fcounters_n_cols - 2,))])
739+
740+
if mod_name not in ('DFS', 'DAOS'):
741+
rec_arr = np.recarray(shape=(num_recs), dtype=[("id", "<u8", (1,)),
742+
("rank", "<i8", (1,)),
743+
("counters", "<i8", (counters_n_cols - 2,)),
744+
("fcounters", "<f8", (fcounters_n_cols - 2,))])
745+
elif mod_name == 'DFS':
746+
rec_arr = np.recarray(shape=(num_recs), dtype=[("id", "<u8", (1,)),
747+
("rank", "<i8", (1,)),
748+
("counters", "<i8", (counters_n_cols - 2,)),
749+
("fcounters", "<f8", (fcounters_n_cols - 2,)),
750+
("pool_uuid", "V16"),
751+
("cont_uuid", "V16")])
752+
elif mod_name == 'DAOS':
753+
rec_arr = np.recarray(shape=(num_recs), dtype=[("id", "<u8", (1,)),
754+
("rank", "<i8", (1,)),
755+
("counters", "<i8", (counters_n_cols - 2,)),
756+
("fcounters", "<f8", (fcounters_n_cols - 2,)),
757+
("pool_uuid", "V16"),
758+
("cont_uuid", "V16"),
759+
("oid_hi", "<u8"),
760+
("oid_lo", "<u8")])
761+
762+
743763
rec_arr.fcounters = fcounters_df.iloc[rec_index_of_interest, 2:].to_numpy()
744764
rec_arr.counters = counters_df.iloc[rec_index_of_interest, 2:].to_numpy()
745765
if num_recs > 1:

0 commit comments

Comments
 (0)