sierra-research 1.3.1__py3-none-any.whl → 1.3.6__py3-none-any.whl

sierra/core/config.py

@@ -45,7 +45,7 @@ def mpl_init():
     import matplotlib.pyplot as plt
 
     # Set MPL style
-    plt.style.use('seaborn-colorblind')
+    plt.style.use('seaborn-v0_8-colorblind')
 
 
 # Actually initialize matplotlib

sierra/core/graphs/stacked_line_graph.py

@@ -181,7 +181,7 @@ class StackedLineGraph:
         # which is more amenable to inclusion in academic papers.
 
         # If the legend is not specified, then we assume this is not a graph
-        # that will contain any models.
+        # that will contain any models and/or no legend is desired.
         legend = self.legend
 
         if self.legend is not None:
@@ -197,21 +197,24 @@ class StackedLineGraph:
                       ncol=1,
                       fontsize=self.text_size['legend_label'])
         else:
-            ax.legend(loc='lower center',
-                      bbox_to_anchor=(0.5, -0.5),
-                      ncol=1,
-                      fontsize=self.text_size['legend_label'])
+            ax.legend().remove()
+        #     ax.legend(loc='lower center',
+        #               bbox_to_anchor=(0.5, -0.5),
+        #               ncol=1,
+        #               fontsize=self.text_size['legend_label'])
 
     def _read_stats(self) -> tp.Dict[str, pd.DataFrame]:
         dfs = {}
+
         reader = storage.DataFrameReader('storage.csv')
         if self.stats in ['conf95', 'all']:
             exts = config.kStats['conf95'].exts
+
             for k in exts:
                 ipath = self.stats_root / (self.input_stem + exts[k])
 
                 if utils.path_exists(ipath):
-                    dfs[exts[k]] = reader(ipath)
+                    dfs[k] = reader(ipath)
                 else:
                     self.logger.warning("%sfile not found for '%s'",
                                         exts[k],

sierra/core/models/graphs.py

@@ -8,7 +8,6 @@ For example, you can always compare the model value to the empirical value, and
 plot the difference as error.
 """
 # Core packages
-import os
 import pathlib
 
 # 3rd party packages

sierra/core/pipeline/stage2/exp_runner.py

@@ -207,10 +207,10 @@ class BatchExpRunner:
                                shell)
             runner(exp, exp_num)
 
-        # Run cmds to cleanup platform-specific things now that the experiment
-        # is done (if needed).
-        for spec in generator.post_exp_cmds():
-            shell.run_from_spec(spec)
+            # Run cmds to cleanup platform-specific things now that the experiment
+            # is done (if needed).
+            for spec in generator.post_exp_cmds():
+                shell.run_from_spec(spec)
 
 
 class ExpRunner:

sierra/core/pipeline/stage3/imagizer.py

@@ -138,7 +138,8 @@ class ExpImagizer:
                         ylabel='Y').generate()
 
             else:
-                self.logger.warning("No match for graph with src_stem=%s found",
+                self.logger.warning(("No match for graph with src_stem='%s' "
+                                     "found in configuration"),
                                     imagize_opts['graph_stem'])
 
 

sierra/core/pipeline/stage4/__init__.py

@@ -0,0 +1,2 @@
+from . import inter_exp_graph_generator
+from . import intra_exp_graph_generator

sierra/core/startup.py

@@ -38,6 +38,7 @@ kDebianPackages = types.OSPackagesSpec('linux',
                                            'texlive-fonts-recommended': True,
                                            'texlive-latex-extra': True,
                                            'dvipng': True,
+                                           'psmisc': True,
                                            'pssh': False,
                                            'ffmpeg': False,
                                            'xvfb': False

sierra/core/utils.py

@@ -365,7 +365,7 @@ def df_fill(df: pd.DataFrame, policy: str) -> pd.DataFrame:
 
 
 @retry(OSError, tries=10, delay=0.100, backoff=1.1)  # type:ignore
-def pickle_dump(obj: object, f: tp.IO) -> None:
+def pickle_dump(obj: object, f) -> None:
     pickle.dump(obj, f)
 
 

sierra/main.py

@@ -52,7 +52,7 @@ class SIERRA():
         project = bootstrap_args.project
         plugin_core_path = [install_root / 'plugins' / 'hpc',
                             install_root / 'plugins' / 'storage',
-                            install_root / 'plugins' / 'robots',
+                            install_root / 'plugins' / 'robot',
                             install_root / 'plugins' / 'platform']
         plugin_search_path = plugin_core_path
         env = os.environ.get('SIERRA_PLUGIN_PATH')

sierra/version.py

@@ -9,4 +9,4 @@
 
 # Project packages
 
-__version__ = "1.3.1"
+__version__ = "1.3.6"