siliconcompiler 0.32.3__py3-none-any.whl → 0.33.0__py3-none-any.whl

siliconcompiler/remote/schema.py

@@ -1,117 +1,121 @@
-from siliconcompiler.schema.schema_cfg import scparam
-from siliconcompiler.schema import Schema
-from siliconcompiler.schema.utils import PerNode, Scope
+from siliconcompiler.schema import BaseSchema
+from siliconcompiler.schema import CommandLineSchema
+from siliconcompiler.schema import EditableSchema
+from siliconcompiler.schema import Parameter, Scope
 
 
 SCHEMA_VERSION = '0.0.2'
 
 
-def schema_cfg():
-    # Basic schema setup
-    cfg = {}
-
-    scparam(cfg, ['schemaversion'],
-            sctype='str',
-            scope=Scope.GLOBAL,
-            defvalue=SCHEMA_VERSION,
-            require='all',
-            shorthelp="Schema version number",
-            lock=True,
-            switch="-schemaversion <str>",
-            example=["api: server.get('schemaversion')"],
-            schelp="""SiliconCompiler server schema version number.""")
-
-    scparam(cfg, ['option', 'port'],
-            sctype='int',
-            scope=Scope.GLOBAL,
-            defvalue=8080,
-            require='all',
-            shorthelp="Port number to run the server on.",
-            switch="-port <int>",
-            example=["cli: -port 8000",
-                     "api: server.set('option', 'port', 8080)"],
-            schelp="""Port number to run the server on.""")
-
-    scparam(cfg, ['option', 'cluster'],
-            sctype='enum',
-            enum=['local', 'slurm'],
-            scope=Scope.GLOBAL,
-            defvalue='local',
-            require='all',
-            shorthelp="Type of compute cluster to use.",
-            switch="-cluster <str>",
-            example=["cli: -cluster slurm",
-                     "api: server.set('option', 'clister', 'slurm')"],
-            schelp="""Type of compute cluster to use.""")
-
-    scparam(cfg, ['option', 'nfsmount'],
-            sctype='dir',
-            scope=Scope.GLOBAL,
-            defvalue='/nfs/sc_compute',
-            require='all',
-            shorthelp="Directory of mounted shared NFS storage.",
-            switch="-nfsmount <dir>",
-            example=["cli: -nfsmount ~/sc_server",
-                     "api: server.set('option', 'server', '~/sc_server')"],
-            schelp="""Directory of mounted shared NFS storage.""")
-
-    scparam(cfg, ['option', 'auth'],
-            sctype='bool',
-            scope=Scope.GLOBAL,
-            defvalue=False,
-            require='all',
-            shorthelp="Flag determining whether to enable authenticated and encrypted jobs.",
-            switch="-auth <bool>",
-            example=["cli: -auth true",
-                     "api: server.set('option', 'auth', True)"],
-            schelp="""Flag determining whether to enable authenticated and encrypted jobs.""")
-
-    scparam(cfg, ['option', 'cfg'],
-            sctype='[file]',
-            scope=Scope.JOB,
-            shorthelp="Configuration manifest",
-            switch="-cfg <file>",
-            example=["cli: -cfg mypdk.json",
-                     "api: chip.set('option', 'cfg', 'mypdk.json')"],
-            schelp="""
-            List of filepaths to JSON formatted schema configuration
-            manifests. The files are read in automatically when using the
-            command line application. In Python programs, JSON manifests
-            can be merged into the current working manifest using the
-            read_manifest() method.""")
-
-    scparam(cfg, ['option', 'loglevel'],
-            sctype='enum',
-            enum=["info", "warning", "error", "critical", "debug"],
-            pernode=PerNode.OPTIONAL,
-            scope=Scope.JOB,
-            defvalue='info',
-            shorthelp="Logging level",
-            switch="-loglevel <str>",
-            example=[
-                "cli: -loglevel info",
-                "api: server.set('option', 'loglevel', 'info')"],
-            schelp="""
-            Provides explicit control over the level of debug logging printed.""")
-
-    scparam(cfg, ['option', 'checkinterval'],
-            sctype='int',
-            defvalue=30,
-            shorthelp="Interval for client",
-            switch="-checkinterval <int>",
-            example=["cli: -checkinterval 10",
-                     "api: chip.set('option', 'checkinterval', 10)"],
-            schelp="""
-            Interval between checks to announce to clients""")
-
-    return cfg
-
-
-class ServerSchema(Schema):
-    def __init__(self, cfg=None, manifest=None, logger=None):
-        super().__init__(cfg=cfg,
-                         manifest=manifest,
-                         logger=logger)
-
-    def _init_schema_cfg(self):
-        return schema_cfg()
+class ServerSchema(BaseSchema, CommandLineSchema):
+    def __init__(self):
+        super().__init__()
+
+        schema = EditableSchema(self)
+
+        schema.insert(
+            'schemaversion',
+            Parameter(
+                'str',
+                scope=Scope.GLOBAL,
+                defvalue=SCHEMA_VERSION,
+                require='all',
+                shorthelp="Schema version number",
+                lock=True,
+                switch="-schemaversion <str>",
+                example=["api: server.get('schemaversion')"],
+                help="""SiliconCompiler server schema version number."""))
+
+        schema.insert(
+            'option', 'port',
+            Parameter(
+                'int',
+                scope=Scope.GLOBAL,
+                defvalue=8080,
+                require='all',
+                shorthelp="Port number to run the server on.",
+                switch="-port <int>",
+                example=["cli: -port 8000",
+                         "api: server.set('option', 'port', 8080)"],
+                help="""Port number to run the server on."""))
+
+        schema.insert(
+            'option', 'cluster',
+            Parameter(
+                '<local,slurm>',
+                scope=Scope.GLOBAL,
+                defvalue='local',
+                require='all',
+                shorthelp="Type of compute cluster to use.",
+                switch="-cluster <str>",
+                example=["cli: -cluster slurm",
+                         "api: server.set('option', 'clister', 'slurm')"],
+                help="""Type of compute cluster to use."""))
+
+        schema.insert(
+            'option', 'nfsmount',
+            Parameter(
+                'dir',
+                scope=Scope.GLOBAL,
+                defvalue='/nfs/sc_compute',
+                require='all',
+                shorthelp="Directory of mounted shared NFS storage.",
+                switch="-nfsmount <dir>",
+                example=["cli: -nfsmount ~/sc_server",
+                         "api: server.set('option', 'server', '~/sc_server')"],
+                help="""Directory of mounted shared NFS storage."""))
+
+        schema.insert(
+            'option', 'auth',
+            Parameter(
+                'bool',
+                scope=Scope.GLOBAL,
+                defvalue=False,
+                require='all',
+                shorthelp="Flag determining whether to enable authenticated and encrypted jobs.",
+                switch="-auth <bool>",
+                example=["cli: -auth true",
+                         "api: server.set('option', 'auth', True)"],
+                help="""Flag determining whether to enable authenticated and encrypted jobs."""))
+
+        schema.insert(
+            'option', 'cfg',
+            Parameter(
+                '[file]',
+                scope=Scope.JOB,
+                shorthelp="Configuration manifest",
+                switch="-cfg <file>",
+                example=["cli: -cfg mypdk.json",
+                         "api: chip.set('option', 'cfg', 'mypdk.json')"],
+                help="""
+                List of filepaths to JSON formatted schema configuration
+                manifests. The files are read in automatically when using the
+                command line application. In Python programs, JSON manifests
+                can be merged into the current working manifest using the
+                read_manifest() method."""))
+
+        schema.insert(
+            'option', 'loglevel',
+            Parameter(
+                '<info,warning,error,critical,debug>',
+                scope=Scope.JOB,
+                defvalue='info',
+                shorthelp="Logging level",
+                switch="-loglevel <str>",
+                example=[
+                        "cli: -loglevel info",
+                        "api: server.set('option', 'loglevel', 'info')"],
+                help="""
+                Provides explicit control over the level of debug logging printed."""))
+
+        schema.insert(
+            'option', 'checkinterval',
+            Parameter(
+                'int',
+                defvalue=30,
+                shorthelp="Interval for client",
+                switch="-checkinterval <int>",
+                example=["cli: -checkinterval 10",
+                         "api: chip.set('option', 'checkinterval', 10)"],
+                help="""
+                Interval between checks to announce to clients"""))

