From ba1d532b61e0e33da3adfe0d4719550c3152b4e4 Mon Sep 17 00:00:00 2001 From: mjnitz02 Date: Wed, 18 Nov 2026 11:34:33 -0500 Subject: [PATCH 1/3] Ensure we don't have backwards compatibility regressions on accident --- .github/PULL_REQUEST_TEMPLATE.md | 7 ++ AGENTS.md | 3 +- CHANGELOG.md | 4 + CONTRIBUTING.md | 30 ++++- .../column-equivariant.outputs.pt | Bin 0 -> 5222 bytes .../released_layouts/column-equivariant.pt | Bin 0 -> 41973 bytes .../jointfm_1/released_layouts/column-slot.pt | Bin 0 -> 42374 bytes .../model/jointfm_1/test_released_layouts.py | 104 ++++++++++++++++++ 8 files changed, 142 insertions(+), 6 deletions(-) create mode 100644 tests/model/jointfm_1/released_layouts/column-equivariant.outputs.pt create mode 100644 tests/model/jointfm_1/released_layouts/column-equivariant.pt create mode 100644 tests/model/jointfm_1/released_layouts/column-slot.pt create mode 100644 tests/model/jointfm_1/test_released_layouts.py diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index d0fdbee..45ed92b 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -4,3 +4,10 @@ ## Rationale + + +## Compatibility + + +- Stops a released checkpoint from loading, or changes what it predicts: yes / no +- Stops a documented request from working, or changes its response: yes / no diff --git a/AGENTS.md b/AGENTS.md index 013c405..829a557 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -19,7 +19,8 @@ Dependencies point one way: this project depends only on public packages and nev ## Engineering -- **Fail fast.** No silent fallbacks, no compatibility paths, no deprecation flags, no `try/except` that swallows or rewrites errors. Exceptions are for IO and races; otherwise re-raise. +- **Fail fast.** No silent fallbacks and no `try/except` that swallows or rewrites errors. Exceptions are for IO and races; otherwise re-raise. +- **Released exports keep working.** Every released JointFM 1 checkpoint keeps loading and predicting as it did, and every documented request keeps working. Code that keeps an older layout loading is required, not a fallback. A change that cannot keep one working is a deprecation and follows "Compatibility of released exports" in [CONTRIBUTING.md](CONTRIBUTING.md); never retire one on your own. - **Ground in facts.** Before planning, claiming, or editing, read the relevant source, configuration, docs, and test output, and act only on beliefs backed by something just read or run. - **Commands.** Run ad-hoc Python and CLI commands through `task run -- `, never bare `python` or hand-written `uv run`, so no invocation re-resolves the `.venv` or `uv.lock` by accident. Explain in one sentence what each command does and why before running it. - **Taskfile targets** print an explicit `OK:` or `FAIL:` line; success is never inferred from silence. diff --git a/CHANGELOG.md b/CHANGELOG.md index c7b2cd6..3c1437c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -42,6 +42,10 @@ ## v0.3.0 (2026-11-06) +### BREAKING CHANGE + +- JointFM 1 checkpoints exported for `v0.2.0` and earlier no longer load. They still carry format version 1, so the load fails on their parameter names and shapes. Re-export the checkpoint, or serve it with `v0.2.0`. + ### Feat - add release management tasks and update pyproject.toml for changelog handling (#23) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index afb8d88..15f7283 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -93,11 +93,31 @@ layout, is refused before a backend is resolved: marker to a serving backend through the `jointfm_inference.backends` entry-point group and fails at load when no installed distribution registers it. This distribution registers `jointfm-1`. -The format version covers this mapping, not the network inside it: the parameter names and shapes -of `model_state` belong to the generation's network, which loads them with `strict=True`. A state -dict written for another layout of that network is refused at load with an error that names every -missing, unexpected, and reshaped parameter. The JointFM 1 network holds no parameter indexed by a -column's position, so permuting a request's columns permutes every per-column output. +The format version covers this mapping and the network inside it: the parameter names, shapes, and +meaning of `model_state` are part of the format, and the network loads them with `strict=True`. The +JointFM 1 network holds no parameter indexed by a column's position, so permuting a request's +columns permutes every per-column output. + +### Compatibility of released exports + +JointFM 1 is released, and people hold its serving exports. Every change keeps each released export +loading and predicting as it did, and keeps each documented request working. A new setting or +parameter is optional, and an export without it behaves as before. + +A change that cannot keep a released export loading is a deprecation, not a refactor. It needs: + +- the maintainers' approval before it merges; +- a higher `CHECKPOINT_FORMAT_VERSION`, so the exports it drops are told apart by their version; +- a refusal of the retired version, raised before any parameter is loaded, that names the file's + version, the versions this runner reads, and what the holder does next; +- a notice in `CHANGELOG.md` at least 90 days before the release that drops support. + +One layout was dropped before this policy: exports written for `v0.2.0` and earlier do not load +from `v0.3.0` on, and are refused with the strict-load error that names their parameters. + +`tests/model/jointfm_1/released_layouts/` holds a tiny synthetic export of each released layout, +written by the release that introduced it and never regenerated. Its test fails when a supported +export stops loading or predicts differently, and when a layout is retired without a version bump. ## Keeping the repository publishable diff --git a/tests/model/jointfm_1/released_layouts/column-equivariant.outputs.pt b/tests/model/jointfm_1/released_layouts/column-equivariant.outputs.pt new file mode 100644 index 0000000000000000000000000000000000000000..6fbd42bcebf24d39fb00173f18f464090e1aa0d9 GIT binary patch literal 5222 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 Gb^iy#1_ZPK literal 0 HcmV?d00001 diff --git a/tests/model/jointfm_1/released_layouts/column-equivariant.pt b/tests/model/jointfm_1/released_layouts/column-equivariant.pt new file mode 100644 index 0000000000000000000000000000000000000000..8d7d7d58069b046705b76f7e306b05bfeb804866 GIT binary patch literal 41973 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 literal 0 HcmV?d00001 diff --git a/tests/model/jointfm_1/released_layouts/column-slot.pt b/tests/model/jointfm_1/released_layouts/column-slot.pt new file mode 100644 index 0000000000000000000000000000000000000000..1bd8a825628fcac8dd067d72a2d01fc0aa65c176 GIT binary patch literal 42374 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 vf1@9t{r79# dict: + return read_checkpoint_file(str(LAYOUTS / f"{layout}.pt")) + + +def _format_version(layout: str) -> int: + return _export(layout)[CHECKPOINT_RUNTIME_METADATA_KEY][ + CHECKPOINT_FORMAT_VERSION_KEY + ] + + +def test_every_frozen_export_is_declared_supported_or_retired() -> None: + frozen = {path.stem for path in LAYOUTS.glob("*.pt")} - { + f"{layout}.outputs" for layout in SUPPORTED + } + assert frozen == SUPPORTED.keys() | RETIRED.keys() + assert not SUPPORTED.keys() & RETIRED.keys() + + +def test_the_current_format_version_has_a_frozen_export() -> None: + assert CHECKPOINT_FORMAT_VERSION in {_format_version(name) for name in SUPPORTED} + + +@pytest.mark.parametrize("layout", sorted(SUPPORTED)) +def test_a_supported_layout_loads_and_predicts_what_it_did_when_frozen( + layout: str, +) -> None: + model, _ = load_model_from_checkpoint(_export(layout)) + frozen = torch.load(LAYOUTS / f"{layout}.outputs.pt", weights_only=True) + + with torch.no_grad(): + outputs = model(frozen["past"], frozen["horizons"]) + + assert outputs.keys() == frozen["outputs"].keys() + for key, expected in frozen["outputs"].items(): + torch.testing.assert_close(outputs[key], expected, msg=key) + + +@pytest.mark.parametrize("layout", sorted(RETIRED)) +@pytest.mark.xfail( + strict=True, + reason="the column-slot layout was dropped before format versions covered " + "the network, so it shares version 1 with the current layout", +) +def test_a_retired_layout_is_refused_for_its_format_version(layout: str) -> None: + version = _format_version(layout) + assert version < CHECKPOINT_FORMAT_VERSION + + with pytest.raises( + ValueError, + match=( + f"unsupported checkpoint format version {version}; this runner reads " + f"version {CHECKPOINT_FORMAT_VERSION}" + ), + ): + load_model_from_checkpoint(_export(layout)) From 85b846f7cdbdaad7e8ff2f59df32d52b6bbf23fb Mon Sep 17 00:00:00 2001 From: mjnitz02 Date: Wed, 18 Nov 2026 11:46:04 -0500 Subject: [PATCH 2/3] Split backwards compatibility into its own test structure --- .github/workflows/backward-compatibility.yml | 61 ++++++++ .github/workflows/ci.yml | 3 +- .pre-commit-config.yaml | 7 + CONTRIBUTING.md | 9 +- Taskfile.yml | 17 ++- tests/compatibility/README.md | 56 +++++++ .../column-equivariant.outputs.pt | Bin .../column-equivariant.pt | Bin .../jointfm_1_checkpoints}/column-slot.pt | Bin .../test_jointfm_1_checkpoints.py | 142 ++++++++++++++++++ .../model/jointfm_1/test_released_layouts.py | 104 ------------- 11 files changed, 289 insertions(+), 110 deletions(-) create mode 100644 .github/workflows/backward-compatibility.yml create mode 100644 tests/compatibility/README.md rename tests/{model/jointfm_1/released_layouts => compatibility/jointfm_1_checkpoints}/column-equivariant.outputs.pt (100%) rename tests/{model/jointfm_1/released_layouts => compatibility/jointfm_1_checkpoints}/column-equivariant.pt (100%) rename tests/{model/jointfm_1/released_layouts => compatibility/jointfm_1_checkpoints}/column-slot.pt (100%) create mode 100644 tests/compatibility/test_jointfm_1_checkpoints.py delete mode 100644 tests/model/jointfm_1/test_released_layouts.py diff --git a/.github/workflows/backward-compatibility.yml b/.github/workflows/backward-compatibility.yml new file mode 100644 index 0000000..26d0d46 --- /dev/null +++ b/.github/workflows/backward-compatibility.yml @@ -0,0 +1,61 @@ +# Its own workflow so a broken released checkpoint fails a check named for it. +# No paths filter: a required check must start on every pull request. +name: Backward compatibility + +on: + pull_request: + push: + branches: [main] + +concurrency: + group: backward-compatibility-${{ github.ref }} + cancel-in-progress: ${{ github.event_name == 'pull_request' }} + +permissions: + contents: read + +jobs: + jointfm-1-checkpoints: + name: Released JointFM 1 checkpoints still load + runs-on: ubuntu-latest + timeout-minutes: 15 + steps: + - name: Checkout + uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 + + - name: Install Task + uses: arduino/setup-task@c0bc642852239c2689f73f4ea6459c29405f3c52 # v3.0.0 + with: + version: 3.x + repo-token: ${{ secrets.GITHUB_TOKEN }} + + - name: Install uv with cache + uses: astral-sh/setup-uv@68559e99cc807c1eb7e9238fd43a15bba460eec2 # v10.3.3 + with: + version: "0.10.12" + python-version: "3.13.3" + enable-cache: true + cache-dependency-glob: | + uv.lock + pyproject.toml + + - name: Sync project dependencies + run: uv sync --locked --all-groups + + - name: Load and predict with every released checkpoint layout + run: task test:compatibility + + - name: Explain the failure + if: failure() + run: | + echo "::error title=Backward compatibility broken::This change stops a released JointFM 1 checkpoint from loading or changes what it predicts. See tests/compatibility/README.md." + { + echo "## Backward compatibility broken" + echo + echo "This change stops a JointFM 1 checkpoint that people hold from loading, or changes what it predicts." + echo + echo "- Do not regenerate the frozen checkpoints or edit the expected outputs to make this pass." + echo "- Keep the old layout loading, or treat the change as a deprecation: it needs the maintainers' approval, a higher \`CHECKPOINT_FORMAT_VERSION\`, a clear refusal, and notice." + echo + echo "Details: \`tests/compatibility/README.md\` and \"Compatibility of released exports\" in \`CONTRIBUTING.md\`." + } >> "$GITHUB_STEP_SUMMARY" diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c76b44f..d76b69c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -59,9 +59,10 @@ jobs: # macOS runners ship without docker, which the skywalking-eyes # hook needs; the Ubuntu job checks the license headers. + # backward-compatibility runs in its own workflow so its failure is named. - name: Run task pre-commit env: - SKIP: ${{ runner.os == 'macOS' && 'insert-license' || '' }} + SKIP: ${{ runner.os == 'macOS' && 'insert-license,backward-compatibility' || 'backward-compatibility' }} run: task pre-commit - name: Build distribution diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 22d887b..4fe59ab 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -72,3 +72,10 @@ repos: language: system pass_filenames: false always_run: true + # CI skips this hook and runs it as the Backward compatibility workflow. + - id: backward-compatibility + name: backward compatibility of released JointFM 1 checkpoints + entry: task test:compatibility + language: system + pass_filenames: false + always_run: true diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 15f7283..cd404e1 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -37,6 +37,7 @@ Run `task pre-commit` and fix every reported issue before opening a pull request | `task run -- ` | Run a command inside the project environment | | `task test` | Run the unit tests | | `task coverage` | Run the unit tests and enforce the coverage floor | +| `task test:compatibility` | Check that every released JointFM 1 checkpoint layout still loads and predicts the same; CI runs it as the Backward compatibility check | | `task check` | Read-only static checks: typos, Ruff lint and format check, ty, OpenAPI document check | | `task license-check` | Fail when a Python file lacks the license header (needs docker) | | `task license-fix` | Add the license header to every Python file that lacks it (needs docker) | @@ -115,9 +116,11 @@ A change that cannot keep a released export loading is a deprecation, not a refa One layout was dropped before this policy: exports written for `v0.2.0` and earlier do not load from `v0.3.0` on, and are refused with the strict-load error that names their parameters. -`tests/model/jointfm_1/released_layouts/` holds a tiny synthetic export of each released layout, -written by the release that introduced it and never regenerated. Its test fails when a supported -export stops loading or predicts differently, and when a layout is retired without a version bump. +`tests/compatibility/` holds a tiny synthetic export of each released layout, written by the release +that introduced it and never regenerated, and the tests that load them. They run as the separate +**Backward compatibility** check (`task test:compatibility`), which fails when a supported export +stops loading or predicts differently, and when a layout is retired without a version bump. Its +README says how to freeze a new layout. ## Keeping the repository publishable diff --git a/Taskfile.yml b/Taskfile.yml index 41b2335..b2bf724 100644 --- a/Taskfile.yml +++ b/Taskfile.yml @@ -14,6 +14,8 @@ vars: # Starting an xdist worker imports torch, so beyond a few workers # startup outweighs the parallel test time. TEST_MAX_WORKERS: '{{.TEST_MAX_WORKERS | default "8"}}' + # Run only by test:compatibility, so their failure is reported as its own check. + COMPATIBILITY_TESTS: tests/compatibility # The committed OpenAPI document, shipped as package data. OPENAPI_PATH: src/jointfm_inference/model/service/wire_schema/openapi.json # Shared opening of every deploy:* target: install the Pulumi program's @@ -211,17 +213,28 @@ tasks: test: desc: Run the unit test suite cmd: | - if uv run pytest -n auto --maxprocesses={{.TEST_MAX_WORKERS}} {{.CLI_ARGS}}; then + if uv run pytest -n auto --maxprocesses={{.TEST_MAX_WORKERS}} --ignore={{.COMPATIBILITY_TESTS}} {{.CLI_ARGS}}; then echo "OK: tests passed" else echo "FAIL: tests failed" exit 1 fi + # A separate check, so a broken released checkpoint is reported by name. + test:compatibility: + desc: Check that every released JointFM 1 checkpoint layout still loads and predicts the same + cmd: | + if uv run pytest -v -rxX -p no:cacheprovider {{.COMPATIBILITY_TESTS}}; then + echo "OK: every released JointFM 1 checkpoint layout still loads and predicts the same" + else + echo "FAIL: backward compatibility broken; see {{.COMPATIBILITY_TESTS}}/README.md" + exit 1 + fi + coverage: desc: Run the unit test suite with coverage enforcement cmd: | - if uv run pytest -q -n auto --maxprocesses={{.TEST_MAX_WORKERS}} -p no:cacheprovider --cov=jointfm_inference --cov-report=term-missing:skip-covered --cov-fail-under={{.COVERAGE_FAIL_UNDER}}; then + if uv run pytest -q -n auto --maxprocesses={{.TEST_MAX_WORKERS}} -p no:cacheprovider --ignore={{.COMPATIBILITY_TESTS}} --cov=jointfm_inference --cov-report=term-missing:skip-covered --cov-fail-under={{.COVERAGE_FAIL_UNDER}}; then echo "OK: tests passed with coverage at or above {{.COVERAGE_FAIL_UNDER}}%" else echo "FAIL: tests failed or coverage is below {{.COVERAGE_FAIL_UNDER}}%" diff --git a/tests/compatibility/README.md b/tests/compatibility/README.md new file mode 100644 index 0000000..e5b68ae --- /dev/null +++ b/tests/compatibility/README.md @@ -0,0 +1,56 @@ +# Backward compatibility tests + +People hold JointFM 1 checkpoints exported for earlier releases of this runner. These tests prove +that every one of those checkpoint layouts still loads and still predicts what it did. They run as +their own check, **Backward compatibility**, so a failure is named for what it is. + +Run them with `task test:compatibility`. `task test` and `task coverage` leave them out, and the +`backward-compatibility` pre-commit hook runs them locally. + +## The frozen checkpoints + +`jointfm_1_checkpoints/` holds tiny JointFM 1 checkpoints with random weights. Each was written by +the release that introduced its layout, and none is ever regenerated: a regenerated file is written +by the current code, so it proves nothing about older files. + +| File | Holds | +|---|---| +| `.pt` | A complete checkpoint in that layout: `cfg`, `model_state`, `runtime_metadata`, and `inference_metadata` | +| `.outputs.pt` | For a supported layout: a fixed input (`past`, `horizons`) and the network outputs it produced when frozen | + +`test_jointfm_1_checkpoints.py` lists each layout as `SUPPORTED` (must load and match its frozen +outputs) or `RETIRED` (must be refused for its format version). + +| Layout | Written by | Status | +|---|---|---| +| `column-equivariant` | `v0.3.0` and later | Supported | +| `column-slot` | `v0.2.0` and earlier | Retired before this policy, so it still carries format version 1; its refusal test is an expected failure | + +## When a test fails + +The change breaks a checkpoint someone may hold. Do not edit the frozen files, the expected outputs, +or the `SUPPORTED` list to make the test pass. Either keep the old layout loading, or treat the +change as a deprecation and follow "Compatibility of released exports" in `CONTRIBUTING.md`, which +needs the maintainers' approval, a higher `CHECKPOINT_FORMAT_VERSION`, a clear refusal, and notice. + +## Freezing a new layout + +A change that adds a layout, while keeping the old ones loading, freezes the new one in the same +pull request. Write it with the code of that change: + +```sh +task run -- python -c " +import torch +from tests.support.models import checkpoint_mapping, tiny_model +model = tiny_model(seed=0) +torch.save(checkpoint_mapping(model), 'tests/compatibility/jointfm_1_checkpoints/.pt') +generator = torch.Generator().manual_seed(0) +past, horizons = torch.randn(2, 8, 3, generator=generator), torch.arange(4) +with torch.no_grad(): + outputs = model(past, horizons) +torch.save({'past': past, 'horizons': horizons, 'outputs': dict(outputs)}, + 'tests/compatibility/jointfm_1_checkpoints/.outputs.pt') +" +``` + +Then add the layout to `SUPPORTED` with the release that first writes it. diff --git a/tests/model/jointfm_1/released_layouts/column-equivariant.outputs.pt b/tests/compatibility/jointfm_1_checkpoints/column-equivariant.outputs.pt similarity index 100% rename from tests/model/jointfm_1/released_layouts/column-equivariant.outputs.pt rename to tests/compatibility/jointfm_1_checkpoints/column-equivariant.outputs.pt diff --git a/tests/model/jointfm_1/released_layouts/column-equivariant.pt b/tests/compatibility/jointfm_1_checkpoints/column-equivariant.pt similarity index 100% rename from tests/model/jointfm_1/released_layouts/column-equivariant.pt rename to tests/compatibility/jointfm_1_checkpoints/column-equivariant.pt diff --git a/tests/model/jointfm_1/released_layouts/column-slot.pt b/tests/compatibility/jointfm_1_checkpoints/column-slot.pt similarity index 100% rename from tests/model/jointfm_1/released_layouts/column-slot.pt rename to tests/compatibility/jointfm_1_checkpoints/column-slot.pt diff --git a/tests/compatibility/test_jointfm_1_checkpoints.py b/tests/compatibility/test_jointfm_1_checkpoints.py new file mode 100644 index 0000000..fcdf548 --- /dev/null +++ b/tests/compatibility/test_jointfm_1_checkpoints.py @@ -0,0 +1,142 @@ +# Copyright 2026 DataRobot, Inc. and its affiliates. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +"""Backward compatibility: every released JointFM 1 checkpoint layout keeps loading. + +People hold JointFM 1 checkpoints exported for earlier releases of this +runner. A failure here means this change stops one of them from loading or +changes what it predicts. Fixing the test is never the remedy: restore the old +behavior, or follow "Compatibility of released exports" in CONTRIBUTING.md, +which needs the maintainers' approval. See README.md beside this file. +""" + +from pathlib import Path +from typing import Any + +import pytest +import torch + +from jointfm_inference.model.checkpoint import ( + CHECKPOINT_FORMAT_VERSION, + CHECKPOINT_FORMAT_VERSION_KEY, + CHECKPOINT_RUNTIME_METADATA_KEY, + read_checkpoint_file, +) +from jointfm_inference.model.jointfm_1.loader import load_model_from_checkpoint + +CHECKPOINTS = Path(__file__).parent / "jointfm_1_checkpoints" +OUTPUTS_SUFFIX = ".outputs" + +# Layout name to the first release that wrote it. Each loads and predicts its frozen outputs. +SUPPORTED = {"column-equivariant": "v0.3.0"} +# Layout name to the last release that read it. Each is refused for its format version. +RETIRED = {"column-slot": "v0.2.0"} + +BROKEN = ( + "BACKWARD COMPATIBILITY BROKEN: a released JointFM 1 checkpoint ({layout}, " + "first written by {release}) {what}. Restore the old behavior, or follow " + "'Compatibility of released exports' in CONTRIBUTING.md. Never regenerate " + "the frozen files to make this pass." +) + + +def _checkpoint(layout: str) -> dict[str, Any]: + return read_checkpoint_file(str(CHECKPOINTS / f"{layout}.pt")) + + +def _format_version(layout: str) -> int: + return _checkpoint(layout)[CHECKPOINT_RUNTIME_METADATA_KEY][ + CHECKPOINT_FORMAT_VERSION_KEY + ] + + +def test_every_frozen_checkpoint_is_declared_supported_or_retired() -> None: + frozen = { + path.stem + for path in CHECKPOINTS.glob("*.pt") + if not path.stem.endswith(OUTPUTS_SUFFIX) + } + assert frozen == SUPPORTED.keys() | RETIRED.keys(), ( + "Every file in jointfm_1_checkpoints/ must be listed in SUPPORTED or " + "RETIRED, and every listed layout must have its file. Deleting a file " + "does not retire a layout." + ) + assert not SUPPORTED.keys() & RETIRED.keys() + + +def test_the_current_format_version_has_a_frozen_checkpoint() -> None: + versions = {_format_version(layout) for layout in SUPPORTED} + assert CHECKPOINT_FORMAT_VERSION in versions, ( + f"CHECKPOINT_FORMAT_VERSION is {CHECKPOINT_FORMAT_VERSION}, but no " + "supported frozen checkpoint carries it. Freeze one with the release " + "that introduces the version (see README.md beside this file)." + ) + + +@pytest.mark.parametrize("layout", sorted(SUPPORTED)) +def test_a_released_checkpoint_still_loads(layout: str) -> None: + try: + load_model_from_checkpoint(_checkpoint(layout)) + except Exception as error: + pytest.fail( + BROKEN.format( + layout=layout, + release=SUPPORTED[layout], + what=f"no longer loads:\n{error}", + ) + ) + + +@pytest.mark.parametrize("layout", sorted(SUPPORTED)) +def test_a_released_checkpoint_still_predicts_what_it_did(layout: str) -> None: + model, _ = load_model_from_checkpoint(_checkpoint(layout)) + frozen = torch.load( + CHECKPOINTS / f"{layout}{OUTPUTS_SUFFIX}.pt", weights_only=True + ) + + with torch.no_grad(): + outputs = model(frozen["past"], frozen["horizons"]) + + broken = BROKEN.format( + layout=layout, release=SUPPORTED[layout], what="predicts differently" + ) + assert outputs.keys() == frozen["outputs"].keys(), broken + for key, expected in frozen["outputs"].items(): + torch.testing.assert_close( + outputs[key], expected, msg=lambda detail: f"{broken}\n{key}: {detail}" + ) + + +@pytest.mark.parametrize("layout", sorted(RETIRED)) +@pytest.mark.xfail( + strict=True, + reason="the column-slot layout was dropped before format versions covered " + "the network, so it shares version 1 with the current layout", +) +def test_a_retired_checkpoint_is_refused_for_its_format_version(layout: str) -> None: + version = _format_version(layout) + assert version < CHECKPOINT_FORMAT_VERSION, ( + f"The retired {layout} layout carries format version {version}, which " + "this runner still reads. Retiring a layout requires raising " + "CHECKPOINT_FORMAT_VERSION." + ) + + with pytest.raises( + ValueError, + match=( + f"unsupported checkpoint format version {version}; this runner reads " + f"version {CHECKPOINT_FORMAT_VERSION}" + ), + ): + load_model_from_checkpoint(_checkpoint(layout)) diff --git a/tests/model/jointfm_1/test_released_layouts.py b/tests/model/jointfm_1/test_released_layouts.py deleted file mode 100644 index d8fb6b5..0000000 --- a/tests/model/jointfm_1/test_released_layouts.py +++ /dev/null @@ -1,104 +0,0 @@ -# Copyright 2026 DataRobot, Inc. and its affiliates. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -"""Frozen exports of every released JointFM 1 layout keep their promise. - -Every other loader test writes its checkpoint with the current network, so it -round-trips and cannot notice a change to the layout itself. The files in -``released_layouts/`` were written by released versions of the runner and are -never regenerated. A layout is either supported, so its export loads and -predicts what it predicted when it was frozen, or retired, so its export is -refused for its format version. Retiring a layout therefore requires raising -``CHECKPOINT_FORMAT_VERSION`` above the version its exports carry. - -To freeze a layout, save ``checkpoint_mapping(tiny_model(seed=0))`` from -``tests.support.models`` at the release that introduces it. -""" - -from pathlib import Path - -import pytest -import torch - -from jointfm_inference.model.checkpoint import ( - CHECKPOINT_FORMAT_VERSION, - CHECKPOINT_FORMAT_VERSION_KEY, - CHECKPOINT_RUNTIME_METADATA_KEY, - read_checkpoint_file, -) -from jointfm_inference.model.jointfm_1.loader import load_model_from_checkpoint - -LAYOUTS = Path(__file__).parent / "released_layouts" - -# Layout name to the first release that wrote it. -SUPPORTED = {"column-equivariant": "v0.3.0"} -# Layout name to the last release that read it. -RETIRED = {"column-slot": "v0.2.0"} - - -def _export(layout: str) -> dict: - return read_checkpoint_file(str(LAYOUTS / f"{layout}.pt")) - - -def _format_version(layout: str) -> int: - return _export(layout)[CHECKPOINT_RUNTIME_METADATA_KEY][ - CHECKPOINT_FORMAT_VERSION_KEY - ] - - -def test_every_frozen_export_is_declared_supported_or_retired() -> None: - frozen = {path.stem for path in LAYOUTS.glob("*.pt")} - { - f"{layout}.outputs" for layout in SUPPORTED - } - assert frozen == SUPPORTED.keys() | RETIRED.keys() - assert not SUPPORTED.keys() & RETIRED.keys() - - -def test_the_current_format_version_has_a_frozen_export() -> None: - assert CHECKPOINT_FORMAT_VERSION in {_format_version(name) for name in SUPPORTED} - - -@pytest.mark.parametrize("layout", sorted(SUPPORTED)) -def test_a_supported_layout_loads_and_predicts_what_it_did_when_frozen( - layout: str, -) -> None: - model, _ = load_model_from_checkpoint(_export(layout)) - frozen = torch.load(LAYOUTS / f"{layout}.outputs.pt", weights_only=True) - - with torch.no_grad(): - outputs = model(frozen["past"], frozen["horizons"]) - - assert outputs.keys() == frozen["outputs"].keys() - for key, expected in frozen["outputs"].items(): - torch.testing.assert_close(outputs[key], expected, msg=key) - - -@pytest.mark.parametrize("layout", sorted(RETIRED)) -@pytest.mark.xfail( - strict=True, - reason="the column-slot layout was dropped before format versions covered " - "the network, so it shares version 1 with the current layout", -) -def test_a_retired_layout_is_refused_for_its_format_version(layout: str) -> None: - version = _format_version(layout) - assert version < CHECKPOINT_FORMAT_VERSION - - with pytest.raises( - ValueError, - match=( - f"unsupported checkpoint format version {version}; this runner reads " - f"version {CHECKPOINT_FORMAT_VERSION}" - ), - ): - load_model_from_checkpoint(_export(layout)) From 35a36ea6dff88219173ad4a97c83b1aa10f28117 Mon Sep 17 00:00:00 2001 From: mjnitz02 Date: Wed, 18 Nov 2026 11:48:32 -0500 Subject: [PATCH 3/3] Ruff --- tests/compatibility/test_jointfm_1_checkpoints.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tests/compatibility/test_jointfm_1_checkpoints.py b/tests/compatibility/test_jointfm_1_checkpoints.py index fcdf548..dbc218e 100644 --- a/tests/compatibility/test_jointfm_1_checkpoints.py +++ b/tests/compatibility/test_jointfm_1_checkpoints.py @@ -101,9 +101,7 @@ def test_a_released_checkpoint_still_loads(layout: str) -> None: @pytest.mark.parametrize("layout", sorted(SUPPORTED)) def test_a_released_checkpoint_still_predicts_what_it_did(layout: str) -> None: model, _ = load_model_from_checkpoint(_checkpoint(layout)) - frozen = torch.load( - CHECKPOINTS / f"{layout}{OUTPUTS_SUFFIX}.pt", weights_only=True - ) + frozen = torch.load(CHECKPOINTS / f"{layout}{OUTPUTS_SUFFIX}.pt", weights_only=True) with torch.no_grad(): outputs = model(frozen["past"], frozen["horizons"])