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
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -45,3 +45,5 @@ docs/_build
config_files copy/*
examples/*
internals/*

*.png
1 change: 0 additions & 1 deletion app/src/components/callflowSingle.js
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,6 @@ export default {
this.$store.maxIncTime = data["maxIncTime"];
this.$store.minIncTime = data["minIncTime"];

this.$store.numOfRanks = data["numOfRanks"];
this.$store.moduleCallsiteMap = data["module_callsite_map"];
this.$store.callsiteModuleMap = data["callsite_module_map"];

Expand Down
1 change: 0 additions & 1 deletion app/src/components/singleHistogram/singleHistogram.js
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,6 @@ export default {
let store = this.$store.modules[this.$store.selectedTargetDataset][callsite];
let data = store[this.$store.selectedMetric]["prop_histograms"]["rank"]["target"];
let mpiData = store[this.$store.selectedMetric]["data"];
this.numOfRanks = mpiData.length;

let temp = this.dataProcess(data, mpiData);
this.xVals = temp[0];
Expand Down
12 changes: 12 additions & 0 deletions callflow/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,24 @@
from .datastructures.ensemblegraph import EnsembleGraph

from .callflow import CallFlow
from .notebook import _load_ipython_extension

# CallFlow's public API.
__all__ = [
"init_logger",
"get_logger",
"GraphFrame",
"SuperGraph",
"EnsembleGraph",
"CallFlow",
"notebook",
]


def load_ipython_extension(ipython):
"""IPython API entry point.
Only intended to be called by the IPython runtime.
See:
https://ipython.readthedocs.io/en/stable/config/extensions/index.html
"""
_load_ipython_extension(ipython)
6 changes: 0 additions & 6 deletions callflow/callflow.py
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,6 @@ def add_basic_info_to_config(self):
self.config["maxExcTime"] = {}
self.config["minIncTime"] = {}
self.config["minExcTime"] = {}
self.config["numOfRanks"] = {}
maxIncTime = 0
maxExcTime = 0
minIncTime = 0
Expand All @@ -241,20 +240,15 @@ def add_basic_info_to_config(self):
self.supergraphs[tag].gf.df["time (inc)"].min()
)
self.config["minExcTime"][tag] = self.supergraphs[tag].gf.df["time"].min()
# self.config["numOfRanks"][dataset] = len(
# self.datasets[dataset].gf.df["rank"].unique()
# )
maxExcTime = max(self.config["maxExcTime"][tag], maxExcTime)
maxIncTime = max(self.config["maxIncTime"][tag], maxIncTime)
minExcTime = min(self.config["minExcTime"][tag], minExcTime)
minIncTime = min(self.config["minIncTime"][tag], minIncTime)
# maxNumOfRanks = max(self.config["numOfRanks"][dataset], maxNumOfRanks)

self.config["maxIncTime"]["ensemble"] = maxIncTime
self.config["maxExcTime"]["ensemble"] = maxExcTime
self.config["minIncTime"]["ensemble"] = minIncTime
self.config["minExcTime"]["ensemble"] = minExcTime
# self.config["numOfRanks"]["ensemble"] = maxNumOfRanks

def request_single(self, operation):
"""
Expand Down
4 changes: 2 additions & 2 deletions callflow/datastructures/graphframe.py
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ def from_config(config, name):
data_path = os.path.join(
config["data_path"], config["properties"]["paths"][name]
)
profile_format = config["properties"]["format"][name]
profile_format = config["properties"]["profile_format"][name]
if profile_format == "hpctoolkit":
gf = ht.GraphFrame.from_hpctoolkit(data_path)

Expand All @@ -132,7 +132,7 @@ def from_config(config, name):
)
gf = ht.GraphFrame.from_caliper(data_path, query=query)

elif profile_format == "caliper-json":
elif profile_format == "caliper_json":
gf = ht.GraphFrame.from_caliper_json(data_path)

elif profile_format == "gprof":
Expand Down
4 changes: 2 additions & 2 deletions callflow/datastructures/supergraph.py
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ def process_gf(self):
Note: Process class follows a builder pattern.
(refer: https://en.wikipedia.org/wiki/Builder_pattern#:~:text=The%20builder%20pattern%20is%20a,Gang%20of%20Four%20design%20patterns.)
"""
profile_format = self.props["properties"]["format"][self.tag]
profile_format = self.props["properties"]["profile_format"][self.tag]
if profile_format == "hpctoolkit":

process = (
Expand All @@ -108,7 +108,7 @@ def process_gf(self):
.build()
)

elif profile_format == "caliper-json" or profile_format == "caliper":
elif profile_format == "caliper_json" or profile_format == "caliper":
if "callsite_module_map" in self.props:
process = (
Process.Builder(self.gf, self.tag)
Expand Down
Loading