omdev 0.0.0.dev287__py3-none-any.whl → 0.0.0.dev289__py3-none-any.whl

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/py/scripts/execstat.py

@@ -1,7 +1,9 @@
 #!/usr/bin/env python3
 # @omlish-script
+import argparse
 import inspect
 import json
+import statistics
 import subprocess
 import sys
 
@@ -12,34 +14,65 @@ import sys
 def _run(
         src: str,
         *,
-        pre: str | None = None,
+        setup: str | None = None,
+        time: bool = False,
+        rss: bool = False,
+        modules: bool = False,
 ) -> dict:
-    import resource  # noqa
-    import sys  # noqa
-    import time  # noqa
+    if rss:
+        import resource  # noqa
 
-    def get_rss() -> int:
-        return resource.getrusage(resource.RUSAGE_SELF).ru_maxrss
+        def get_rss() -> int:
+            return resource.getrusage(resource.RUSAGE_SELF).ru_maxrss
 
-    if pre:
-        exec(pre)
+    if time:
+        from time import monotonic as get_time
 
-    start_modules = set(sys.modules)
-    start_rss = get_rss()
-    start_time = time.time()
+    if modules:
+        import sys  # noqa
 
-    exec(src)
+        def get_modules() -> set[str]:
+            return set(sys.modules)
 
-    end_time = time.time()
-    end_rss = get_rss()
-    end_modules = 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_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),
+        **({'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
     }
 
 
@@ -54,26 +87,91 @@ _CLI_MODULE = {'$omdev.cli.types.CliModule': {
 
 
 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))
+    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__':

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/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.dist-info → omdev-0.0.0.dev289.dist-info}/METADATA

@@ -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.dist-info → omdev-0.0.0.dev289.dist-info}/RECORD

@@ -1,4 +1,4 @@
-omdev/.manifests.json,sha256=qU7B38qH7pnZcSvbdlaw7Of0MoWAWncs0tG2kFVtHAc,10673
+omdev/.manifests.json,sha256=zmYuVLzazV03KggE8ZqY0MlVvpEwChvCWh_wfCSEn3w,10394
 omdev/__about__.py,sha256=OgO_8azOzKriF2qPeDWRLcRe9p1XW5kYdJCq5vewff0,1171
 omdev/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/cmake.py,sha256=9rfSvFHPmKDj9ngvfDB2vK8O-xO_ZwUm7hMKLWA-yOw,4578
@@ -201,9 +201,8 @@ omdev/py/findimports.py,sha256=V3GcFhqYOiPQtAOpTi4Pmeb3_c5mKqlEwah7v9vCBjg,2476
 omdev/py/srcheaders.py,sha256=cMopJr-QpOmzEBow-4mVupxdULE8QdSaSLH2aJV5Xxg,1993
 omdev/py/scripts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/py/scripts/bumpversion.py,sha256=2NnfRsJiZNTg-LubIwXCm2vklG7-kIR8_xFUEZNxtiY,1119
-omdev/py/scripts/execstat.py,sha256=Ly11ffRdo9aud4nnxJWe5MqRsO8lDEA5L9s0Ul09hJM,1544
-omdev/py/scripts/exectime.py,sha256=S2O4MgtzTsFOY2IUJxsrnOIame9tEFc6aOlKP-F1JSg,1541
-omdev/py/scripts/importtrace.py,sha256=NjRilVNBugswrNflIhPCPHRTd-vIijqSZ8C7J8lariI,14038
+omdev/py/scripts/execstat.py,sha256=eyk_TCeJt-xtMGqaW3X7pnEBe7JZbXrTYsODn_m6lfM,3869
+omdev/py/scripts/importtrace.py,sha256=TqALDqR6ODpbMyAtk2q84Xrvmn0UPGaKAdcNB7E62bA,14035
 omdev/py/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/py/tools/importscan.py,sha256=4dCH0coX0OqNwesteKaTE8GxuSfLhgXYQlzNUXLiSNY,4640
 omdev/py/tools/mkrelimp.py,sha256=L6TksQixUc_DQGXKFMOKnYJ-JixeP3ldgkDqHeEs2Ww,4044
@@ -250,7 +249,7 @@ omdev/tools/git/consts.py,sha256=JuXivUNDkNhM4pe97icjRVAKM8cNRbrODquHINNKqOE,40
 omdev/tools/git/messages.py,sha256=NWztIK0nAKJIOVzuVQcR_5LHZUgqyVkrOlpl7dFLMdU,2424
 omdev/tools/json/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/tools/json/__main__.py,sha256=wqpkN_NsQyNwKW4qjVj8ADJ4_C98KhrFBtE-Z1UamfU,168
-omdev/tools/json/cli.py,sha256=EubIMT-n2XsjWBZjSy2fWXqijlwrIhLsfbkg3SZzi28,9586
+omdev/tools/json/cli.py,sha256=WQ8VQ9EkGD6IeIuUci8hLPwfx6y2B8ZzFlTTizwwKXU,9598
 omdev/tools/json/formats.py,sha256=RgtPdcs294o9n9czjafHppg1iSzD-olsIc3v8ApM9Os,1908
 omdev/tools/json/io.py,sha256=sfj2hJS9Hy3aUR8a_lLzOrYcmL9fSKyvOHiofdUASsI,1427
 omdev/tools/json/parsing.py,sha256=BNCOcPs6eDvB6wePnjl9H0C-ngHxLRgzLM1EPetWnrQ,2093
@@ -259,9 +258,9 @@ omdev/tools/json/rendering.py,sha256=tMcjOW5edfozcMSTxxvF7WVTsbYLoe9bCKFh50qyaGw
 omdev/tools/pawk/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/tools/pawk/__main__.py,sha256=VCqeRVnqT1RPEoIrqHFSu4PXVMg4YEgF4qCQm90-eRI,66
 omdev/tools/pawk/pawk.py,sha256=zsEkfQX0jF5bn712uqPAyBSdJt2dno1LH2oeSMNfXQI,11424
-omdev-0.0.0.dev287.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omdev-0.0.0.dev287.dist-info/METADATA,sha256=c9XD3IcAQAfiAlXPY8blNR97MF-_aJaozD6n_jvhJwI,1478
-omdev-0.0.0.dev287.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-omdev-0.0.0.dev287.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
-omdev-0.0.0.dev287.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
-omdev-0.0.0.dev287.dist-info/RECORD,,
+omdev-0.0.0.dev289.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omdev-0.0.0.dev289.dist-info/METADATA,sha256=8-HvwI8Pvm2Hg03RBIkSLRUh62utv2kbxiFn3VHiTzE,1478
+omdev-0.0.0.dev289.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+omdev-0.0.0.dev289.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
+omdev-0.0.0.dev289.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
+omdev-0.0.0.dev289.dist-info/RECORD,,

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()