siliconcompiler/remote/server.py

@@ -21,7 +21,7 @@ from siliconcompiler.schema import SCHEMA_VERSION as sc_schema_version
 from siliconcompiler.remote.schema import ServerSchema
 from siliconcompiler.remote import banner, JobStatus
 from siliconcompiler.scheduler.slurm import get_configuration_directory
-from siliconcompiler.flowgraph import nodes_to_execute
+from siliconcompiler.utils.flowgraph import nodes_to_execute
 
 
 # Compile validation code for API request bodies.
@@ -78,7 +78,7 @@ class Server:
         self.logger.addHandler(handler)
         self.logger.setLevel(schema_utils.translate_loglevel(loglevel))
 
-        self.schema = ServerSchema(logger=self.logger)
+        self.schema = ServerSchema()
 
         # Set up a dictionary to track running jobs.
         self.sc_jobs = {}
@@ -146,7 +146,6 @@ class Server:
             progname=progname,
             description=description,
             switchlist=switchlist,
-            input_map=None,
             additional_args=additional_args,
             version=Server.__version__,
             print_banner=print_banner,
@@ -508,5 +507,4 @@ class Server:
         self.schema.set(*keypath, value, field=field, clobber=clobber)
 
     def write_configuration(self, filepath):
-        with open(filepath, 'w') as f:
-            self.schema.write_json(f)
+        self.schema.write_manifest(filepath)