Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Projections Reader: Minor Fixes #126

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions pipit/readers/otf2_reader.py
Original file line number Diff line number Diff line change
Expand Up @@ -316,9 +316,9 @@ def events_reader(self, rank_size):
if value is not None and key != "time":
# uses field_to_val to convert all data types
# and ensure that there are no pickling errors
attributes_dict[
self.field_to_val(key)
] = self.handle_data(value)
attributes_dict[self.field_to_val(key)] = (
self.handle_data(value)
)
event_attributes.append(attributes_dict)
else:
# nan attributes for leave rows
Expand Down
10 changes: 4 additions & 6 deletions pipit/readers/projections_reader.py
Original file line number Diff line number Diff line change
Expand Up @@ -165,10 +165,9 @@ def read_sts_file(self):
# Add to self.chares
elif line_arr[0] == "CHARE":
id = int(line_arr[1])
name = line_arr[2][1 : len(line_arr[2]) - 1]
dimensions = int(line_arr[3])
name = " ".join(line_arr[2:-1])[1:-1]
dimensions = int(line_arr[-1])
self.chares[id] = (name, dimensions)
# print(int(line_arr[1]), line_arr[2][1:len(line_arr[2]) - 1])

# add to self.entries
elif line_arr[0] == "ENTRY":
Expand All @@ -180,7 +179,6 @@ def read_sts_file(self):
id = int(line_arr[2])
entry_name = line_arr[3][1 : len(line_arr[3]) - 1]
chare_id = int(line_arr[4])
# name = self.chares[chare_id][0] + '::' + entry_name
self.entries[id] = (entry_name, chare_id)

# Add to message_table
Expand Down Expand Up @@ -525,7 +523,7 @@ def _read_log_file(self, rank_size) -> pd.DataFrame:
"Message Length": msglen,
"Event ID": event,
"Send Time": send_time,
"Destinatopn PEs": destPEs,
"Destination PEs": destPEs,
}

_add_to_trace_dict(
Expand Down Expand Up @@ -563,7 +561,7 @@ def _read_log_file(self, rank_size) -> pd.DataFrame:
"Entry Type": "Processing",
"Event ID": event,
"Message Length": msglen,
"Recieve Time": recv_time,
"Receive Time": recv_time,
"ID List": id,
"CPU Start Time": cpu_start_time,
"perf counts list": perf_counts,
Expand Down
8 changes: 5 additions & 3 deletions pipit/util/cct.py
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,11 @@ def create_cct(events):

# add node as root or child of its
# parent depending on current depth
graph.add_root(
curr_node
) if curr_depth == 0 else parent_node.add_child(curr_node)
(
graph.add_root(curr_node)
if curr_depth == 0
else parent_node.add_child(curr_node)
)

# Update nodes stack, column, and current depth
nodes_stack.append(curr_node)
Expand Down
Loading