small fixups for OMP Region Explorer

Author: ptooley

pypop/notebook_interface/omp_explorer.py

@@ -18,11 +18,11 @@ class OMPRegionExplorer(BokehBase):
     _omp_tooltip_template = [
         ("Function(s)", "@{Region Function Fingerprint}"),
         ("Location(s)", "@{Region Location Fingerprint}"),
-        ("Load Bal.", "@{Load Balance}"),
-        ("Length", "@{Region Length} ns"),
-        ("Avg. Comp.", "@{Average Computation Time}"),
-        ("Max. Comp.", "@{Maximum Computation Time}"),
-        ("Sum Comp.", "@{Region Total Computation}"),
+        ("Load Bal.", "@{Load Balance}{0.00}"),
+        ("Length", "@{Region Length}{0.000 a}s"),
+        ("Avg. Comp.", "@{Average Computation Time}{0.000 a}s"),
+        ("Max. Comp.", "@{Maximum Computation Time}{0.000 a}s"),
+        ("Sum Comp.", "@{Region Total Computation}{0.000 a}s"),
     ]
 
     def __init__(self, prv: PRV, fontsize=14):
@@ -32,9 +32,19 @@ def __init__(self, prv: PRV, fontsize=14):
 
     def _build_plot(self):
 
-        omp_region_stats = self._prv.profile_openmp_regions()
-        omp_region_stats["Region Start"] /= 1e9
-        omp_region_stats["Region End"] /= 1e9
+        omp_region_stats = self._prv.profile_openmp_regions().copy()
+
+        for tm in [
+            "Region Start",
+            "Region End",
+            "Region Length",
+            "Average Computation Time",
+            "Maximum Computation Time",
+            "Computation Delay Time",
+            "Region Total Computation",
+            "Region Delay Time",
+        ]:
+            omp_region_stats[tm] /= 1e9
 
         # Geometry calculations - start at 48 em width and 2em plus 2em per bar height up
         # to a maximum of 15 bars, then start shrinking the bars
@@ -51,6 +61,7 @@ def _build_plot(self):
             tools="xwheel_zoom,zoom_in,zoom_out,pan,reset,save",
             tooltips=self._omp_tooltip_template,
         )
+
         for rank, rankdata in omp_region_stats.groupby(level="rank"):
             self._figure.hbar(
                 y=rank,
@@ -68,14 +79,19 @@ def _build_plot(self):
 
         n_ranks = len(omp_region_stats.index.unique(level="rank"))
         n_rankticks = n_ranks if n_ranks < 10 else 10
-        rankticks = [
-            int(x) for x in numpy.linspace(1, n_ranks, n_rankticks)
-        ]
+        rankticks = [int(x) for x in numpy.linspace(1, n_ranks, n_rankticks)]
 
         self._figure.yaxis.ticker = rankticks
 
         self._figure.ygrid.visible = False
         self._figure.yaxis.major_tick_line_color = None
         self._figure.yaxis.axis_line_color = None
 
+        self._figure.xaxis.axis_label = "Time (s)"
+        self._figure.xaxis.axis_label_text_font_size = "16pt"
+        self._figure.xaxis.major_label_text_font_size = "16pt"
+        self._figure.yaxis.axis_label = "Processes"
+        self._figure.yaxis.axis_label_text_font_size = "16pt"
+        self._figure.yaxis.major_label_text_font_size = "16pt"
+
         self.update()

pypop/prv.py

@@ -116,7 +116,6 @@ def __getattr__(self, attr):
 
         if attr in PRV.record_types.values():
             self._parse_prv()
-            return self.__getattribute__(attr)
 
         return super().__getattribute__(attr)
 
@@ -173,6 +172,18 @@ def _parse_pcf(self):
         except FileNotFoundError:
             raise FileNotFoundError("No PCF file accompanying PRV - cannot continue")
 
+    def add_interpreted_names(self):
+
+        if "Event Name" not in self.event:
+            self.event["Event Name"] = self.event["event"].map(self.event_names)
+        if "Event Value" not in self.event:
+            self.event["Event Value"] = self.event.apply(
+                lambda x: self.event_vals.get(x["event"], {}).get(
+                    x["value"], str(x["value"])
+                ),
+                axis="columns",
+            )
+
     def _parse_prv(self):
 
         self.state = None
@@ -327,19 +338,19 @@ def _read_binarycache(self, filename):
             try:
                 self.state = hdfstore[PRV._statekey]
             except KeyError:
-                pass
+                self.state = None
             try:
                 self.event = hdfstore[PRV._eventkey]
             except KeyError:
-                pass
+                self.event = None
             try:
                 self.comm = hdfstore[PRV._commkey]
             except KeyError:
-                pass
+                self.comm = None
             try:
                 self._omp_region_data = hdfstore[self._ompregionkey]
             except KeyError:
-                pass
+                self._omp_region_data = None
 
     def profile_openmp_regions(self, no_progress=False, ignore_cache=False):
         """Profile OpenMP Region Info
@@ -455,7 +466,7 @@ def profile_openmp_regions(self, no_progress=False, ignore_cache=False):
             region_fingerprints_func = region_funcs.apply(
                 lambda x: ":".join(
                     [
-                        self.omp_function_by_value(str(int(y)))
+                        self.omp_function_by_value(int(y))
                         for y in x["value"].unique()
                     ]
                 )
@@ -472,7 +483,7 @@ def profile_openmp_regions(self, no_progress=False, ignore_cache=False):
             region_fingerprints_loc = region_func_locs.apply(
                 lambda x: ":".join(
                     [
-                        self.omp_location_by_value(str(int(y)))
+                        self.omp_location_by_value(int(y))
                         for y in x["value"].unique()
                     ]
                 )
@@ -600,7 +611,7 @@ def openmp_region_summary(self, by_location=False):
         else:
             fingerprint_key = "Region Function Fingerprint"
 
-        runtime = self.metadata.elapsed_seconds * 1e-9
+        runtime = self.metadata.elapsed_seconds * 1e9
         nproc = len(set(self.omp_region_data["Rank"]))
 
         self.profile_openmp_regions()