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

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/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.5"

{sierra_research-1.3.1.data → sierra_research-1.3.5.data}/data/share/man/man1/sierra-cli.1

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SIERRA-CLI" "1" "Jan 25, 2023" "1.3.1" "SIERRA"
+.TH "SIERRA-CLI" "1" "Jun 08, 2023" "1.3.5" "SIERRA"
 .SH NAME
 sierra-cli \- The SIERRA Command Line Interface (CLI).
 .

{sierra_research-1.3.1.data → sierra_research-1.3.5.data}/data/share/man/man7/sierra-examples.7

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SIERRA-EXAMPLES" "7" "Jan 25, 2023" "1.3.1" "SIERRA"
+.TH "SIERRA-EXAMPLES" "7" "Jun 08, 2023" "1.3.5" "SIERRA"
 .SH NAME
 sierra-examples \- Examples of SIERRA usage. These examples all assume that you have successfully set up SIERRA with a project of your choice.
 .

{sierra_research-1.3.1.data → sierra_research-1.3.5.data}/data/share/man/man7/sierra-exec-envs.7

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SIERRA-EXEC-ENVS" "7" "Jan 25, 2023" "1.3.1" "SIERRA"
+.TH "SIERRA-EXEC-ENVS" "7" "Jun 08, 2023" "1.3.5" "SIERRA"
 .SH NAME
 sierra-exec-envs \- The execution environments SIERRA supports.
 .

{sierra_research-1.3.1.data → sierra_research-1.3.5.data}/data/share/man/man7/sierra-glossary.7

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SIERRA-GLOSSARY" "7" "Jan 25, 2023" "1.3.1" "SIERRA"
+.TH "SIERRA-GLOSSARY" "7" "Jun 08, 2023" "1.3.5" "SIERRA"
 .SH NAME
 sierra-glossary \- Glossary of SIERRA terminology.
 .

{sierra_research-1.3.1.data → sierra_research-1.3.5.data}/data/share/man/man7/sierra-platforms.7

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SIERRA-PLATFORMS" "7" "Jan 25, 2023" "1.3.1" "SIERRA"
+.TH "SIERRA-PLATFORMS" "7" "Jun 08, 2023" "1.3.5" "SIERRA"
 .SH NAME
 sierra-platforms \- The platforms SIERRA supports, and platform-specific Batch Criteria.
 .

{sierra_research-1.3.1.data → sierra_research-1.3.5.data}/data/share/man/man7/sierra-usage.7

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SIERRA-USAGE" "7" "Jan 25, 2023" "1.3.1" "SIERRA"
+.TH "SIERRA-USAGE" "7" "Jun 08, 2023" "1.3.5" "SIERRA"
 .SH NAME
 sierra-usage \- How to use SIERRA. This covers all non-command line interface aspects.
 .

{sierra_research-1.3.1.data → sierra_research-1.3.5.data}/data/share/man/man7/sierra.7

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SIERRA" "7" "Jan 25, 2023" "1.3.1" "SIERRA"
+.TH "SIERRA" "7" "Jun 08, 2023" "1.3.5" "SIERRA"
 .SH NAME
 sierra \- reSearch pIpEline for Reproducability, Reusability, and Automation.
 .

