-
Notifications
You must be signed in to change notification settings - Fork 27
Add validation + compatibility tests for DeepLabCut-live #56
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
deruyter92
wants to merge
20
commits into
master
Choose a base branch
from
jaap/add_compatibility_tests
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 16 commits
Commits
Show all changes
20 commits
Select commit
Hold shift + click to select a range
41db059
dlc_processor: add lightweight validation of shape and dtype (+tests)
deruyter92 4c97d58
Add basic compatibility tests for deeplabcut-live API
deruyter92 1ad9a61
Add optional smoke test for exported dlclive model via env vars
deruyter92 7e4b753
Update dlclivegui/services/dlc_processor.py
deruyter92 d9c0fdf
Update dlclivegui/services/dlc_processor.py
deruyter92 693c931
Update dlclivegui/services/dlc_processor.py
deruyter92 622722b
Remove duplicate commands block from rebase
C-Achard 60a0e8a
Use Python 3.12 in CI testing matrix
C-Achard 990654b
Run pre-commit
C-Achard 882717b
Use PoseBackends enum for backend field
C-Achard e52477f
Update & fix DLCLive compatibility tests
C-Achard 34b8727
Fix hard-coded str to use enum
C-Achard edec653
Ensure tox failure fails CI job rather than silently passing
C-Achard fd17969
Use tox for DLCLive compatibility in CI
C-Achard ebfad63
tests(compat): stub torch module in conftest
C-Achard 5c03b4e
Make camera validation timer cancellable
C-Achard f61f108
Add finite check and improve compatibility tests
C-Achard 0d96b8d
Refactor DLCLive signature checks in tests
C-Achard 16e8b27
tox.ini: skip install for dlclive-github env
C-Achard 524ebc6
Set pytest --confcutdir for compat tests
C-Achard File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| # tests/compat/conftest.py | ||
| import sys | ||
| import types | ||
|
|
||
| # Stub out torch imports to avoid ImportError when torch is not installed in DLCLive package. | ||
| # This allows testing of DLCLive API compatibility without requiring torch. | ||
| # Ideally imports should be guarded in the package itself, but this is a pragmatic solution for now. | ||
| # IMPORTANT NOTE: This should ideally be removed and replaced whenever possible. | ||
| if "torch" not in sys.modules: | ||
|
C-Achard marked this conversation as resolved.
Outdated
|
||
| sys.modules["torch"] = types.ModuleType("torch") | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,128 @@ | ||
| from __future__ import annotations | ||
|
|
||
| import importlib.metadata | ||
| import inspect | ||
| import os | ||
| from pathlib import Path | ||
|
|
||
| import numpy as np | ||
| import pytest | ||
|
|
||
|
|
||
| def _get_signature_params(callable_obj) -> tuple[set[str], bool]: | ||
| """ | ||
| Return allowed keyword names for callable, allowing for **kwargs. | ||
|
|
||
| Example: | ||
| >>> params, accepts_var_kw = _get_signature_params(lambda x, y, **kwargs: None, {"x", "y"}) | ||
| >>> params == {"x", "y"} | ||
| True | ||
| >>> accepts_var_kw | ||
| True | ||
| """ | ||
|
C-Achard marked this conversation as resolved.
|
||
| sig = inspect.signature(callable_obj) | ||
| params = sig.parameters | ||
| accepts_var_kw = any(p.kind == inspect.Parameter.VAR_KEYWORD for p in params.values()) | ||
| return params, accepts_var_kw | ||
|
C-Achard marked this conversation as resolved.
Outdated
|
||
|
|
||
|
|
||
| @pytest.mark.dlclive_compat | ||
| def test_dlclive_package_is_importable(): | ||
| from dlclive import DLCLive # noqa: PLC0415 | ||
|
|
||
| assert DLCLive is not None | ||
| # Helpful for CI logs to confirm matrix install result. | ||
| _ = importlib.metadata.version("deeplabcut-live") | ||
|
|
||
|
|
||
| @pytest.mark.dlclive_compat | ||
| def test_dlclive_constructor_accepts_gui_expected_kwargs(): | ||
| """ | ||
| GUI passes these kwargs when constructing DLCLive. | ||
| This test catches upstream API changes that would break initialization. | ||
| """ | ||
| from dlclive import DLCLive # noqa: PLC0415 | ||
|
|
||
| expected = { | ||
| "model_path", | ||
| "model_type", | ||
| "processor", | ||
| "dynamic", | ||
| "resize", | ||
| "precision", | ||
| "single_animal", | ||
| "device", | ||
| } | ||
| params, _ = _get_signature_params(DLCLive.__init__) | ||
| params = { | ||
| name | ||
| for name, p in params.items() | ||
| if p.kind in (inspect.Parameter.KEYWORD_ONLY, inspect.Parameter.POSITIONAL_OR_KEYWORD) | ||
| } | ||
| missing = {name for name in expected if name not in params} | ||
|
C-Achard marked this conversation as resolved.
Outdated
|
||
| assert not missing, f"DLCLive.__init__ is missing expected kwargs called by GUI: {sorted(missing)}" | ||
|
|
||
|
|
||
| @pytest.mark.dlclive_compat | ||
| def test_dlclive_methods_match_gui_usage(): | ||
| """ | ||
| GUI expects: | ||
| - init_inference(frame) | ||
| - get_pose(frame, frame_time=<float>) | ||
| """ | ||
| from dlclive import DLCLive # noqa: PLC0415 | ||
|
|
||
| assert hasattr(DLCLive, "init_inference"), "DLCLive must provide init_inference(frame)" | ||
| assert hasattr(DLCLive, "get_pose"), "DLCLive must provide get_pose(frame, frame_time=...)" | ||
| # NOTE: frame_time is passed as a kwarg, so we only check for "frame" as a required param. | ||
| # This is used by DLCLive Processor classes, rather than the DLCLive class itself. | ||
|
|
||
| init_params, _ = _get_signature_params(DLCLive.init_inference) | ||
| init_missing = {name for name in {"frame"} if name not in init_params} | ||
| assert not init_missing, f"DLCLive.init_inference signature mismatch, missing: {sorted(init_missing)}" | ||
|
|
||
| get_pose_params, _ = _get_signature_params(DLCLive.get_pose) | ||
| get_pose_missing = {name for name in {"frame"} if name not in get_pose_params} | ||
| assert not get_pose_missing, f"DLCLive.get_pose signature mismatch, missing: {sorted(get_pose_missing)}" | ||
|
C-Achard marked this conversation as resolved.
Outdated
|
||
|
|
||
|
|
||
| @pytest.mark.dlclive_compat | ||
| def test_dlclive_minimal_inference_smoke(): | ||
| """ | ||
| Real runtime smoke test (init + pose call) using a tiny exported model. | ||
|
|
||
| Opt-in via env vars: | ||
| - DLCLIVE_TEST_MODEL_PATH: absolute/relative path to exported model folder/file | ||
| - DLCLIVE_TEST_MODEL_TYPE: optional model type (default: pytorch) | ||
| """ | ||
| model_path_env = os.getenv("DLCLIVE_TEST_MODEL_PATH", "").strip() | ||
| if not model_path_env: | ||
| pytest.skip("Set DLCLIVE_TEST_MODEL_PATH to run real DLCLive inference smoke test.") | ||
|
|
||
| model_path = Path(model_path_env).expanduser() | ||
| if not model_path.exists(): | ||
| pytest.skip(f"DLCLIVE_TEST_MODEL_PATH does not exist: {model_path}") | ||
|
|
||
| model_type = os.getenv("DLCLIVE_TEST_MODEL_TYPE", "pytorch").strip() or "pytorch" | ||
|
|
||
| from dlclive import DLCLive # noqa: PLC0415 | ||
|
|
||
| from dlclivegui.services.dlc_processor import validate_pose_array # noqa: PLC0415 | ||
|
|
||
| dlc = DLCLive( | ||
| model_path=str(model_path), | ||
| model_type=model_type, | ||
| dynamic=[False, 0.5, 10], | ||
| resize=1.0, | ||
| precision="FP32", | ||
| single_animal=True, | ||
| ) | ||
|
|
||
| frame = np.zeros((64, 64, 3), dtype=np.uint8) | ||
| dlc.init_inference(frame) | ||
| pose = dlc.get_pose(frame, frame_time=0.0) | ||
| pose_arr = validate_pose_array(pose, source_backend="DLCLive.get_pose") | ||
|
|
||
| assert pose_arr.ndim in (2, 3) | ||
| assert pose_arr.shape[-1] == 3 | ||
| assert np.isfinite(pose_arr).all() | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.