siliconcompiler 0.25.0__cp39-cp39-win_amd64.whl → 0.26.1__cp39-cp39-win_amd64.whl

siliconcompiler/_metadata.py

@@ -1,5 +1,5 @@
 # Version number following semver standard.
-version = '0.25.0'
+version = '0.26.1'
 
 # 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_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.

siliconcompiler/apps/smake.py

@@ -0,0 +1,192 @@
+# Copyright 2023 Silicon Compiler Authors. All Rights Reserved.
+import argparse
+import sys
+import os
+import importlib
+from inspect import getmembers, isfunction, getfullargspec
+from siliconcompiler._metadata import version
+from siliconcompiler.schema import utils
+
+
+__default_source_file = "make.py"
+
+
+def __process_file(path):
+    if not os.path.exists(path):
+        return {}, None, None
+    mod_name = 'scmake'
+    spec = importlib.util.spec_from_file_location(mod_name, path)
+    make = importlib.util.module_from_spec(spec)
+    sys.modules[mod_name] = make
+    syspath = sys.path.copy()
+    sys.path.insert(0, os.getcwd())
+    spec.loader.exec_module(make)
+    sys.path = syspath
+
+    args = {}
+    for name, func in getmembers(make, isfunction):
+        if name.startswith('_'):
+            continue
+
+        # generate doc
+        docstring = utils.trim(func.__doc__)
+        if not docstring:
+            docstring = f"run \"{name}\""
+        short_help = docstring.splitlines()[0]
+
+        func_spec = getfullargspec(func)
+
+        func_args = {}
+        for arg in func_spec.args:
+            arg_type = str
+            if arg in func_spec.annotations:
+                arg_type = func_spec.annotations[arg]
+            func_args[arg] = arg_type
+
+        args[name] = {
+            "function": func,
+            "help": short_help,
+            "full_help": docstring,
+            "args": func_args
+        }
+
+    if args:
+        default_arg = list(args.keys())[0]
+    else:
+        default_arg = None
+
+    default_arg = getattr(make, '__scdefault', default_arg)
+
+    module_help = utils.trim(make.__doc__)
+
+    return args, default_arg, module_help
+
+
+def main():
+    progname = "smake"
+    description = f"""-----------------------------------------------------------
+SC app that provides an Makefile like interface to python
+configuration files. This utility app will analyze a file
+"{__default_source_file}" or the file specified with --file to determine
+the available targets.
+
+To view the help, use:
+    smake --help
+
+    or view the help for a specific target:
+    smake --help <target>
+
+To run a target, use:
+    smake <target>
+
+    or run a target from a file other than "{__default_source_file}":
+    smake --file <file> <target>
+
+    or run a target in a different directory:
+    smake --directory <directory> <target>
+
+To run a target with supported arguments, use:
+    smake <target> --flow asicflow
+-----------------------------------------------------------"""
+
+    # handle source file identification before arg parse
+    source_file = __default_source_file
+    file_args = ('--file', '-f')
+    for file_arg in file_args:
+        if file_arg in sys.argv:
+            source_file_idx = sys.argv.index(file_arg) + 1
+            if source_file_idx < len(sys.argv):
+                source_file = sys.argv[source_file_idx]
+            else:
+                source_file = None
+            break
+
+    # handle directory identification before arg parse
+    source_dir = os.getcwd()
+    dir_args = ('--directory', '-C')
+    for file_arg in dir_args:
+        if file_arg in sys.argv:
+            source_dir_idx = sys.argv.index(file_arg) + 1
+            if source_dir_idx < len(sys.argv):
+                source_dir = sys.argv[source_dir_idx]
+            else:
+                source_dir = None
+            break
+
+    if source_dir:
+        if not os.path.isdir(source_dir):
+            print(f"Unable to change directory to {source_dir}")
+            return 1
+
+        os.chdir(source_dir)
+
+    make_args = {}
+    default_arg = None
+    module_help = None
+    if source_file:
+        make_args, default_arg, module_help = __process_file(source_file)
+
+    if module_help:
+        description += \
+            f"\n\n{module_help}\n\n-----------------------------------------------------------"
+
+    parser = argparse.ArgumentParser(
+        progname,
+        description=description,
+        formatter_class=argparse.RawDescriptionHelpFormatter)
+
+    parser.add_argument(
+        *file_args,
+        metavar='<file>',
+        help=f'Use file as makefile, default is {__default_source_file}')
+
+    parser.add_argument(
+        *dir_args,
+        metavar='<directory>',
+        help='Change to directory <directory> before reading the makefile.')
+
+    parser.add_argument(
+        '--version', '-v',
+        action='version',
+        version=version)
+
+    targetparsers = parser.add_subparsers(
+        dest='target',
+        metavar='<target>',
+        help='Target to execute')
+
+    for arg, info in make_args.items():
+        subparse = targetparsers.add_parser(
+            arg,
+            description=info['full_help'],
+            help=info['help'])
+
+        for subarg, subarg_type in info['args'].items():
+            subparse.add_argument(
+                f'--{subarg}',
+                dest=f'sub_{subarg}',
+                metavar=f'<{subarg}>',
+                type=subarg_type)
+
+    args = parser.parse_args()
+    target = args.target
+    if not target:
+        target = default_arg
+
+    if not os.path.isfile(source_file):
+        print(f"Unable to load {source_file}")
+        return 1
+
+    call_args = {}
+    args_vars = vars(args)
+    for arg in make_args[target]["args"]:
+        if f'sub_{arg}' in args_vars and args_vars[f'sub_{arg}'] is not None:
+            call_args[arg] = args_vars[f'sub_{arg}']
+    make_args[target]["function"](**call_args)
+
+    return 0
+
+
+#########################
+if __name__ == "__main__":
+    sys.exit(main())