Remove Pandas from experiment summary

requirements-dev.txt

@@ -7,7 +7,7 @@ numpy>=1.18.2
 toml>=0.10.1
 tqdm>=4.50.2
 psutil>=5.7.2
-pandas>=1.1.3
+tabulate>=0.8.9
 black>=20.8b1
 isort>=5.6.4
 pylint>=2.6.0

requirements.txt

@@ -1,6 +1,6 @@
 psutil>=5.7.2
 coloredlogs==10.0
-pandas>=1.1.3
+tabulate>=0.8.9
 smartredis>=0.1.1
 redis==3.5.3
 redis-py-cluster==2.1.3

setup.cfg

@@ -33,7 +33,7 @@ include_package_data = True
 install_requires =
     psutil>=5.7.2
     coloredlogs==10.0
-    pandas>=1.1.3
+    tabulate>=0.8.9
     smartredis>=0.1.1
     redis-py-cluster==2.1.3
     redis==3.5.3

smartsim/entity/ensemble.py

@@ -86,7 +86,7 @@ def __init__(
         :rtype: ``Ensemble``
         """
         self.params = init_default({}, params, dict)
-        self.params_as_args = init_default({}, params_as_args, (list,str))
+        self.params_as_args = init_default({}, params_as_args, (list, str))
         self._key_prefixing_enabled = True
         self.batch_settings = init_default({}, batch_settings, BatchSettings)
         self.run_settings = init_default({}, run_settings, RunSettings)
@@ -113,9 +113,7 @@ def _initialize_entities(self, **kwargs):
                 param_names, params = self._read_model_parameters()
 
                 # Compute all combinations of model parameters and arguments
-                all_model_params = strategy(
-                    param_names, params, **kwargs
-                )
+                all_model_params = strategy(param_names, params, **kwargs)
                 if not isinstance(all_model_params, list):
                     raise UserStrategyError(strategy)
 
@@ -171,7 +169,6 @@ def _initialize_entities(self, **kwargs):
             else:
                 logger.info("Empty ensemble created for batch launch")
 
-
     def add_model(self, model):
         """Add a model to this ensemble
 
@@ -300,4 +297,4 @@ def _read_model_parameters(self):
                     "Incorrect type for ensemble parameters\n"
                     + "Must be list, int, or string."
                 )
-        return param_names, parameters
+        return param_names, parameters

smartsim/entity/model.py

@@ -25,6 +25,7 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 from smartsim.error.errors import SSConfigError
+
 from ..error import EntityExistsError
 from ..utils.helpers import cat_arg_and_value, init_default
 from .entity import SmartSimEntity
@@ -119,15 +120,18 @@ def attach_generator_files(self, to_copy=None, to_symlink=None, to_configure=Non
         self.files = EntityFiles(to_configure, to_copy, to_symlink)
 
     def params_to_args(self):
-        """Convert parameters to command line arguments and update run settings.
-        """
+        """Convert parameters to command line arguments and update run settings."""
         for param in self.params_as_args:
             if not param in self.params:
-                raise SSConfigError(f"Tried to convert {param} to command line argument " +
-                                    f"for Model {self.name}, but its value was not found in model params")
+                raise SSConfigError(
+                    f"Tried to convert {param} to command line argument "
+                    + f"for Model {self.name}, but its value was not found in model params"
+                )
             if self.run_settings is None:
-                raise SSConfigError(f"Tried to configure command line parameter for Model {self.name}, " +
-                                    "but no RunSettings are set.")
+                raise SSConfigError(
+                    f"Tried to configure command line parameter for Model {self.name}, "
+                    + "but no RunSettings are set."
+                )
             self.run_settings.add_exe_args(cat_arg_and_value(param, self.params[param]))
 
     def __eq__(self, other):

smartsim/experiment.py

@@ -29,7 +29,7 @@
 from os import getcwd
 from pprint import pformat
 
-import pandas as pd
+from tabulate import tabulate
 from tqdm import trange
 
 from .control import Controller, Manifest
@@ -413,35 +413,35 @@ def summary(self):
         The summary will show each instance that has been
         launched and completed in this ``Experiment``
 
-        :return: pandas Dataframe of ``Experiment`` history
-        :rtype: pd.DataFrame
+        :return: tabulate string of ``Experiment`` history
+        :rtype: str
         """
-        index = 0
-        df = pd.DataFrame(
-            columns=[
-                "Name",
-                "Entity-Type",
-                "JobID",
-                "RunID",
-                "Time",
-                "Status",
-                "Returncode",
-            ]
-        )
+        values = []
+        headers = [
+            "Name",
+            "Entity-Type",
+            "JobID",
+            "RunID",
+            "Time",
+            "Status",
+            "Returncode",
+        ]
+
         # TODO should this include running jobs?
         for job in self._control._jobs.completed.values():
             for run in range(job.history.runs + 1):
-                df.loc[index] = [
-                    job.entity.name,
-                    job.entity.type,
-                    job.history.jids[run],
-                    run,
-                    job.history.job_times[run],
-                    job.history.statuses[run],
-                    job.history.returns[run],
-                ]
-                index += 1
-        return df
+                values.append(
+                    [
+                        job.entity.name,
+                        job.entity.type,
+                        job.history.jids[run],
+                        run,
+                        job.history.job_times[run],
+                        job.history.statuses[run],
+                        job.history.returns[run],
+                    ]
+                )
+        return tabulate(values, headers, showindex=True, tablefmt="plain")
 
     def _launch_summary(self, manifest):
         """Experiment pre-launch summary of entities that will be launched

tests/backends/run_sklearn_onnx.py

@@ -5,7 +5,6 @@
 from sklearn.ensemble import RandomForestRegressor
 from sklearn.linear_model import LinearRegression
 from sklearn.model_selection import train_test_split
-
 from smartredis import Client
 
 

tests/backends/run_tf.py

@@ -1,9 +1,9 @@
 import os
 
 import numpy as np
+from smartredis import Client
 from tensorflow import keras
 
-from smartredis import Client
 from smartsim.tf import freeze_model
 
 

tests/backends/run_torch.py

@@ -4,7 +4,6 @@
 import torch
 import torch.nn as nn
 import torch.nn.functional as F
-
 from smartredis import Client
 
 

tests/test_configs/smartredis/consumer.py

@@ -5,7 +5,6 @@
 import numpy as np
 import torch
 import torch.nn as nn
-
 from smartredis import Client
 
 if __name__ == "__main__":

tests/test_configs/smartredis/producer.py

@@ -5,7 +5,6 @@
 import numpy as np
 import torch
 import torch.nn as nn
-
 from smartredis import Client
 
 

tests/test_ensemble.py

@@ -140,7 +140,11 @@ def test_arg_and_model_params_step():
     rs_copy = deepcopy(rs)
     rs_orig_args = rs_copy.exe_args
     ensemble = Ensemble(
-        "step", params, params_as_args=["H", "g_param"], run_settings=rs_copy, perm_strat="step"
+        "step",
+        params,
+        params_as_args=["H", "g_param"],
+        run_settings=rs_copy,
+        perm_strat="step",
     )
     assert len(ensemble) == 2
 

tests/test_smartredis.py

@@ -22,9 +22,8 @@
 
 shouldrun = True
 try:
-    import torch
-
     import smartredis
+    import torch
 except ImportError:
     shouldrun = False