From 46b8754c10cab497ee48bda7fcf67d7e7a25a62e Mon Sep 17 00:00:00 2001 From: aiongg Date: Tue, 17 Nov 2026 05:23:34 +0000 Subject: [PATCH] cl: app mode from [workspace.metadata.cl], one CL_LAUNCHER/CL_RUNNER pair An app workspace declares its selection, tracked crates, expected features, environment, shards, default test times, run slots and test threads in its root Cargo.toml; cl reads them from cargo metadata and refuses unknown keys and wrong types. The PhotoCraft constants and CL_PC_LAUNCHER/CL_PC_RUNNER are gone: every workspace uses CL_LAUNCHER and CL_RUNNER. `cl build ` builds any example over the selection. Drops a committed __pycache__ file and ignores __pycache__/. --- .gitignore | 1 + docs/development.md | 42 +++-- tools/__pycache__/clcpython-314.pyc | Bin 62812 -> 0 bytes tools/cl | 273 +++++++++++++++------------- 4 files changed, 179 insertions(+), 137 deletions(-) delete mode 100644 tools/__pycache__/clcpython-314.pyc diff --git a/.gitignore b/.gitignore index 3c2518872..7583fcbc2 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ target/ /.claude/ .idea/ /vendor/*/target +__pycache__/ diff --git a/docs/development.md b/docs/development.md index e88b1d8d8..74cb5b823 100644 --- a/docs/development.md +++ b/docs/development.md @@ -32,26 +32,42 @@ cargo compiles a crate once per distinct feature set, and every crate above it o Four manifest facts keep this true, and `cl doctor` checks them: `feature-root` lists every optional domain crate of the gallery with the gallery's features, and depends on the gallery without its default features (so the gallery lib's own features stay each command's: `apps` for the gallery, one crate for a render); the story renderer asks its shared dependencies for no feature the gallery's lines lack; dev-dependency lines ask egui for no features (a feature there differs between a crate's tests and everything else); the proc-macro crate pins syn's and proc-macro2's features to everything other derive crates may add, so the one syn every proc macro shares is the same with or without design-lint in the graph. `cl` names any new build of a framework crate in the target directory after each command; after a manifest change one is expected, otherwise run `cl doctor`. -## PhotoCraft +## App workspaces -`tools/cl` finds its workspace with `git rev-parse --show-toplevel` from the current directory, so `/path/to/worktree/tools/cl` run inside a PhotoCraft tree builds and tests that tree. A workspace that has `photocraft-ui-egui` gets one fixed selection: `-p photocraft-ui-egui -p photocraft-engine -p photocraft -p photocraft-algo -p photocraft-automation -p photocraft-text -p photocraft-tablet -p photocraft-cli -p photocraft-paint -p photocraft-io -p photocraft-gpu`, in test mode, without `--features` (the test features come from the dev-dependencies). Each package brings features the others lack, so a command that drops one builds a second copy of egui, photocraft-io or craft-affinity and everything above them. The craft-libs workspace is unchanged. +`tools/cl` finds its workspace with `git rev-parse --show-toplevel` from the current directory, so `/path/to/craft-libs/tools/cl` run inside an app's tree builds and tests that tree. An app workspace is one whose root `Cargo.toml` has a `[workspace.metadata.cl]` table. There every command selects the same packages (`selection`), in test mode, without `--features` (the test features come from the dev-dependencies). Each package brings features the others lack, so a command that drops one builds a second copy of the shared crates below it (in PhotoCraft egui, photocraft-io and craft-affinity) and of everything above them. The craft-libs workspace has no such table and keeps the commands above. | to | run | what it does | | --- | --- | --- | -| test one crate | `cl test [-- ]` | builds `--lib --tests` over the 11 packages, then runs only that crate's test binaries | -| test a ui-egui change fast | `cl test ui-egui --unit [-- ]` | builds and runs the lib binaries only | -| the integration round | `cl test all [-- ]` | builds all, runs every binary of the 11 packages three at a time, longest first | -| check | `cl check ` | `cargo check --lib --tests` over the same 11 packages (the selection is fixed, so every package is checked) | -| the snapshot example | `cl build snapshot` | `cargo test --no-run --example snapshot` over the same selection | -| the packages and builds | `cl doctor` | the 11 packages exist; the target holds one build of each pinned crate with the expected features | +| test one crate | `cl test [-- ]` | builds `--lib --tests` over the selection, then runs only that crate's test binaries | +| test a crate's lib fast | `cl test --unit [-- ]` | builds and runs the lib binaries only | +| the integration round | `cl test all [-- ]` | builds all, runs every binary of the selection `run_slots` at a time, longest first | +| check | `cl check ` | `cargo check --lib --tests` over the selection (the selection is fixed, so every package is checked) | +| an example | `cl build ` | `cargo test --no-run --example ` over the selection | +| the packages and builds | `cl doctor` | the selected packages exist; the target holds one build of each `expected_features` crate, with those features | -`` is the package name with or without `photocraft-` (`ui-egui`, `engine`, `photocraft` for the app). `--no-run` builds only. +`` is the package name, or the name without its first word (`ui-egui` and `engine` in PhotoCraft; `photocraft` for the app). `--no-run` builds only. -The environment is the same for every command: `TMPDIR=/tmp` (PhotoCraft's tests keep a scratch reserve that a larger default TMPDIR can trip); `RUST_MIN_STACK`, `CARGO_INCREMENTAL` and `CRAFT_FONTS_DIR` unset (the text crate's build script tracks the fonts directory, so any change rebuilds it and everything above). In a PhotoCraft workspace every cargo command runs through the command in `CL_PC_LAUNCHER` when it is set, and each test binary through the command in `CL_PC_RUNNER` when it is set, with `--test-threads 4`; they play the roles `CL_LAUNCHER` and `CL_RUNNER` play in craft-libs, which do not apply there. Without them cargo and the binaries run directly. +The keys of `[workspace.metadata.cl]`; cl refuses a table with an unknown key or a value of the wrong type: -`cl test all` orders the binaries by the times of the previous run (`/cl-test-times.json`), else ui-egui's lib, ui-egui's `it`, then engine first. Without filters, the photocraft-ui-egui lib binary runs as three shards chosen by top-level module from the binary's `--list` (a module over a third of the tests is split by its submodules); each test runs in exactly one shard. The last line is `N passed, M failed, B binaries, K overflowed stacks, T s`; failures follow as `binary test_name`. +| key | type | default | what it does | +| --- | --- | --- | --- | +| `selection` | list of packages | required | the packages every command selects | +| `tracked` | list of crates | none | crates whose new builds in the target directory are named after each command, besides the framework's | +| `expected_features` | table: crate = list of features | none | the features of the one build of each crate that `cl doctor` expects in the target directory | +| `unset_env` | list of variable names | none | removed from every command's environment: variables that change a build input, so a command run with another value rebuilds | +| `set_env` | table: name = value | none | set in every command's environment | +| `shard` | table: `"/"` = count | none | runs that test binary as that many shards when no filter is given | +| `default_seconds` | table: `"/"` = seconds | none | orders the first `cl test all` run, longest first; later runs use the times recorded in `/cl-test-times.json` | +| `run_slots` | integer | 1 | test binaries run at once | +| `test_threads` | integer | libtest's | `--test-threads` for each test binary, unless the command passes its own | -Refused in a PhotoCraft workspace, with the reason: one `-p ` (or none) through `cl cargo`, `--features`/`-F`/`--no-default-features`, `--all-features`, `--workspace`, and a `cargo test` without `--lib`, `--tests` or `--example`. After every command, a new build of egui, eframe, photocraft-ui-egui, photocraft-io, craft-affinity or a framework crate is named with its feature set. `CL_DRY_RUN=1` prints the composed cargo command and the environment and runs nothing. +PhotoCraft's root `Cargo.toml` is the worked example: 11 packages selected, `TMPDIR=/tmp` set (its tests keep a scratch reserve that a TMPDIR on a nearly full disk trips), `RUST_MIN_STACK`, `CARGO_INCREMENTAL` and `CRAFT_FONTS_DIR` unset (the text crate's build script tracks the fonts directory), three binaries at a time with four test threads each, and the ui-egui lib binary in three shards. + +A shard is chosen by top-level module from the binary's `--list` (a module over a shard's share of the tests is split by its submodules); each test runs in exactly one shard. The last line of `cl test` is `N passed, M failed, B binaries, K overflowed stacks, T s`; failures follow as `binary test_name`. + +`CL_LAUNCHER` and `CL_RUNNER` play the same roles as in craft-libs (see [The job pool](#the-job-pool)): every cargo command runs through `CL_LAUNCHER`, every test binary through `CL_RUNNER`. + +Refused in an app workspace, with the reason: a selection other than the whole of `selection` (one `-p `, or none, through `cl cargo`), `--features`/`-F`/`--no-default-features`, `--all-features`, `--workspace`, and a `cargo test` without `--lib`, `--tests` or `--example`. After every command, a new build of a `tracked` or framework crate is named with its feature set. `CL_DRY_RUN=1` prints the composed cargo command and the environment and runs nothing. ## What not to run locally @@ -84,7 +100,7 @@ Frame-time numbers come from the gallery profile, the build a developer runs on ## The job pool -cargo gives each build a jobserver with one token per core, so a build alone uses the whole machine, but several builds at once (worktrees, agents) each take every core and slow each other down. To share one job pool between them, set `CL_LAUNCHER` to a command that runs its arguments with a shared jobserver in `MAKEFLAGS` (cargo joins a jobserver it finds there). `cl` runs every cargo command through that command; without `CL_LAUNCHER` it runs cargo directly. +cargo gives each build a jobserver with one token per core, so a build alone uses the whole machine, but several builds at once (worktrees, agents) each take every core and slow each other down. To share one job pool between them, set `CL_LAUNCHER` to a command that runs its arguments with a shared jobserver in `MAKEFLAGS` (cargo joins a jobserver it finds there). `cl` runs every cargo command through that command, in craft-libs and in every app workspace; without `CL_LAUNCHER` it runs cargo directly. Test binaries take no tokens: each starts its own test threads, and screen tests a software renderer's threads as well. `cl test` therefore builds with `cargo test --no-run` through `CL_LAUNCHER` and then runs each test binary itself, as cargo would (from its package's directory, the lib's unit tests first, stopping at the first that fails), through `CL_RUNNER` when it is set: a command that limits how many test binaries run at once. `cl render` runs the story renderer through `CL_RUNNER` too. Keep the two apart: a limit held for a whole build only queues the builds behind it, and the job pool already shares the cores between builds. diff --git a/tools/__pycache__/clcpython-314.pyc b/tools/__pycache__/clcpython-314.pyc deleted file mode 100644 index b98ad7df8dad7fe4a284b44f4508c9faa6c26f84..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 62812 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 EAH_0 cargo through the job pool, nothing added -In a PhotoCraft workspace (one with photocraft-ui-egui) the commands are different; see "PhotoCraft" below: +In an app workspace (one whose root Cargo.toml has `[workspace.metadata.cl]`) the commands are different; see "App +workspaces" below: cl test [--unit] [--no-run] [cargo args] [-- test args] cl check the same selection, cargo check - cl build snapshot the snapshot example, on the same selection - cl doctor the 11 packages exist; the target holds one build of each pinned crate + cl build the example, on the same selection + cl doctor the selected packages exist; the target holds one build of each expected crate Every cargo command runs through the command in CL_LAUNCHER when it is set (for example a wrapper that gives several builds on one machine a shared jobserver; docs/development.md "The job pool"), else plain cargo. The binaries cl runs @@ -37,21 +38,19 @@ Records: every build cl composes passes cargo's --timings (a report per build in 200 kept), and every cl command appends one line to /cl.log: when it started, the command, the build's and the test runs' wall time, the exit code and the build's report. -PhotoCraft: cl finds its workspace with `git rev-parse --show-toplevel` from the current directory, so -`/path/to/craft-libs/tools/cl` run inside a PhotoCraft tree works on that tree. There every command selects the same 11 -packages (PC_SELECTION), in test mode and without `--features` (the test features come from dev-dependencies), because -each package brings features the others lack and a selection that drops one builds a second copy of egui, photocraft-io -or craft-affinity and everything above it. The environment is fixed too: TMPDIR=/tmp (PhotoCraft's tests keep a scratch -reserve that a larger default TMPDIR can trip), RUST_MIN_STACK, CARGO_INCREMENTAL and CRAFT_FONTS_DIR unset (the text -crate's build script tracks the last: any change rebuilds it and everything above). In a PhotoCraft workspace the -launcher is CL_PC_LAUNCHER and the runner CL_PC_RUNNER (the roles CL_LAUNCHER and CL_RUNNER have in craft-libs, which -do not apply there); each defaults to running directly. Test binaries run three at a time, longest first. +App workspaces: cl finds its workspace with `git rev-parse --show-toplevel` from the current directory, so +`/path/to/craft-libs/tools/cl` run inside an app's tree works on that tree. An app declares its settings in its root +Cargo.toml's `[workspace.metadata.cl]` (APP_KEYS; docs/development.md "App workspaces" has each key). Every command +selects the same packages (`selection`), in test mode and without `--features` (the test features come from +dev-dependencies), because each package brings features the others lack and a selection that drops one builds a second +copy of the shared crates below them and everything above. Every command runs with `set_env` set and `unset_env` +removed. Test binaries run `run_slots` at a time, longest first (`default_seconds` before a run has recorded times), +with `--test-threads `; a binary named in `shard` runs as that many shards. Guards: `--all-features`, `--bins` and workspace-wide builds are refused with the reason; after every command, a new -build of a framework crate (in PhotoCraft also egui, eframe, photocraft-ui-egui, photocraft-io, craft-affinity) in the -target directory is named, with its feature set; CL_DRY_RUN=1 prints the composed cargo command (and the PhotoCraft -environment) and runs nothing; `cl doctor` (also run before every -command, it reads a few manifests) reports manifest lines that would bring a second build back. +build of a framework crate (in an app workspace also of each `tracked` crate) in the target directory is named, with its +feature set; CL_DRY_RUN=1 prints the composed cargo command (and an app's environment) and runs nothing; `cl doctor` +(also run before every command, it reads a few manifests) reports manifest lines that would bring a second build back. """ import json @@ -79,33 +78,22 @@ REFUSED = { "--all-targets": "it builds every binary and benchmark too; use `cl check` or `cl test` (--tests)", } TIMING_REPORTS_KEPT = 200 -# PhotoCraft workspace (marked by its UI package): the one selection every command builds with. -PC_MARKER = "photocraft-ui-egui" -PC_SELECTION = [ - "photocraft-ui-egui", "photocraft-engine", "photocraft", "photocraft-algo", "photocraft-automation", "photocraft-text", - "photocraft-tablet", "photocraft-cli", "photocraft-paint", "photocraft-io", "photocraft-gpu", -] -# Crates whose new builds are named after a PhotoCraft command, besides the framework's. -PC_TRACKED = ["egui", "eframe", "photocraft-ui-egui", "photocraft-io", "craft-affinity"] -# The feature sets of round D's one build of each pinned crate (`cl doctor` compares the target's builds with them). -PC_FEATURES = { - "egui": {"bytemuck", "default_fonts", "monochrome_emoji_fonts", "persistence", "ron", "serde"}, - "photocraft-io": {"pdf-editable", "testgen"}, - "craft-affinity": {"synth"}, - "craft-ui-contract": {"default", "snapshot", "testing"}, - "craft-imaging": {"default", "screen-testing", "ui"}, +# An app workspace's `[workspace.metadata.cl]`: each key, its type and its value when the table leaves it out. +APP_KEYS = { + "selection": (list, None), + "tracked": (list, []), + "expected_features": (dict, {}), + "unset_env": (list, []), + "set_env": (dict, {}), + "shard": (dict, {}), + "default_seconds": (dict, {}), + "run_slots": (int, 1), + "test_threads": (int, None), } -# Environment removed from every PhotoCraft command: each changes a build input, so a command that differs from the others rebuilds. -PC_UNSET = ["RUST_MIN_STACK", "CARGO_INCREMENTAL", "CRAFT_FONTS_DIR"] -PC_RUN_SLOTS = 3 -PC_TEST_THREADS = "4" -PC_SHARDS = 3 -# Seconds per binary when no earlier run recorded times (round D): orders the first run, longest first. -PC_DEFAULT_SECONDS = {"photocraft-ui-egui/photocraft_ui_egui": 389.0, "photocraft-ui-egui/it": 221.0, "photocraft-engine/photocraft_engine": 97.0} -PC_BUILDING = {"test", "check", "build", "run", "bench", "clippy", "doc", "rustc"} -PC_FEATURE_FLAGS = ("--features", "-F", "--no-default-features") -# Set by main() when the workspace is a PhotoCraft one. -PHOTOCRAFT = False +APP_BUILDING = {"test", "check", "build", "run", "bench", "clippy", "doc", "rustc"} +APP_FEATURE_FLAGS = ("--features", "-F", "--no-default-features") +# Set by main() from the workspace's `[workspace.metadata.cl]` in an app workspace; None in craft-libs. +APP = None DRY_RUN = bool(os.environ.get("CL_DRY_RUN")) # What cl.log records about this command; filled in as it runs. RECORD = {"start": time.time(), "target": None, "build": None, "run": 0.0, "report": ""} @@ -135,12 +123,38 @@ def worktree(): def metadata(top): + """The workspace's packages by name, and its `[workspace.metadata.cl]` table (None when it has none).""" out = subprocess.run( ["cargo", "metadata", "--no-deps", "--format-version", "1", "--offline"], cwd=top, capture_output=True, text=True ) if out.returncode != 0: fail("cargo metadata failed:\n" + out.stderr) - return {p["name"]: p for p in json.loads(out.stdout)["packages"]} + data = json.loads(out.stdout) + return {p["name"]: p for p in data["packages"]}, (data.get("metadata") or {}).get("cl") + + +def app_config(table): + """The app mode's settings from `[workspace.metadata.cl]`, every key filled in; refuses unknown keys and wrong types.""" + unknown = sorted(set(table) - set(APP_KEYS)) + if unknown: + fail(f"[workspace.metadata.cl]: unknown keys {unknown}; the keys are {', '.join(APP_KEYS)} (docs/development.md)") + config = {} + for key, (kind, default) in APP_KEYS.items(): + value = table.get(key, default) + if key == "selection" and value is None: + fail("[workspace.metadata.cl]: `selection` is missing; it lists the packages every cl command selects") + if value is not None and (not isinstance(value, kind) or isinstance(value, bool)): + fail(f"[workspace.metadata.cl]: `{key}` must be {({list: 'a list', dict: 'a table', int: 'an integer'})[kind]}") + config[key] = value + for key in ("shard", "default_seconds"): + for name, value in config[key].items(): + if "/" not in name or not isinstance(value, (int, float)) or isinstance(value, bool): + fail(f"[workspace.metadata.cl.{key}]: `{name}` must be \"/\" with a number") + if any(not isinstance(v, list) for v in config["expected_features"].values()): + fail("[workspace.metadata.cl.expected_features]: each crate's value is a list of features") + if any(not isinstance(v, str) for v in config["set_env"].values()): + fail("[workspace.metadata.cl.set_env]: each value is a string") + return config def package(packages, name): @@ -174,8 +188,8 @@ def own_targets(p): def doctor(top, packages, quiet=False): """Manifest lines that would bring the variant churn back. Returns the number of problems.""" - if PHOTOCRAFT: - return pc_doctor(top, packages, quiet) + if APP: + return app_doctor(top, packages, quiet) problems = [] for path, pattern, why in PINS: text = open(os.path.join(top, path)).read() @@ -229,7 +243,7 @@ def target_dir(top, env): def tracked(): - return FRAMEWORK + (PC_TRACKED if PHOTOCRAFT else []) + return FRAMEWORK + (APP["tracked"] if APP else []) def variants(target): @@ -312,21 +326,20 @@ def cargo(top, cargo_args, json_out=False, timings=True): if arg in REFUSED: fail(f"{arg} refused: {REFUSED[arg]}") env = dict(os.environ) - if PHOTOCRAFT: - pc_guard(cargo_args) - pc_env(env) + if APP: + app_guard(cargo_args) + app_env(env) target = target_dir(top, env) if not DRY_RUN: RECORD["target"] = target if timings: cargo_args = cargo_args[:1] + ["--timings"] + cargo_args[1:] - launcher = env.get("CL_PC_LAUNCHER" if PHOTOCRAFT else "CL_LAUNCHER", "") - cmd = shlex.split(launcher) + ["cargo"] + cargo_args + cmd = shlex.split(env.get("CL_LAUNCHER", "")) + ["cargo"] + cargo_args print("cl: " + " ".join(cmd) + f" (target {target})", file=sys.stderr) sys.stdout.flush() if DRY_RUN: - if PHOTOCRAFT: - print(f"cl: env TMPDIR={env['TMPDIR']}; unset " + " ".join(PC_UNSET), file=sys.stderr) + if APP: + print("cl: env " + " ".join(f"{k}={v}" for k, v in APP["set_env"].items()) + "; unset " + " ".join(APP["unset_env"]), file=sys.stderr) print("cl: CL_DRY_RUN set, nothing run", file=sys.stderr) return 0, target, [] before = variants(target) @@ -408,34 +421,33 @@ def test(top, packages, cargo_args, test_args): sys.exit(0) -def is_photocraft(packages): - return PC_MARKER in packages - - -def pc_env(env): - """The one environment every PhotoCraft command runs in. /tmp for the scratch files: a TMPDIR on a nearly full disk - trips PhotoCraft's 5% scratch reserve.""" - env["TMPDIR"] = "/tmp" - for name in PC_UNSET: +def app_env(env): + """The one environment every command of an app workspace runs in: `set_env` set, `unset_env` removed.""" + env.update(APP["set_env"]) + for name in APP["unset_env"]: env.pop(name, None) return env -def pc_selected(): - return [x for p in PC_SELECTION for x in ("-p", p)] +def app_selected(): + return [x for p in APP["selection"] for x in ("-p", p)] -def pc_package(name): - for candidate in (name, "photocraft-" + name): - if candidate in PC_SELECTION: - return candidate - fail(f"{name} is not one of the selected packages: all, " + ", ".join(p.removeprefix("photocraft-") or p for p in PC_SELECTION)) +def app_package(name): + """The selected package named `name`, or named `-` (`engine` for `photocraft-engine`).""" + selection = APP["selection"] + if name in selection: + return name + matches = [p for p in selection if p.partition("-")[2] == name] + if len(matches) == 1: + return matches[0] + fail(f"{name} {'names several' if matches else 'is not one'} of the selected packages: all, " + ", ".join(matches or selection)) -def pc_guard(args): - """Refuses the PhotoCraft commands that bring a second copy of egui, photocraft-io, craft-affinity or the framework.""" +def app_guard(args): + """Refuses the commands that bring a second copy of a shared crate: a selection other than the app's, or features.""" sub = args[0] if args else "" - if sub not in PC_BUILDING: + if sub not in APP_BUILDING: return own = args[:args.index("--")] if "--" in args else args named = [] @@ -446,26 +458,26 @@ def pc_guard(args): named.append(a.split("=", 1)[1]) elif a.startswith("-p") and len(a) > 2: named.append(a[2:]) - if set(named) != set(PC_SELECTION): - fail("a PhotoCraft cargo command names all 11 packages or none of cl's: one package alone (or the default members) resolves " - "egui, eframe, photocraft-io and craft-affinity with other features and builds a second copy of each and of everything " - "above them; use `cl test `, `cl check `, `cl build snapshot`") + if set(named) != set(APP["selection"]): + fail(f"a cargo command in this workspace names all {len(APP['selection'])} packages of [workspace.metadata.cl] `selection` " + "or none of cl's: one package alone (or the default members) resolves the shared crates with other features and " + "builds a second copy of each and of everything above them; use `cl test `, `cl check `, `cl build `") for a in own: - if a in PC_FEATURE_FLAGS or a.startswith("--features=") or a.startswith("-F"): + if a in APP_FEATURE_FLAGS or a.startswith("--features=") or a.startswith("-F"): fail(f"{a} refused: the test features come from the dev-dependencies; a feature on the command line changes the resolution of every crate above it") if sub == "test" and not any(a in ("--lib", "--tests", "--example") for a in own): fail("a plain `cargo test` also builds doc tests, bins and examples in a different mode; pass `--lib --tests` (`cl test `)") -def pc_builds(target): - """Feature sets of the pinned crates' builds in the target dir: {crate: {frozenset(features): builds}}.""" +def app_builds(target): + """Feature sets of the `expected_features` crates' builds in the target dir: {crate: {frozenset(features): builds}}.""" found = {} fp = os.path.join(target, "debug", ".fingerprint") if not os.path.isdir(fp): return found for d in os.listdir(fp): m = re.match(r"(.+)-([0-9a-f]{16})$", d) - if not m or m.group(1) not in PC_FEATURES: + if not m or m.group(1) not in APP["expected_features"]: continue for f in os.listdir(os.path.join(fp, d)): if not (f.startswith("lib-") and f.endswith(".json")): @@ -481,13 +493,14 @@ def pc_builds(target): return found -def pc_doctor(top, packages, quiet=False): - """The 11 packages exist; unless `quiet`, the target holds one build of each pinned crate with the expected features.""" - problems = [f"{p}: not a package of this workspace; the selection of every cl command names it" for p in PC_SELECTION if p not in packages] +def app_doctor(top, packages, quiet=False): + """The selected packages exist; unless `quiet`, the target holds one build of each `expected_features` crate, with + those features.""" + problems = [f"{p}: not a package of this workspace; the selection of every cl command names it" for p in APP["selection"] if p not in packages] if not quiet: target = target_dir(top, dict(os.environ)) - for crate, sets in sorted(pc_builds(target).items()): - expected = PC_FEATURES[crate] + for crate, sets in sorted(app_builds(target).items()): + expected = APP["expected_features"][crate] if len(sets) > 1: problems.append(f"{target}: {len(sets)} builds of {crate} with different features: " + " | ".join(",".join(sorted(f)) or "-" for f in sets) + "; a second copy of everything above it came with them") @@ -497,11 +510,12 @@ def pc_doctor(top, packages, quiet=False): for problem in problems: print(f"cl doctor: {problem}", file=sys.stderr) if not problems and not quiet: - print("cl doctor: the 11 packages exist and the target holds one build of each pinned crate", file=sys.stderr) + print(f"cl doctor: the {len(APP['selection'])} selected packages exist and the target holds one build of each " + "expected_features crate", file=sys.stderr) return len(problems) -def pc_shards(names, n=PC_SHARDS): +def app_shards(names, n): """Splits a test binary's tests into `n` shards of about the same size by module. Returns [(filters, skips)]: shard i runs the tests matching its filters and none of its skips (libtest filters are substrings); the last shard has no filter and skips every other shard's, so each test runs exactly once. None when no exact split is found.""" @@ -546,11 +560,11 @@ def pc_shards(names, n=PC_SHARDS): return plan if len(plan) > 1 else None -def pc_times_path(target): +def app_times_path(target): return os.path.join(target, "cl-test-times.json") -def pc_run_one(job, env, runner, target_args): +def app_run_one(job, env, runner, target_args): """Runs one binary (or shard) and returns (job, return code, seconds, output).""" cmd = shlex.split(runner) + [job["exe"]] + target_args + job["args"] started = time.time() @@ -558,7 +572,7 @@ def pc_run_one(job, env, runner, target_args): return job, proc.returncode, time.time() - started, proc.stdout -def pc_parse(output): +def app_parse(output): """(passed, failed, failed test names, overflowed stacks) from a libtest output.""" passed = failed = 0 for m in re.finditer(r"^test result: [A-Za-z]+\. (\d+) passed; (\d+) failed", output, re.M): @@ -570,24 +584,28 @@ def pc_parse(output): return passed, failed, names, output.count("overflowed its stack") -def pc_test(top, packages, rest): +def app_test(top, packages, rest): if not rest: fail("cl test [--unit] [--no-run] [cargo args] [-- test args]") name, args = rest[0], rest[1:] mine, theirs = (args[:args.index("--")], args[args.index("--") + 1:]) if "--" in args else (args, []) unit, no_run = "--unit" in mine, "--no-run" in mine mine = [a for a in mine if a not in ("--unit", "--no-run")] - only = None if name == "all" else pc_package(name) - build = ["test", "--no-run", "--message-format=json-render-diagnostics", "--lib"] + ([] if unit else ["--tests"]) + ["--no-fail-fast"] + pc_selected() + mine + only = None if name == "all" else app_package(name) + build = ["test", "--no-run", "--message-format=json-render-diagnostics", "--lib"] + ([] if unit else ["--tests"]) + ["--no-fail-fast"] + app_selected() + mine rc, target, messages = cargo(top, build, json_out=True) if rc != 0: sys.exit(rc) - env = pc_env(dict(os.environ)) - runner = env.get("CL_PC_RUNNER", "") + env = app_env(dict(os.environ)) + runner = env.get("CL_RUNNER", "") + filtered = any(not a.startswith("-") for a in theirs) + threads = APP["test_threads"] + thread_args = [] if threads is None or any(a.startswith("--test-threads") for a in theirs) else ["--test-threads", str(threads)] + slots = APP["run_slots"] if DRY_RUN: - print(f"cl: would run {only or 'every binary'}{' through `' + runner + '`' if runner else ''} ({PC_RUN_SLOTS} at a time, longest first), " - f"arguments: {' '.join(theirs)} --test-threads {PC_TEST_THREADS}" - + ("" if any(not a.startswith("-") for a in theirs) else "; the photocraft-ui-egui lib binary in 3 shards"), file=sys.stderr) + shards = "" if filtered else "".join(f"; {k} in {n} shards" for k, n in APP["shard"].items() if not only or k.split("/")[0] == only) + print(f"cl: would run {only or 'every binary'}{' through `' + runner + '`' if runner else ''} ({slots} at a time, longest first), " + f"arguments: {' '.join(theirs + thread_args)}{shards}", file=sys.stderr) sys.exit(0) by_manifest = {p["manifest_path"]: p["name"] for p in packages.values()} binaries = [] @@ -595,7 +613,7 @@ def pc_test(top, packages, rest): if m.get("reason") != "compiler-artifact" or not m.get("executable") or not m["profile"]["test"]: continue package = by_manifest.get(m["manifest_path"], "") - if package not in PC_SELECTION or (only and package != only): + if package not in APP["selection"] or (only and package != only): continue lib = any(k in ("lib", "rlib", "proc-macro") for k in m["target"]["kind"]) binaries.append((package, m["target"]["name"], lib, m["executable"], os.path.dirname(m["manifest_path"]))) @@ -607,40 +625,47 @@ def pc_test(top, packages, rest): sys.exit(0) run_env = dict(env) run_env.setdefault("RUST_BACKTRACE", "1") - filtered = any(not a.startswith("-") for a in theirs) - thread_args = [] if any(a.startswith("--test-threads") for a in theirs) else ["--test-threads", PC_TEST_THREADS] try: - times = json.load(open(pc_times_path(target))) + times = json.load(open(app_times_path(target))) except (OSError, ValueError): times = {} jobs = [] for package, tname, lib, exe, cwd in binaries: job_env = dict(run_env, CARGO_MANIFEST_DIR=cwd, CARGO_PKG_NAME=package) key = f"{package}/{tname}" - base = {"exe": exe, "cwd": cwd, "env": job_env, "label": f"{package.removeprefix('photocraft-') if package != 'photocraft' else package} {'lib' if lib else tname}", "key": key, "args": list(theirs)} + base = {"exe": exe, "cwd": cwd, "env": job_env, "label": f"{package} {'lib' if lib else tname}", "key": key, "args": list(theirs)} plan = None - if package == PC_MARKER and lib and not filtered: + shards = int(APP["shard"].get(key, 1)) + if shards > 1 and not filtered: listing = subprocess.run([exe, "--list", "--format", "terse"], cwd=cwd, env=job_env, capture_output=True, text=True, errors="replace") tests = [l[:-len(": test")] for l in listing.stdout.splitlines() if l.endswith(": test")] - plan = pc_shards(tests) if listing.returncode == 0 and tests else None + plan = app_shards(tests, shards) if listing.returncode == 0 and tests else None if plan: for i, (filters, skips) in enumerate(plan): extra = filters + [x for k in skips for x in ("--skip", k)] jobs.append(dict(base, key=f"{key}#{i}", label=f"{base['label']} shard {i + 1}/{len(plan)}", args=extra + list(theirs))) else: jobs.append(base) - jobs.sort(key=lambda j: -times.get(j["key"], PC_DEFAULT_SECONDS.get(j["key"].split("#")[0], 0.0) / (PC_SHARDS if "#" in j["key"] else 1))) + + def expected_seconds(job): + key = job["key"] + if key in times: + return times[key] + whole = key.split("#")[0] + return APP["default_seconds"].get(whole, 0.0) / (int(APP["shard"].get(whole, 1)) if "#" in key else 1) + + jobs.sort(key=lambda j: -expected_seconds(j)) started = time.time() tests_passed = tests_failed = overflows = 0 failures = [] new_times = dict(times) def work(job): - return pc_run_one(job, job["env"], runner, thread_args) + return app_run_one(job, job["env"], runner, thread_args) - with ThreadPoolExecutor(max_workers=PC_RUN_SLOTS) as pool: + with ThreadPoolExecutor(max_workers=slots) as pool: for job, code, seconds, output in pool.map(work, jobs): - passed, failed, names, overflowed = pc_parse(output) + passed, failed, names, overflowed = app_parse(output) tests_passed, tests_failed, overflows = tests_passed + passed, tests_failed + failed, overflows + overflowed new_times[job["key"]] = seconds bad = code != 0 @@ -652,7 +677,7 @@ def pc_test(top, packages, rest): wall = time.time() - started RECORD["run"] = wall try: - json.dump(new_times, open(pc_times_path(target), "w")) + json.dump(new_times, open(app_times_path(target), "w")) except OSError: pass print(f"cl: {tests_passed} passed, {tests_failed} failed, {len(jobs)} binaries, {overflows} overflowed stacks, {wall:.0f} s", file=sys.stderr) @@ -661,7 +686,7 @@ def pc_test(top, packages, rest): sys.exit(1 if failures else 0) -def pc_main(top, packages, command, rest): +def app_main(top, packages, command, rest): if command == "cargo": run(top, rest, timings=False) if command in ("features", "render"): @@ -670,17 +695,17 @@ def pc_main(top, packages, command, rest): fail(f"cl {command} [args]") name, args = rest[0], rest[1:] if command == "test": - pc_test(top, packages, rest) + app_test(top, packages, rest) if command == "check": - pc_package(name) - run(top, ["check", "--lib", "--tests"] + pc_selected() + args) - if command == "build" and name == "snapshot": + app_package(name) + run(top, ["check", "--lib", "--tests"] + app_selected() + args) + if command == "build": # An example builds in the dev profile with the dev-dependencies' features, the units the test build resolved. - rc, target, _ = cargo(top, ["test", "--no-run", "--example", "snapshot"] + pc_selected() + args) + rc, target, _ = cargo(top, ["test", "--no-run", "--example", name] + app_selected() + args) if rc == 0: - print(f"cl: {os.path.join(target, 'debug', 'examples', 'snapshot')}", file=sys.stderr) + print(f"cl: {os.path.join(target, 'debug', 'examples', name)}", file=sys.stderr) sys.exit(rc) - fail("cl build snapshot is the only PhotoCraft build; `cl test ` builds the tests") + fail(f"unknown command {command}; see cl --help") def run(top, cargo_args, then=None, timings=True): @@ -706,15 +731,15 @@ def main(): sys.exit(0) command, rest = sys.argv[1], sys.argv[2:] top = worktree() - packages = metadata(top) - global PHOTOCRAFT - PHOTOCRAFT = is_photocraft(packages) + packages, table = metadata(top) + global APP + APP = None if table is None else app_config(table) if command == "doctor": sys.exit(1 if doctor(top, packages) else 0) - if doctor(top, packages, quiet=True) and PHOTOCRAFT: + if doctor(top, packages, quiet=True) and APP: sys.exit(1) - if PHOTOCRAFT: - pc_main(top, packages, command, rest) + if APP: + app_main(top, packages, command, rest) if command == "cargo": run(top, rest, timings=False) if command == "features":