diff options
Diffstat (limited to 'cr2')
| -rw-r--r-- | cr2/__init__.py | 2 | ||||
| -rw-r--r-- | cr2/power.py | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/cr2/__init__.py b/cr2/__init__.py index 887bf7b..fd276a9 100644 --- a/cr2/__init__.py +++ b/cr2/__init__.py @@ -24,7 +24,7 @@ def summary_plots(**kwords): kwords["height"] = 5 # XXX This needs to be made generic - map_label = {0: "A7", 1: "A15"} + map_label = {"0000000f": "A7", "000000f0": "A15"} gov_data.plot_temperature(**kwords) inpower_data.plot_load(map_label, **kwords) diff --git a/cr2/power.py b/cr2/power.py index a8f84e5..871238c 100644 --- a/cr2/power.py +++ b/cr2/power.py @@ -99,10 +99,10 @@ class InPower(BaseThermal): for col in load_cols[1:]: load_series += dfr[col] - load_dfr = pd.DataFrame({"cluster": dfr["cluster"], "load": load_series}) - cluster_numbers = set(dfr["cluster"]) + load_dfr = pd.DataFrame({"cpus": dfr["cpus"], "load": load_series}) + cluster_numbers = set(dfr["cpus"]) - return pivot_with_labels(load_dfr, "load", "cluster", mapping_label) + return pivot_with_labels(load_dfr, "load", "cpus", mapping_label) def get_all_freqs(self, mapping_label): """get a DataFrame with the "in" frequencies as seen by the governor @@ -112,7 +112,7 @@ class InPower(BaseThermal): dfr = self.get_data_frame() - return pivot_with_labels(dfr, "freq", "cluster", mapping_label) / 1000 + return pivot_with_labels(dfr, "freq", "cpus", mapping_label) / 1000 def plot_load(self, mapping_label, title="", width=None, height=None): """plot the load of all the clusters, similar to how compare runs did it |