omdev 0.0.0.dev287__tar.gz → 0.0.0.dev289__tar.gz

{omdev-0.0.0.dev287/omdev.egg-info → omdev-0.0.0.dev289}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.0.dev287
+Version: 0.0.0.dev289
 Summary: omdev
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,7 +12,7 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: >=3.12
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev287
+Requires-Dist: omlish==0.0.0.dev289
 Provides-Extra: all
 Requires-Dist: black~=25.1; extra == "all"
 Requires-Dist: pycparser~=2.22; extra == "all"

{omdev-0.0.0.dev287 → omdev-0.0.0.dev289}/omdev/.manifests.json

@@ -171,7 +171,7 @@
     "module": ".py.scripts.execstat",
     "attr": "_CLI_MODULE",
     "file": "omdev/py/scripts/execstat.py",
-    "line": 49,
+    "line": 82,
     "value": {
       "$.cli.types.CliModule": {
         "cmd_name": "py/execstat",
@@ -179,18 +179,6 @@
       }
     }
   },
-  {
-    "module": ".py.scripts.exectime",
-    "attr": "_CLI_MODULE",
-    "file": "omdev/py/scripts/exectime.py",
-    "line": 66,
-    "value": {
-      "$.cli.types.CliModule": {
-        "cmd_name": "py/exectime",
-        "mod_name": "omdev.py.scripts.exectime"
-      }
-    }
-  },
   {
     "module": ".py.scripts.importtrace",
     "attr": "_CLI_MODULE",

omdev-0.0.0.dev289/omdev/py/scripts/execstat.py

@@ -0,0 +1,178 @@
+#!/usr/bin/env python3
+# @omlish-script
+import argparse
+import inspect
+import json
+import statistics
+import subprocess
+import sys
+
+
+##
+
+
+def _run(
+        src: str,
+        *,
+        setup: str | None = None,
+        time: bool = False,
+        rss: bool = False,
+        modules: bool = False,
+) -> dict:
+    if rss:
+        import resource  # noqa
+
+        def get_rss() -> int:
+            return resource.getrusage(resource.RUSAGE_SELF).ru_maxrss
+
+    if time:
+        from time import monotonic as get_time
+
+    if modules:
+        import sys  # noqa
+
+        def get_modules() -> set[str]:
+            return set(sys.modules)
+
+    #
+
+    if setup:
+        exec(setup)
+
+    code = compile(src, '', 'exec')
+
+    #
+
+    if rss:
+        start_rss = get_rss()  # noqa
+
+    if modules:
+        start_modules = get_modules()  # noqa
+
+    if time:
+        start_time = get_time()  # noqa
+
+    #
+
+    exec(code)
+
+    #
+
+    if time:
+        end_time = get_time()
+
+    if rss:
+        end_rss = get_rss()
+
+    if modules:
+        end_modules = get_modules()
+
+    #
+
+    return {
+        **({'time': (end_time - start_time)} if time else {}),  # noqa
+        **({'rss': (end_rss - start_rss)} if rss else {}),  # noqa
+        **({'modules': sorted(end_modules - start_modules)} if modules else {}),  # noqa
+    }
+
+
+#
+
+
+# @omlish-manifest
+_CLI_MODULE = {'$omdev.cli.types.CliModule': {
+    'cmd_name': 'py/execstat',
+    'mod_name': __name__,
+}}
+
+
+def _main() -> None:
+    parser = argparse.ArgumentParser()
+
+    parser.add_argument('src')
+    parser.add_argument('-s', '--setup')
+
+    parser.add_argument('-t', '--time', action='store_true')
+    parser.add_argument('-r', '--rss', action='store_true')
+    parser.add_argument('-m', '--modules', action='store_true')
+
+    parser.add_argument('-n', '--num-runs', type=int, default=1)
+
+    parser.add_argument('-P', '--precision', type=int, default=3)
+
+    parser.add_argument('-x', '--exe')
+
+    args = parser.parse_args()
+
+    if (n := args.num_runs) < 1:
+        raise ValueError('num-runs must be > 0')
+
+    prec = args.precision
+
+    #
+
+    if (exe := args.exe) is None:
+        exe = sys.executable
+
+    results = []
+    for i in range(n):
+        run_kw = dict(
+            src=args.src,
+            setup=args.setup,
+            time=bool(args.time),
+        )
+
+        if i == 0:
+            run_kw.update(
+                rss=bool(args.rss),
+                modules=bool(args.modules),
+            )
+
+        payload = '\n'.join([
+            inspect.getsource(_run),
+            f'dct = _run(**{run_kw!r})',
+            'import json',
+            'print(json.dumps(dct))',
+        ])
+
+        result = json.loads(subprocess.check_output([exe, '-c', payload]))
+
+        results.append(result)
+
+    #
+
+    out = {}
+
+    if args.time:
+        if n > 1:
+            ts = [r['time'] * 1000. for r in results]
+            out.update({
+                'time_ms_mean': (time_ms_mean := round(statistics.mean(ts), prec)),
+                'time_ms_mean_s': f'{time_ms_mean:_}',
+                'time_ms_median': (time_ms_median := round(statistics.median(ts), prec)),
+                'time_ms_median_s': f'{time_ms_median:_}',
+                'time_ms_quantiles': (time_ms_quantiles := [round(tq, prec) for tq in statistics.quantiles(ts)]),
+                'time_ms_quantiles_s': [f'{tq:_}' for tq in time_ms_quantiles],
+            })
+        else:
+            out.update({
+                'time_ms': (time_ms := round(results[0]['time'] * 1000., prec)),
+                'time_ms_s': f'{time_ms:_}',
+            })
+
+    if args.rss:
+        out.update({
+            'rss': (rss := results[0]['rss']),
+            'rss_s': f'{rss:_}',
+        })
+
+    if args.modules:
+        out.update({
+            'modules': results[0]['modules'],
+        })
+
+    print(json.dumps(out, indent=2))
+
+
+if __name__ == '__main__':
+    _main()

{omdev-0.0.0.dev287 → omdev-0.0.0.dev289}/omdev/py/scripts/importtrace.py

@@ -488,20 +488,20 @@ def _main() -> None:
     import argparse
 
     parser = argparse.ArgumentParser()
-    parser.add_argument('--python')
+    parser.add_argument('-x', '--exe')
     parser.add_argument('--sqlite')
     parser.add_argument('--pretty', action='store_true')
     parser.add_argument('mod')
     args = parser.parse_args()
 
-    if args.python:
+    if args.exe:
         import inspect
         import subprocess
 
         mod_src = inspect.getsource(sys.modules[__name__])
         subprocess.run(
             [
-                args.python,
+                args.exe,
                 '-',
                 *(['--sqlite', args.sqlite] if args.sqlite else []),
                 *(['--pretty'] if args.pretty else []),

{omdev-0.0.0.dev287 → omdev-0.0.0.dev289}/omdev/tools/json/cli.py

@@ -73,8 +73,8 @@ def _build_args_parser() -> argparse.ArgumentParser:
 
     parser.add_argument('file', nargs='?')
 
-    parser.add_argument('--stream', action='store_true')
-    parser.add_argument('--stream-build', action='store_true')
+    parser.add_argument('-S', '--stream', action='store_true')
+    parser.add_argument('-B', '--stream-build', action='store_true')
 
     parser.add_argument('-l', '--lines', action='store_true')
 

{omdev-0.0.0.dev287 → omdev-0.0.0.dev289/omdev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.0.dev287
+Version: 0.0.0.dev289
 Summary: omdev
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,7 +12,7 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: >=3.12
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev287
+Requires-Dist: omlish==0.0.0.dev289
 Provides-Extra: all
 Requires-Dist: black~=25.1; extra == "all"
 Requires-Dist: pycparser~=2.22; extra == "all"

{omdev-0.0.0.dev287 → omdev-0.0.0.dev289}/omdev.egg-info/SOURCES.txt

@@ -212,7 +212,6 @@ omdev/py/srcheaders.py
 omdev/py/scripts/__init__.py
 omdev/py/scripts/bumpversion.py
 omdev/py/scripts/execstat.py
-omdev/py/scripts/exectime.py
 omdev/py/scripts/importtrace.py
 omdev/py/tools/__init__.py
 omdev/py/tools/importscan.py

{omdev-0.0.0.dev287 → omdev-0.0.0.dev289}/omdev.egg-info/requires.txt

@@ -1,4 +1,4 @@
-omlish==0.0.0.dev287
+omlish==0.0.0.dev289
 
 [all]
 black~=25.1

{omdev-0.0.0.dev287 → omdev-0.0.0.dev289}/pyproject.toml

@@ -12,7 +12,7 @@ authors = [
 urls = {source = 'https://github.com/wrmsr/omlish'}
 license = {text = 'BSD-3-Clause'}
 requires-python = '>=3.12'
-version = '0.0.0.dev287'
+version = '0.0.0.dev289'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',
@@ -22,7 +22,7 @@ classifiers = [
 ]
 description = 'omdev'
 dependencies = [
-    'omlish == 0.0.0.dev287',
+    'omlish == 0.0.0.dev289',
 ]
 
 [project.optional-dependencies]

omdev-0.0.0.dev287/omdev/py/scripts/execstat.py

@@ -1,80 +0,0 @@
-#!/usr/bin/env python3
-# @omlish-script
-import inspect
-import json
-import subprocess
-import sys
-
-
-##
-
-
-def _run(
-        src: str,
-        *,
-        pre: str | None = None,
-) -> dict:
-    import resource  # noqa
-    import sys  # noqa
-    import time  # noqa
-
-    def get_rss() -> int:
-        return resource.getrusage(resource.RUSAGE_SELF).ru_maxrss
-
-    if pre:
-        exec(pre)
-
-    start_modules = set(sys.modules)
-    start_rss = get_rss()
-    start_time = time.time()
-
-    exec(src)
-
-    end_time = time.time()
-    end_rss = get_rss()
-    end_modules = set(sys.modules)
-
-    return {
-        'time_ms': (time_ms := round((end_time - start_time) * 1000., 6)),
-        'time_ms_s': f'{time_ms:_}',
-        'rss': (rss := (end_rss - start_rss)),
-        'rss_s': f'{rss:_}',
-        'modules': sorted(end_modules - start_modules),
-    }
-
-
-#
-
-
-# @omlish-manifest
-_CLI_MODULE = {'$omdev.cli.types.CliModule': {
-    'cmd_name': 'py/execstat',
-    'mod_name': __name__,
-}}
-
-
-def _main() -> None:
-    if len(sys.argv) == 2:
-        pre = None
-        [src] = sys.argv[1:]
-    elif len(sys.argv) == 3:
-        [pre, src] = sys.argv[1:]
-    else:
-        raise Exception('Invalid arguments')
-
-    payload = '\n'.join([
-        inspect.getsource(_run),
-        f'dct = _run({src!r}, pre={pre!r})',
-        'import json',
-        'print(json.dumps(dct))',
-    ])
-
-    out_json = subprocess.check_output([sys.executable, '-c', payload])
-
-    dct = json.loads(out_json)
-
-    print(json.dumps(dct, indent=2))
-
-
-if __name__ == '__main__':
-    _main()

omdev-0.0.0.dev287/omdev/py/scripts/exectime.py

@@ -1,106 +0,0 @@
-#!/usr/bin/env python3
-# @omlish-script
-
-
-##
-
-
-def _run_one(src, pre=None):
-    import time
-
-    if pre:
-        exec(pre)
-
-    co = compile(src, '<string>', 'exec')
-    start = time.time_ns()
-    exec(co)
-    end = time.time_ns()
-
-    return end - start
-
-
-##
-
-
-def _run(n, src, pre=None):
-    if n is None:
-        return _run_one(src, pre=pre)
-
-    #
-
-    import inspect
-
-    cmd = '\n'.join([
-        inspect.getsource(_run_one),
-        f'print(_run_one({src!r}, pre={pre!r}))',
-    ])
-
-    #
-
-    import subprocess
-    import sys
-
-    ts = []
-    for _ in range(n):
-        out = subprocess.check_output([sys.executable, '-c', cmd]).decode()
-        t = int(out.strip())
-        ts.append(t)
-
-    #
-
-    import statistics
-
-    o = {
-        # 'times': ts,
-        'mean': statistics.mean(ts),
-        'median': statistics.median(ts),
-        'quantiles': statistics.quantiles(ts),
-    }
-
-    return o
-
-
-##
-
-
-# @omlish-manifest
-_CLI_MODULE = {'$omdev.cli.types.CliModule': {
-    'cmd_name': 'py/exectime',
-    'mod_name': __name__,
-}}
-
-
-def _main():
-    import sys
-
-    args = sys.argv[1:]
-
-    n = None
-    if args:
-        try:
-            n = int(args[0])
-        except ValueError:
-            pass
-        else:
-            args.pop(0)
-
-    if len(args) > 1:
-        pre = args.pop(0)
-    else:
-        pre = None
-
-    if len(args) != 1:
-        raise Exception('Invalid arguments')
-    [src] = args
-
-    #
-
-    o = _run(n, src, pre=pre)
-
-    import json
-
-    print(json.dumps(o, indent=2))
-
-
-if __name__ == '__main__':
-    _main()