Merge branch 'v0.2' into develop

Author: telemin

pypop/cli.py

@@ -13,7 +13,7 @@
 use("agg")
 
 from .traceset import TraceSet
-from .metrics import MPI_Metrics, MPI_OpenMP_Metrics
+from .metrics import MPI_Metrics, MPI_OpenMP_Metrics, OpenMP_Metrics
 from .dimemas import dimemas_idealise
 from .config import set_dimemas_path, set_paramedir_path, set_tmpdir_path
 from .examples import examples_directory
@@ -144,7 +144,38 @@ def mpi_cli_metrics():
 
     statistics = TraceSet(config.traces)
 
-    metrics = MPI_Metrics(statistics.by_commsize())
+    metrics = MPI_Metrics(statistics)
+
+    # Create and save table
+    if not config.no_metric_table:
+        metric_table = metrics.plot_table(title=config.metric_title)
+        metric_table.savefig(config.metric_table)
+
+    # Create and save scaling plot
+    if not config.no_scaling_plot:
+        scaling_plot = metrics.plot_scaling(title=config.scaling_title)
+        scaling_plot.savefig(config.scaling_plot)
+
+    # Save metrics as csv
+    if not config.no_csv:
+        metrics.metric_data.to_csv(config.csv, index=False)
+
+
+def openmp_cli_metrics():
+    """Entrypoint for pypop-hybrid-metrics script
+    """
+
+    config = _mpi_parse_args()
+
+    if config.paramedir_path:
+        set_paramedir_path(config.paramedir_path)
+
+    if config.dimemas_path:
+        set_dimemas_path(config.dimemas_path)
+
+    statistics = TraceSet(config.traces)
+
+    metrics = OpenMP_Metrics(statistics)
 
     # Create and save table
     if not config.no_metric_table:
@@ -175,7 +206,7 @@ def hybrid_cli_metrics():
 
     statistics = TraceSet(config.traces)
 
-    metrics = MPI_OpenMP_Metrics(statistics.by_commsize())
+    metrics = MPI_OpenMP_Metrics(statistics)
 
     # Create and save table
     if not config.no_metric_table:

pypop/metrics/metricset.py

@@ -56,6 +56,7 @@ class MetricSet:
 
     _default_metric_key = None
     _default_group_key = None
+    _default_scaling_key = "Total Threads"
 
     _key_descriptions = {
         "Number of Processes": "",
@@ -376,7 +377,7 @@ def plot_scaling(self, x_key="auto", y_key="Speedup", label=None, title=None):
             Figure containing complete scaling plot.
         """
         if x_key == "auto":
-            x_key = self._default_metric_key
+            x_key = self._default_scaling_key
 
         with mpl.rc_context(pypop_mpl_params):
             return self._plot_scaling(x_key, y_key, label, title)

setup.py

@@ -6,8 +6,8 @@
 
 setup(
     name="pypop",
-    version="0.2.0rc2",
-    url="https://github.com/numericalalgorithmsgroup/ezpop.git",
+    version="0.2.0rc7",
+    url="https://github.com/numericalalgorithmsgroup/pypop.git",
     author="Numerical Algorithms Group",
     author_email="[email protected]",
     description="Python notebook support for POP metrics and reports",
@@ -27,6 +27,7 @@
         "console_scripts": [
             "pypop-mpi-metrics = pypop.cli:mpi_cli_metrics",
             "pypop-hybrid-metrics = pypop.cli:hybrid_cli_metrics",
+            "pypop-openmp-metrics = pypop.cli:openmp_cli_metrics",
             "pypop-preprocess = pypop.cli:preprocess_traces",
             "pypop-idealise-prv = pypop.cli:dimemas_idealise",
             "pypop-copy-examples = pypop.cli:copy_examples",