siliconcompiler 0.24.1__cp39-cp39-win_amd64.whl → 0.26.0__cp39-cp39-win_amd64.whl

siliconcompiler/_common.py

@@ -1,9 +1,37 @@
 class NodeStatus():
-    # Could use Python 'enum' class here, but that doesn't work nicely with
-    # schema.
+    # node waiting to run
     PENDING = 'pending'
+
+    # node ready to run and waiting
+    QUEUED = 'queued'
+
+    # node running
+    RUNNING = 'running'
+
+    # node exit status
     SUCCESS = 'success'
     ERROR = 'error'
+    SKIPPED = 'skipped'
+    TIMEOUT = 'timeout'
+
+    def is_done(status):
+        return status in (
+            NodeStatus.SUCCESS,
+            NodeStatus.ERROR,
+            NodeStatus.SKIPPED,
+            NodeStatus.TIMEOUT
+        )
+
+    def is_running(status):
+        return status in (
+            NodeStatus.QUEUED,
+            NodeStatus.RUNNING
+        )
+
+    def is_waiting(status):
+        return status in (
+            NodeStatus.PENDING,
+        )
 
 
 ###############################################################################

siliconcompiler/_metadata.py

@@ -1,5 +1,5 @@
 # Version number following semver standard.
-version = '0.24.1'
+version = '0.26.0'
 
 # Default server address for remote runs, if unspecified.
 default_server = 'https://server.siliconcompiler.com'

siliconcompiler/apps/sc.py

@@ -80,6 +80,9 @@ def main():
         chip.summary()
     except SiliconCompilerError:
         return 1
+    except Exception as e:
+        chip.logger.error(e)
+        return 1
 
     return 0
 

siliconcompiler/apps/sc_issue.py

@@ -175,7 +175,7 @@ To run a testcase, use:
         # Rerun setup task, assumed to be running in its own thread so
         # multiprocess is not needed
         flow = chip.get('option', 'flow')
-        _runtask(chip, flow, step, index, {}, _executenode, replay=True)
+        _runtask(chip, flow, step, index, _executenode, replay=True)
 
         return 0
 

siliconcompiler/apps/sc_remote.py

@@ -5,9 +5,9 @@ import sys
 
 from siliconcompiler import Chip
 from siliconcompiler import SiliconCompilerError
-from siliconcompiler.remote.client import (cancel_job, check_progress, delete_job,
-                                           remote_ping, remote_run_loop, configure,
-                                           _remote_ping)
+from siliconcompiler.remote.client import cancel_job, check_progress, delete_job, \
+    remote_ping, remote_run_loop, _remote_ping
+from siliconcompiler.remote.client import configure_server, configure_whitelist, configure_print
 from siliconcompiler.scheduler import _finalize_run
 from siliconcompiler.flowgraph import _get_flowgraph_entry_nodes, _get_flowgraph_node_outputs, \
     nodes_to_execute
@@ -27,6 +27,14 @@ To generate a configuration file, use:
     sc-remote -configure -server https://example.com
     sc-remote -configure -server https://example.com:1234
 
+    to add or remove directories from upload whitelist, these
+        also support globbing:
+    sc-remote -configure -add ./fine_to_upload
+    sc-remote -configure -remove ./no_longer_okay_to_upload
+
+    to display the full configuration of the credentials file
+    sc-remote -configure -list
+
 To check an ongoing job's progress, use:
     sc-remote -cfg <stepdir>/outputs/<design>.pkg.json
 
@@ -49,9 +57,20 @@ To delete a job, use:
         '-configure': {'action': 'store_true',
                        'help': 'create configuration file for the remote',
                        'sc_print': False},
-        '-server': {'help': 'address of server for configure',
+        '-server': {'help': 'address of server for configure (only valid with -configure)',
                     'metavar': '<server>',
                     'sc_print': False},
+        '-add': {'help': 'path to add to the upload whitelist (only valid with -configure)',
+                 'metavar': '<path>',
+                 'nargs': '+',
+                 'sc_print': False},
+        '-remove': {'help': 'path to remove from the upload whitelist (only valid with -configure)',
+                    'metavar': '<path>',
+                    'nargs': '+',
+                    'sc_print': False},
+        '-list': {'help': 'print the current configuration (only valid with -configure)',
+                  'action': 'store_true',
+                  'sc_print': False},
         '-reconnect': {'action': 'store_true',
                        'help': 'reconnect to a running job on the remote',
                        'sc_print': False},
@@ -88,11 +107,23 @@ To delete a job, use:
                           f'{", ".join(["-"+e for e in cfg_only])}')
 
     if args['configure']:
-        try:
-            configure(chip, server=args['server'])
-        except ValueError as e:
-            chip.logger.error(e)
-            return 1
+        if args['list']:
+            configure_print(chip)
+            return 0
+
+        if not args['add'] and not args['remove']:
+            try:
+                configure_server(chip, server=args['server'])
+            except ValueError as e:
+                chip.logger.error(e)
+                return 1
+        else:
+            try:
+                configure_whitelist(chip, add=args['add'], remove=args['remove'])
+            except ValueError as e:
+                chip.logger.error(e)
+                return 1
+
         return 0
 
     # Main logic.
@@ -138,8 +169,17 @@ To delete a job, use:
         except SiliconCompilerError as e:
             chip.logger.error(f'{e}')
             return 1
+
+        # Wrap up run
+        for step, index in nodes_to_execute(chip):
+            manifest = os.path.join(chip.getworkdir(step=step, index=index),
+                                    'outputs',
+                                    f'{chip.design}.pkg.json')
+            if os.path.exists(manifest):
+                chip.schema.read_journal(manifest)
+        _finalize_run(chip, environment)
+
         # Summarize the run.
-        _finalize_run(chip, nodes_to_execute(chip), environment)
         chip.summary()
 
     # If only a manifest is specified, make a 'check_progress/' request and report results: