Skip to content
Merged
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
24 changes: 1 addition & 23 deletions explorer/dxt.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@

from importlib import resources
from explorer import version as dxt_version
from packaging import version


class Explorer:
Expand Down Expand Up @@ -268,6 +267,7 @@ def create_dataframe(
"start",
"end",
"osts",
"pthread_id"
]
total_logs = 0
runtime = 0
Expand Down Expand Up @@ -1171,28 +1171,6 @@ def generate_index(self, file, report):
"You can open the index.html file in your browser to interactively explore all plots"
)

def check_log_version(self, file, log_version, library_version):
use_file = file
if version.parse(log_version) < version.parse(library_version):
use_file = file.replace(".darshan", ".converted.darshan")
self.logger.info(
'Converting .darshan log from {} to {}: format: saving output file "{}" in the current working directory.'.format(
log_version, library_version, use_file
)
)

if not os.path.isfile(use_file):
ret = os.system("darshan-convert {} {}".format(file, use_file))

if ret != 0:
self.logger.error(
"Unable to convert .darshan file to version {}".format(
library_version
)
)

return use_file


def main():
PARSER = argparse.ArgumentParser(description="DXT Explorer: ")
Expand Down
9 changes: 5 additions & 4 deletions explorer/plots/operation.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ def add_trace_to_graph(dataframe, color_scale=None, stragglers=False):
if stragglers:
custom_data = ["rank", "duration"]
else:
custom_data = ["rank", "duration", "size", "offset", "osts"]
custom_data = ["rank", "duration", "size", "offset", "osts", "pthread_id"]

fig.add_traces(
list(
Expand Down Expand Up @@ -598,7 +598,7 @@ def append_content(target_tag, source_path, part="body"):
error_x="duration",
render_mode="auto",
facet_row=facet_row,
custom_data=["rank", "duration", "size", "offset", "osts"],
custom_data=["rank", "duration", "size", "offset", "osts", "pthread_id"],
color_discrete_sequence=["#d0e6f5", "#f7d8d5"],
category_orders=category_orders,
)
Expand All @@ -625,7 +625,7 @@ def append_content(target_tag, source_path, part="body"):
render_mode="auto",
facet_row=facet_row,
color_discrete_sequence=["#3c93c2", "#f0746e"],
custom_data=["rank", "duration", "size", "offset", "osts"],
custom_data=["rank", "duration", "size", "offset", "osts", "pthread_id"],
category_orders=category_orders,
)

Expand Down Expand Up @@ -782,7 +782,8 @@ def append_content(target_tag, source_path, part="body"):
"Duration: %{customdata[1]}",
"Size: %{customdata[2]}",
"Offset: %{customdata[3]}",
"Osts: %{customdata[4]}",
"Lustre OSTs: %{customdata[4]}",
"Thread ID: %{customdata[5]}",
]
)
)
Expand Down
6 changes: 6 additions & 0 deletions explorer/plots/spatiality.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,9 @@
if df.empty:
quit()

df["osts"] = df["osts"].astype(object).fillna("-")
df["pthread_id"] = df["pthread_id"].astype(object).fillna("-")

df["duration"] = df["end"] - df["start"]
rank_gap = max(df["rank"]) * 0.075
maximum_rank = max(df["rank"])
Expand Down Expand Up @@ -77,6 +80,9 @@ def paste0():
label = label + "-"
else:
label = label + df["osts"].apply(str)

label += "<br>" + "Thread ID: " + df["pthread_id"].apply(str)

return label


Expand Down
5 changes: 5 additions & 0 deletions explorer/plots/transfer.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,8 @@
if df.empty:
quit()

df["osts"] = df["osts"].astype(object).fillna("-")

df["duration"] = df["end"] - df["start"]

duration = max(df["end"]) - min(df["start"])
Expand Down Expand Up @@ -125,6 +127,9 @@ def paste0():
label = label + "-"
else:
label = label + df["osts"].apply(str)

label += "<br>" + "Thread ID: " + df["pthread_id"].apply(str)

return label


Expand Down