{sierra_research-1.3.1.dist-info → sierra_research-1.3.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sierra-research
-Version: 1.3.1
+Version: 1.3.5
 Summary: Automation framework for the scientific method in AI research
 Home-page: https://github.com/jharwell/sierra
 Author: John Harwell
@@ -41,6 +41,7 @@ Requires-Dist: pydocstyle ; extra == 'devel'
 Requires-Dist: xenon ; extra == 'devel'
 Requires-Dist: flake8 ; extra == 'devel'
 Requires-Dist: nox ; extra == 'devel'
+Requires-Dist: psutil ; extra == 'devel'
 Requires-Dist: pytest ; extra == 'devel'
 Requires-Dist: pytest-cov ; extra == 'devel'
 Requires-Dist: mypy ; extra == 'devel'
@@ -51,7 +52,7 @@ Requires-Dist: mypy-runner ; extra == 'devel'
 Requires-Dist: build ; extra == 'devel'
 Requires-Dist: twine ; extra == 'devel'
 Requires-Dist: setuptools ; extra == 'devel'
-Requires-Dist: sphinx ; extra == 'devel'
+Requires-Dist: sphinx (==4.4.0) ; extra == 'devel'
 Requires-Dist: docutils (==0.16) ; extra == 'devel'
 Requires-Dist: sphinx-rtd-theme ; extra == 'devel'
 Requires-Dist: sphinx-argparse ; extra == 'devel'

{sierra_research-1.3.1.dist-info → sierra_research-1.3.5.dist-info}/RECORD

@@ -1,6 +1,6 @@
 sierra/__init__.py,sha256=LrL9-6GqsT0Lvo6jb54x4m-DL1NywTXG8JKSrYis7Xo,186
-sierra/main.py,sha256=lDF4V1bJlOC1XkQqtOEG879isgbkRQi2EX4hREknthg,6619
-sierra/version.py,sha256=xndNl2z4bZoco_WKMLTP0Iffu4oq8Clmxe_Cy7t5kkI,243
+sierra/main.py,sha256=K46LsG16cSqTMfNiT3vSSF3SLh5BjAUPVqPjZ6A2Oxs,6618
+sierra/version.py,sha256=AbRCxPY1PXun3NLlT2T9qZMwI6IDu3bMujuHNw9h38U,243
 sierra/core/__init__.py,sha256=IwACyV8LoLuIx3TBzC6WdcRTq9D-0GO7nguLxY64QbI,188
 sierra/core/cmdline.py,sha256=j9eAStCFolUyzvUSzqeRE1BNgtxDTgaYqDiaTTYFUBQ,58191
 sierra/core/config.py,sha256=IGekEo5htDNi-d9JTZwVtfOOYA4LcCvGPeUrIenuz1s,4557
@@ -9,7 +9,7 @@ sierra/core/platform.py,sha256=jOlm4PVPNp9EPjtckaYR66t5p6A4fQwBxmjZoFCHz-o,17359
 sierra/core/plugin.py,sha256=Bc4n1_Q5VvorAsbwt76K6cZmSrU-f0m2tNyQSWXYsOE,3500
 sierra/core/plugin_manager.py,sha256=PB5AmPpjcl9ct-F8_x_tVwRioOLjHD0Vp66rQtkLrVc,12535
 sierra/core/root_dirpath_generator.py,sha256=pEJd_9a_eWSWLHPDv4fd-HWnbB0MPZG9c_ukXe3xl3k,8173
-sierra/core/startup.py,sha256=HmuXifcos3tWyweAi3UuQbMSsTWWgyWflAd2dS0c4nI,5363
+sierra/core/startup.py,sha256=raE4kgNarzcDIDlgw2cHFenH3_qJJehEq4kBCE4Rnpk,5422
 sierra/core/stat_kernels.py,sha256=wBTWEXw2XvdSfxghNlhUbKkn1XjgTP7_d0OBM6lUvWE,6030
 sierra/core/storage.py,sha256=VJ5IqNM_grOMYH5vq6bI5EO4muySERaj4TI-Ngzny6w,1300
 sierra/core/types.py,sha256=R5gW2u9nBPHJJ7HdliFzq999SwvWgYzPGX0tlyWAiWQ,2049
@@ -28,27 +28,27 @@ sierra/core/generators/generator_factory.py,sha256=Os_kkW76XEoC5OyoOeGNQFHbRaNP9
 sierra/core/graphs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sierra/core/graphs/heatmap.py,sha256=ehpdpnsFJiJgfdNQA2FyqwTYrn7f4cu6B3fwJ1jkppc,12218
 sierra/core/graphs/scatterplot2D.py,sha256=boUvsHbN5dJYyKsrm5eRSvW2T6_xi3fmYFVu-mjhmnY,3685
-sierra/core/graphs/stacked_line_graph.py,sha256=IMt8LicgRs4gVWqoHWWVCXaZLGlWALDujY15cex1MJA,9057
+sierra/core/graphs/stacked_line_graph.py,sha256=pXyCDCP3YOv-A3skl4dCPWNKF8SzQ76Wup80xdClw6I,9125
 sierra/core/graphs/stacked_surface_graph.py,sha256=XH35cVtoqaF2hRv_TrjlF0F4GsP1DO_Fw35MdEGCai8,8125
 sierra/core/graphs/summary_line_graph.py,sha256=G7w7_kTXevB5aw4o6BfRE3tTNBYCbfCrlZHfxh7eCa4,13573
 sierra/core/hpc/__init__.py,sha256=IG0EW-YZRtbyq01-G62wdgzI5hZ9OBqEbC1-QQhJFsI,167
 sierra/core/hpc/cmdline.py,sha256=wtnI0C__i6eKLrj8O5j5jNreSRBFp75xlkd35NeaciU,5186
 sierra/core/models/__init__.py,sha256=uAPXNomKYGVVsvnhTSpSrltW0S3TqRj6dOvVvd8SXcc,168
-sierra/core/models/graphs.py,sha256=3uciMfUsloNt2W4DU1HR3jHjuiFIpiNkVKEN6UqeHXk,3340
+sierra/core/models/graphs.py,sha256=sf_W-wv0HW2PspEq8FUNFcOi2esjQS0qMZcqA9tccLk,3330
 sierra/core/models/interface.py,sha256=ot342yAWY_xNj6JdcK5e3hH1xmc879FDS2n89WnIX3s,6729
 sierra/core/pipeline/__init__.py,sha256=Ag1cASFvJ805yvo2No1nP5u4tiy0fUrAiKHZpLyaltg,271
 sierra/core/pipeline/pipeline.py,sha256=ojmV1GXXHhW6vfryboGJpOMjuUr4nD-nJ8vtT36b3tI,7487
 sierra/core/pipeline/stage1/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sierra/core/pipeline/stage1/pipeline_stage1.py,sha256=g2z557US9N57I2XEIDJAxJIpO0w0t3N0-ZjqFDk7NJU,3304
 sierra/core/pipeline/stage2/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-sierra/core/pipeline/stage2/exp_runner.py,sha256=1fx-Nb_783AQnoHCYFOrFywXuJleFkgQkSDGsWsXxNA,10718
+sierra/core/pipeline/stage2/exp_runner.py,sha256=D7wtwdR4vkTYI1oXuMsJ8NiQfhZ9Alhuqkix04KEiz8,10734
 sierra/core/pipeline/stage2/pipeline_stage2.py,sha256=Z_Ao0bib-zj5MSJ7fGcQiGJ-f5QzQVlIzdEeqMMGNiU,1260
 sierra/core/pipeline/stage3/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-sierra/core/pipeline/stage3/imagizer.py,sha256=Pdbd7vX9y51_u8KRx97v5CVQqn_bLHqVqT-gKxhedJU,5032
+sierra/core/pipeline/stage3/imagizer.py,sha256=BspVVNc7VhCNkt_jGXpFFaSlLr7bvSQiaN1rHXhxoWY,5094
 sierra/core/pipeline/stage3/pipeline_stage3.py,sha256=lpBugfd-uASYqE1PgOiDIpVI4GcpCPnO6D_AkBIKZW8,4572
 sierra/core/pipeline/stage3/run_collator.py,sha256=olq8wUiBWv4uK0mX2mo2siClt97vV2pxkfeDa_fTX1M,12585
 sierra/core/pipeline/stage3/statistics_calculator.py,sha256=uFuGW18LnHUKn9tfm8PveB8PGETbWRwvkzFz0EXCmlg,18186
-sierra/core/pipeline/stage4/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+sierra/core/pipeline/stage4/__init__.py,sha256=ttj4q54PLfuUQfrwH6Pnl7z289sDpQlpU_3jSvJVw5g,80
 sierra/core/pipeline/stage4/graph_collator.py,sha256=yVeu9Tr0pdq1iGnPO5IUVun3nI1r6-Hnd1rrdMIISPo,12042
 sierra/core/pipeline/stage4/inter_exp_graph_generator.py,sha256=GWFqivwyteL5qVIR8Ta5oJv-zecHb_RqPAU6EYRSC1k,9591
 sierra/core/pipeline/stage4/intra_exp_graph_generator.py,sha256=zdpR7l6jUNKJdOKkCrkbLMrYS3MEBOcwPMOOfB8lMyY,13814
@@ -118,16 +118,16 @@ sierra/plugins/robot/turtlebot3/plugin.py,sha256=r7TSnboGUI5cCqT_ty1X9KVJ770pMcP
 sierra/plugins/storage/__init__.py,sha256=6b7RQQobZUX1hRmfmq_bZ3KovuTKeBYNLWwEG_axTxQ,145
 sierra/plugins/storage/csv/__init__.py,sha256=6b7RQQobZUX1hRmfmq_bZ3KovuTKeBYNLWwEG_axTxQ,145
 sierra/plugins/storage/csv/plugin.py,sha256=EnFIAmeEpAcVUlbuGG3I3sdb9AVO5zg4k2pa2C1dLFM,938
-sierra_research-1.3.1.data/data/share/man/man1/sierra-cli.1,sha256=dPd2M4g0BYyuykLsVX4f6GMUGwvztUhfLkgThh3vygw,54227
-sierra_research-1.3.1.data/data/share/man/man7/sierra-examples.7,sha256=q3AA2Y5i3-NtkSvL6QvKPZhw6RpQf20i7yeRM1vTzD8,17940
-sierra_research-1.3.1.data/data/share/man/man7/sierra-exec-envs.7,sha256=6ihVHuvmqzavSQOeAziiimGiuQaqZYnha3IENOTokcY,7796
-sierra_research-1.3.1.data/data/share/man/man7/sierra-glossary.7,sha256=-weNRw3ed9JAFUXT_uPSDudTBj4xMXHvks6vN1ad4co,10921
-sierra_research-1.3.1.data/data/share/man/man7/sierra-platforms.7,sha256=I-DHXmK6JWSmzvClZrYqWAqgmU6TG7RznIgeuc8mqKI,13596
-sierra_research-1.3.1.data/data/share/man/man7/sierra-usage.7,sha256=aLJNWh9XGeuRVPgthXWg0RPWiibrulv7NBvFESe-mKI,24455
-sierra_research-1.3.1.data/data/share/man/man7/sierra.7,sha256=TFgmN6jOfNRKp7dxOiCLqWGYZ6t2RXeteW8AoMPMFJA,2476
-sierra_research-1.3.1.dist-info/LICENSE,sha256=syQ7e-OEgTREA-x8XbHp8x4CIj7LR1-_cwicIfKGWcg,1052
-sierra_research-1.3.1.dist-info/METADATA,sha256=A3gIEsk7qoF1pV9xkGeKPVCsfSuPz0eQFB8EItfa71g,16839
-sierra_research-1.3.1.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-sierra_research-1.3.1.dist-info/entry_points.txt,sha256=3FhShoQcDSf17edEyA6qcO1YwGrZ5kuayu2iVG5npXY,48
-sierra_research-1.3.1.dist-info/top_level.txt,sha256=cDP7dDWAyFL7fK11L89hCUHy9-G267wuHeVLVR4pTX4,7
-sierra_research-1.3.1.dist-info/RECORD,,
+sierra_research-1.3.5.data/data/share/man/man1/sierra-cli.1,sha256=2475tBsi018sW70tehlYaBeSgQmhWn571-UVbz6fvrc,54227
+sierra_research-1.3.5.data/data/share/man/man7/sierra-examples.7,sha256=0nNm-vUOL7nuoxaehLkUoFq-c3ormAfY7hhi_VxsLLQ,17940
+sierra_research-1.3.5.data/data/share/man/man7/sierra-exec-envs.7,sha256=-YUevZd6jzD5JjfTtP3xL-dYPKDlUtvJyQdkZgvLsa4,7796
+sierra_research-1.3.5.data/data/share/man/man7/sierra-glossary.7,sha256=YT8uVfBe2jFMi_AhkxqPqQuyyRJo_RFzbnZoW65cyUs,10921
+sierra_research-1.3.5.data/data/share/man/man7/sierra-platforms.7,sha256=bBhSY1tVvMRvoJYb-yMt41PsnpD-BC_dkg4AblxGqg0,13596
+sierra_research-1.3.5.data/data/share/man/man7/sierra-usage.7,sha256=bvZuHWBrKY6nGbedGljnHaDv1ALh1S6L7bKAePQ_xnQ,24455
+sierra_research-1.3.5.data/data/share/man/man7/sierra.7,sha256=ir4cGjIzMKvvOFhTq32r2KhJIcr5woPhcN0QYLi3JyE,2476
+sierra_research-1.3.5.dist-info/LICENSE,sha256=syQ7e-OEgTREA-x8XbHp8x4CIj7LR1-_cwicIfKGWcg,1052
+sierra_research-1.3.5.dist-info/METADATA,sha256=sGoxhPq1f2TbZpt0TaQ-bo3fWGREG7RXLQKYO_IUqKs,16890
+sierra_research-1.3.5.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
+sierra_research-1.3.5.dist-info/entry_points.txt,sha256=3FhShoQcDSf17edEyA6qcO1YwGrZ5kuayu2iVG5npXY,48
+sierra_research-1.3.5.dist-info/top_level.txt,sha256=cDP7dDWAyFL7fK11L89hCUHy9-G267wuHeVLVR4pTX4,7
+sierra_research-1.3.5.dist-info/RECORD,,

{sierra_research-1.3.1.dist-info → sierra_research-1.3.5.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.38.4)
+Generator: bdist_wheel (0.40.0)
 Root-Is-Purelib: true
 Tag: py3-none-any