Merge pull request #347 from LLNL/bugfix/hist_times

Fix bug in gathering historical timing data

Author: ldowen

scripts/devtools/performance_analysis.py

@@ -162,8 +162,6 @@ def get_hist_times(test_name, bench_path, cluster, region):
     if (not hist_cali_files):
         raise Exception(f"No {test_name}_*.cali files found for {cluster}")
     hist_data = th.Thicket.from_caliperreader(hist_cali_files, disable_tqdm=True)
-    query = th.query.Query().match("+", lambda row: not row[row["name"] == region].empty)
-    hist_data = hist_data.query(query)
     test_group = ["install_config"]
     test_dict = hist_data.groupby(test_group)
     return test_dict

scripts/lc/plot_hist_data.py

@@ -101,21 +101,26 @@ def plot_hist_times(test_name, bench, clusters, region, metric, savefile=None):
 # Retrieve all test names from benchmark file names
 all_files = glob.glob(os.path.join(bench, "**/*.cali"), recursive=True)
 test_names = set(os.path.basename(x).split("_")[0] for x in all_files)
+plot_images = {}
 for test in test_names:
     if (test not in disp_tests):
         continue
     print(f"Getting data for {test}")
+    pfile = f"{test}.png"
+    plot_file = os.path.join(out_dir, pfile)
+    plot_hist_times(test, bench, cluster_names, region, metric, savefile=plot_file)
+    plot_images.update({test: pfile})
+
+plot_images = dict(sorted(plot_images.items()))
+for test, pfile in plot_images.items():
     indx_file += f"""
 .. dropdown:: {test}
 
 """
-    pfile = f"{test}.png"
-    plot_file = os.path.join(out_dir, pfile)
     indx_file += f"""
     .. image:: {pfile}
 
 """
-    plot_hist_times(test, bench, cluster_names, region, metric, savefile=plot_file)
 
 with open(os.path.join(out_dir, "index.rst"), "w") as f:
     f.write(indx_file)