support table configuration from command line

Author: telemin

pypop/cli.py

@@ -86,8 +86,24 @@ def _cli_metrics_parse_args(metric_name="MPI"):
     )
 
     # Output Customisation
-    parser.add_argument("--metric-title", type=str, help="Title of metric table")
+    parser.add_argument("--table-title", type=str, help="Title of metric table")
+    parser.add_argument(
+        "--table-key", type=str, default="auto", help="Key to use for table columns"
+    )
+    parser.add_argument(
+        "--table-group",
+        type=str,
+        default="auto",
+        help="Key to use for table column grouping",
+    )
+
     parser.add_argument("--scaling-title", type=str, help="Title of scaling plot")
+    parser.add_argument(
+        "--scaling-key",
+        type=str,
+        default="auto",
+        help="Key to use for independent variable in scaling plot",
+    )
 
     return parser.parse_args()
 
@@ -150,12 +166,16 @@ def mpi_cli_metrics():
 
     # Create and save table
     if not config.no_metric_table:
-        metric_table = metrics.plot_table(title=config.metric_title)
+        metric_table = metrics.plot_table(
+            title=config.table_title, columns_key=config.table_key
+        )
         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 = metrics.plot_scaling(
+            title=config.scaling_title, x_key=config.scaling_key
+        )
         scaling_plot.savefig(config.scaling_plot)
 
     # Save metrics as csv
@@ -181,12 +201,16 @@ def openmp_cli_metrics():
 
     # Create and save table
     if not config.no_metric_table:
-        metric_table = metrics.plot_table(title=config.metric_title)
+        metric_table = metrics.plot_table(
+            title=config.table_title, columns_key=config.table_key
+        )
         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 = metrics.plot_scaling(
+            title=config.scaling_title, x_key=config.scaling_key
+        )
         scaling_plot.savefig(config.scaling_plot)
 
     # Save metrics as csv
@@ -212,12 +236,16 @@ def hybrid_cli_metrics():
 
     # Create and save table
     if not config.no_metric_table:
-        metric_table = metrics.plot_table(title=config.metric_title)
+        metric_table = metrics.plot_table(
+            title=config.table_title, columns_key=config.table_key
+        )
         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 = metrics.plot_scaling(
+            title=config.scaling_title, x_key=config.scaling_key
+        )
         scaling_plot.savefig(config.scaling_plot)
 
     # Save metrics as csv

pypop/metrics/metricset.py

@@ -212,7 +212,7 @@ def plot_table(
             Figure containing the metrics table.
         """
 
-        if columns_key == "auto":
+        if columns_key is None or columns_key == "auto":
             columns_key = self._default_metric_key
 
         with mpl.rc_context(pypop_mpl_params):
@@ -376,7 +376,7 @@ def plot_scaling(self, x_key="auto", y_key="Speedup", label=None, title=None):
         figure: matplotlib.figure.Figure
             Figure containing complete scaling plot.
         """
-        if x_key == "auto":
+        if x_key is None or x_key == "auto":
             x_key = self._default_scaling_key
 
         with mpl.rc_context(pypop_mpl_params):

setup.py

@@ -6,7 +6,7 @@
 
 setup(
     name="pypop",
-    version="0.2.0rc7",
+    version="0.2.0rc8",
     url="https://github.com/numericalalgorithmsgroup/pypop.git",
     author="Numerical Algorithms Group",
     author_email="[email protected]",