opensportslib 0.3.1.dev16__tar.gz → 0.3.1.dev18__tar.gz

{opensportslib-0.3.1.dev16/opensportslib.egg-info → opensportslib-0.3.1.dev18}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: opensportslib
-Version: 0.3.1.dev16
+Version: 0.3.1.dev18
 Summary: OpenSportsLib is the professional library, designed for advanced video understanding in sports. It provides state-of-the-art tools for action recognition, spotting, retrieval, and captioning, making it ideal for researchers, analysts, and developers working with sports video data.
 Author: Jeet Vora
 Requires-Python: >=3.12

{opensportslib-0.3.1.dev16 → opensportslib-0.3.1.dev18}/opensportslib/adaptation/spotta.py

@@ -59,6 +59,7 @@ class SpoTTAConfig:
     drift_scale: float = 10.0
     drift_threshold: float = 1.0
     drift_gamma: float = 0.2
+    augmentation: bool = True
 
     @classmethod
     def from_mapping(cls, value: Any) -> "SpoTTAConfig":
@@ -69,6 +70,7 @@ class SpoTTAConfig:
         memory = _mapping(root.get("memory"))
         optimizer = _mapping(root.get("optimizer"))
         teacher = _mapping(root.get("teacher"))
+        augmentation = _mapping(root.get("augmentation"))
 
         _require_supported_value(
             root,
@@ -76,6 +78,34 @@ class SpoTTAConfig:
             "adapt_then_predict",
             "adaptation",
         )
+        _require_supported_value(tether, "mode", "bayesian", "robust_bn.tether")
+        _require_supported_value(
+            gate,
+            "uncertainty",
+            "one_minus_max_probability",
+            "confidence_gate",
+        )
+        _require_supported_value(
+            gate,
+            "aggregation",
+            "min_over_predicted_action_frames",
+            "confidence_gate",
+        )
+        _require_supported_value(optimizer, "type", "Adam", "optimizer")
+        _require_supported_value(
+            optimizer,
+            "trainable_parameters",
+            "batch_norm_affine_only",
+            "optimizer",
+        )
+        _require_supported_value(teacher, "type", "ema", "teacher")
+        _require_supported_value(
+            teacher, "adaptive_from_bn_drift", True, "teacher"
+        )
+        _require_supported_value(
+            augmentation, "mode", "framewise_rotta_strong", "augmentation"
+        )
+
         config = cls(
             alpha=float(robust_bn.get("alpha", cls.alpha)),
             tether_cap=float(tether.get("cap", cls.tether_cap)),
@@ -103,6 +133,7 @@ class SpoTTAConfig:
                 teacher.get("drift_threshold", cls.drift_threshold)
             ),
             drift_gamma=float(teacher.get("drift_gamma", cls.drift_gamma)),
+            augmentation=bool(augmentation.get("enabled", cls.augmentation)),
         )
         config.validate()
         return config
@@ -546,10 +577,13 @@ class SpoTTA:
         with torch.no_grad():
             teacher_logits = _logits(self.teacher(clips))
 
-        batch, time, channels, height, width = clips.shape
-        augmented = self.augmentation(
-            clips.reshape(batch * time, channels, height, width)
-        ).reshape(batch, time, channels, height, width)
+        if self.config.augmentation:
+            batch, time, channels, height, width = clips.shape
+            augmented = self.augmentation(
+                clips.reshape(batch * time, channels, height, width)
+            ).reshape(batch, time, channels, height, width)
+        else:
+            augmented = clips
 
         self.student.train()
         student_logits = _logits(self.student(augmented))

{opensportslib-0.3.1.dev16 → opensportslib-0.3.1.dev18}/opensportslib/cli.py

@@ -10,6 +10,7 @@ def main(argv: Optional[list[str]] = None) -> int:
     parser = argparse.ArgumentParser(prog="opensportslib")
     parser.add_argument("command", choices=["setup"])
     parser.add_argument("--pyg", action="store_true")
+    parser.add_argument("--pyg_extensions", action="store_true")
     parser.add_argument("--dali", action="store_true")
     parser.add_argument("--vqa_xvars", action="store_true")
     parser.add_argument("--vqa_qwen", action="store_true")
@@ -17,12 +18,17 @@ def main(argv: Optional[list[str]] = None) -> int:
     args = parser.parse_args(argv)
 
     if args.command == "setup":
-        setup(
+        setup_kwargs = dict(
             pyg=args.pyg,
             dali=args.dali,
             vqa_xvars=args.vqa_xvars,
-            vqa_qwen=args.vqa_qwen
+            vqa_qwen=args.vqa_qwen,
         )
+        # Preserve the established setup() call contract unless the new,
+        # opt-in extension install was explicitly requested.
+        if args.pyg_extensions:
+            setup_kwargs["pyg_extensions"] = True
+        setup(**setup_kwargs)
         return 0
 
     return 2

{opensportslib-0.3.1.dev16 → opensportslib-0.3.1.dev18}/opensportslib/configs/localization/e2e_spotta.yaml

@@ -39,7 +39,6 @@ DATA:
         resize:
           height: 224
           width: 398
-          preserve_aspect_ratio: true
       params:
         crop_dim: 224
         dilate_len: 0
@@ -70,10 +69,13 @@ MODEL:
       robust_bn:
         alpha: 0.05
         tether:
+          mode: bayesian
           cap: 0.5
       confidence_gate:
         action_class_index: 1
         min_action_frames: 1
+        uncertainty: one_minus_max_probability
+        aggregation: min_over_predicted_action_frames
         threshold: 0.3
       memory:
         capacity: 8
@@ -81,14 +83,21 @@ MODEL:
         lambda_t: 1.0
         lambda_u: 1.0
       optimizer:
+        type: Adam
         learning_rate: 0.001
         beta: 0.9
+        trainable_parameters: batch_norm_affine_only
       teacher:
+        type: ema
         base_nu: 0.001
+        adaptive_from_bn_drift: true
         max_nu: 0.02
         drift_scale: 10.0
         drift_threshold: 1.0
         drift_gamma: 0.2
+      augmentation:
+        enabled: true
+        mode: framewise_rotta_strong
 
 TRAIN:
   execution:

{opensportslib-0.3.1.dev16 → opensportslib-0.3.1.dev18}/opensportslib/setup/setup.py

@@ -16,8 +16,9 @@ LEGACY_GPU_CUDA_WHEEL_MAX_COMPUTE_CAPABILITY = (9, 0)
 CUDA13_REQUIRED_MIN_COMPUTE_CAPABILITY = (10, 0)
 
 # PyG extension wheels are published for a narrower PyTorch matrix than the
-# base PyTorch packages.  Keep this profile explicit: selecting ``--pyg`` is
-# allowed to replace an otherwise newer PyTorch installation.
+# base PyTorch packages.  They are optional: most OpenSportsLib graph paths
+# only need ``torch-geometric`` and must remain usable on platforms where no
+# matching extension wheels are published.
 PYG_TORCH_VERSION = "2.12.1"
 PYG_TORCH_PACKAGES = (
     f"torch=={PYG_TORCH_VERSION}",
@@ -199,7 +200,7 @@ def pyg_wheel_url(torch_version=None, cuda_tag=None):
 
 
 def validate_pyg_wheels():
-    """Ensure every required PyG wheel exists before replacing Torch.
+    """Ensure every optional PyG extension wheel is available before installing it.
 
     ``--only-binary`` is intentional: pip otherwise falls back to a source
     build, which is both slow and incompatible with its isolated build
@@ -246,7 +247,7 @@ def install_dali():
                 "cupy-cuda12x"
             ])
 
-def install_pyg():
+def install_pyg(*, extensions=False):
     import torch
 
     python = sys.executable
@@ -257,23 +258,25 @@ def install_pyg():
             f"profile (PyTorch {PYG_TORCH_VERSION}); found PyTorch {torch_version}. "
             "Run 'opensportslib setup --pyg' so the matching Torch stack is installed."
         )
-    print("\nInstalling Py-Geometric ecosystem...\n")
-    url = pyg_wheel_url(torch_version)
+    print("\nInstalling PyTorch Geometric...\n")
 
     subprocess.check_call([
         python, "-m", "pip", "install", "torch-geometric",
     ])
-    subprocess.check_call([
-        python, "-m", "pip", "install",
-        *PYG_EXTENSION_PACKAGES, "--only-binary=:all:", "-f", url
-    ])
 
-def install_extras(dali=False, pyg=False):
+    if extensions:
+        url = pyg_wheel_url(torch_version)
+        subprocess.check_call([
+            python, "-m", "pip", "install",
+            *PYG_EXTENSION_PACKAGES, "--only-binary=:all:", "-f", url
+        ])
+
+def install_extras(dali=False, pyg=False, pyg_extensions=False):
     if dali:
         install_dali()
         print("NVIDIA DALI installed successfully.")
     if pyg:
-        install_pyg()
+        install_pyg(extensions=pyg_extensions)
         print("PyTorch Geometric installed successfully.")
 
 
@@ -289,11 +292,13 @@ def verify():
     else:
         print("Running on CPU")
 
-def setup(dali=False, pyg=False, vqa_xvars=False, vqa_qwen=False):
-    if pyg:
+def setup(dali=False, pyg=False, pyg_extensions=False, vqa_xvars=False, vqa_qwen=False):
+    if pyg_extensions and not pyg:
+        raise ValueError("--pyg_extensions requires --pyg")
+    if pyg_extensions:
         validate_pyg_wheels()
     install_torch(pyg_compatible=pyg)
-    install_extras(dali=dali, pyg=pyg)
+    install_extras(dali=dali, pyg=pyg, pyg_extensions=pyg_extensions)
     if vqa_xvars:
         install_xvars_dependencies(XVARS_DEPENDENCY_PINS)
     if vqa_qwen:
@@ -310,9 +315,16 @@ if __name__ == "__main__":
     parser = argparse.ArgumentParser()
     parser.add_argument("--dali", action="store_true")
     parser.add_argument("--pyg", action="store_true")
+    parser.add_argument("--pyg_extensions", action="store_true")
     parser.add_argument("--vqa_xvars", action="store_true")
     parser.add_argument("--vqa_qwen", action="store_true")
 
     args = parser.parse_args()
 
-    setup(dali=args.dali, pyg=args.pyg, vqa_xvars=args.vqa_xvars, vqa_qwen=args.vqa_qwen)
+    setup(
+        dali=args.dali,
+        pyg=args.pyg,
+        pyg_extensions=args.pyg_extensions,
+        vqa_xvars=args.vqa_xvars,
+        vqa_qwen=args.vqa_qwen,
+    )

{opensportslib-0.3.1.dev16 → opensportslib-0.3.1.dev18/opensportslib.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: opensportslib
-Version: 0.3.1.dev16
+Version: 0.3.1.dev18
 Summary: OpenSportsLib is the professional library, designed for advanced video understanding in sports. It provides state-of-the-art tools for action recognition, spotting, retrieval, and captioning, making it ideal for researchers, analysts, and developers working with sports video data.
 Author: Jeet Vora
 Requires-Python: >=3.12

{opensportslib-0.3.1.dev16 → opensportslib-0.3.1.dev18}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "opensportslib"
-version = "0.3.1.dev16"
+version = "0.3.1.dev18"
 description = "OpenSportsLib is the professional library, designed for advanced video understanding in sports. It provides state-of-the-art tools for action recognition, spotting, retrieval, and captioning, making it ideal for researchers, analysts, and developers working with sports video data."
 readme = "README.md"
 requires-python = ">=3.12"

{opensportslib-0.3.1.dev16 → opensportslib-0.3.1.dev18}/tests/unit/tools/test_setup.py

@@ -1,16 +1,21 @@
 from __future__ import annotations
 
+import sys
+import types
+
 import pytest
 
 from opensportslib import cli
 from opensportslib.setup import setup as setup_lib
 
 
-def test_select_cuda_wheel_uses_cu126_for_pre_sm75_gpu_with_cuda_13():
+def test_select_cuda_wheel_uses_cu126_for_pre_sm75_gpu_with_cuda_13(monkeypatch):
+    monkeypatch.setattr(setup_lib.platform, "machine", lambda: "x86_64")
     assert setup_lib.select_cuda_wheel("13.0", [(7, 0)]) == "cu126"
 
 
-def test_select_cuda_wheel_uses_cu126_for_pascal_with_cuda_13():
+def test_select_cuda_wheel_uses_cu126_for_pascal_with_cuda_13(monkeypatch):
+    monkeypatch.setattr(setup_lib.platform, "machine", lambda: "x86_64")
     assert setup_lib.select_cuda_wheel("13.0", [(6, 0)]) == "cu126"
 
 
@@ -46,7 +51,7 @@ def test_install_torch_uses_the_pinned_pyg_compatibility_profile(monkeypatch):
     )
 
 
-def test_validate_pyg_wheels_checks_all_binary_wheels_before_torch_reinstall(monkeypatch):
+def test_validate_pyg_wheels_checks_all_optional_binary_wheels(monkeypatch):
     calls: list[list[str]] = []
 
     monkeypatch.setattr(setup_lib.sys, "executable", "/usr/bin/python3")
@@ -71,7 +76,23 @@ def test_pyg_extension_packages_match_the_supported_optional_libraries():
     )
 
 
-def test_setup_selects_pyg_torch_profile_before_installing_pyg(monkeypatch):
+def test_install_pyg_skips_optional_extension_downloads_by_default(monkeypatch):
+    calls: list[list[str]] = []
+
+    monkeypatch.setattr(setup_lib.sys, "executable", "/usr/bin/python3")
+    monkeypatch.setitem(
+        sys.modules,
+        "torch",
+        types.SimpleNamespace(__version__="2.12.1+cu130"),
+    )
+    monkeypatch.setattr(setup_lib.subprocess, "check_call", lambda cmd: calls.append(cmd) or 0)
+
+    setup_lib.install_pyg()
+
+    assert calls == [["/usr/bin/python3", "-m", "pip", "install", "torch-geometric"]]
+
+
+def test_setup_installs_pyg_without_optional_extensions(monkeypatch):
     calls: list[object] = []
 
     monkeypatch.setattr(
@@ -79,17 +100,41 @@ def test_setup_selects_pyg_torch_profile_before_installing_pyg(monkeypatch):
         "install_torch",
         lambda *, pyg_compatible=False: calls.append(("torch", pyg_compatible)),
     )
-    monkeypatch.setattr(setup_lib, "validate_pyg_wheels", lambda: calls.append("validate"))
     monkeypatch.setattr(
         setup_lib,
         "install_extras",
-        lambda dali=False, pyg=False: calls.append(("extras", dali, pyg)),
+        lambda dali=False, pyg=False, pyg_extensions=False: calls.append(
+            ("extras", dali, pyg, pyg_extensions)
+        ),
     )
     monkeypatch.setattr(setup_lib, "verify", lambda: calls.append("verify"))
 
     setup_lib.setup(pyg=True)
 
-    assert calls == ["validate", ("torch", True), ("extras", False, True), "verify"]
+    assert calls == [("torch", True), ("extras", False, True, False), "verify"]
+
+
+def test_setup_validates_extensions_only_when_explicitly_requested(monkeypatch):
+    calls: list[object] = []
+
+    monkeypatch.setattr(setup_lib, "validate_pyg_wheels", lambda: calls.append("validate"))
+    monkeypatch.setattr(
+        setup_lib,
+        "install_torch",
+        lambda *, pyg_compatible=False: calls.append(("torch", pyg_compatible)),
+    )
+    monkeypatch.setattr(
+        setup_lib,
+        "install_extras",
+        lambda dali=False, pyg=False, pyg_extensions=False: calls.append(
+            ("extras", dali, pyg, pyg_extensions)
+        ),
+    )
+    monkeypatch.setattr(setup_lib, "verify", lambda: calls.append("verify"))
+
+    setup_lib.setup(pyg=True, pyg_extensions=True)
+
+    assert calls == ["validate", ("torch", True), ("extras", False, True, True), "verify"]
 
 
 def test_select_cuda_wheel_uses_cu130_for_dgx_spark():
@@ -108,9 +153,10 @@ def test_select_cuda_wheel_uses_highest_driver_compatible_wheel():
 def test_cli_setup_forwards_xvars_flag(monkeypatch):
     captured: dict[str, object] = {}
 
-    def fake_setup(*, dali: bool, pyg: bool, vqa_xvars: bool, vqa_qwen: bool):
+    def fake_setup(*, dali: bool, pyg: bool, vqa_xvars: bool, vqa_qwen: bool, **kwargs):
         captured["dali"] = dali
         captured["pyg"] = pyg
+        captured.update(kwargs)
         captured["vqa_xvars"] = vqa_xvars
         captured["vqa_qwen"] = vqa_qwen
 
@@ -125,9 +171,10 @@ def test_cli_setup_forwards_xvars_flag(monkeypatch):
 def test_cli_setup_forwards_qwen_flag(monkeypatch):
     captured: dict[str, object] = {}
 
-    def fake_setup(*, dali: bool, pyg: bool, vqa_xvars: bool, vqa_qwen: bool):
+    def fake_setup(*, dali: bool, pyg: bool, vqa_xvars: bool, vqa_qwen: bool, **kwargs):
         captured["dali"] = dali
         captured["pyg"] = pyg
+        captured.update(kwargs)
         captured["vqa_xvars"] = vqa_xvars
         captured["vqa_qwen"] = vqa_qwen
 
@@ -192,7 +239,13 @@ def test_install_xvars_dependencies_uninstalls_then_reinstalls(monkeypatch):
 def test_setup_skips_vqa_dependency_install_when_flags_are_false(monkeypatch):
     calls: list[str] = []
 
-    monkeypatch.setattr(setup_lib, "install_extras", lambda dali=False, pyg=False: calls.append(f"extras:{dali}:{pyg}"))
+    monkeypatch.setattr(
+        setup_lib,
+        "install_extras",
+        lambda dali=False, pyg=False, pyg_extensions=False: calls.append(
+            f"extras:{dali}:{pyg}:{pyg_extensions}"
+        ),
+    )
     monkeypatch.setattr(setup_lib, "install_xvars_dependencies", lambda pins: calls.append(f"deps:{sorted(pins)}"))
     monkeypatch.setattr(setup_lib, "verify", lambda: calls.append("verify"))
     monkeypatch.setattr(
@@ -203,4 +256,4 @@ def test_setup_skips_vqa_dependency_install_when_flags_are_false(monkeypatch):
 
     setup_lib.setup(dali=True, pyg=False, vqa_xvars=False, vqa_qwen=False)
 
-    assert calls == ["torch:False", "extras:True:False", "verify"]
+    assert calls == ["torch:False", "extras:True:False:False", "verify"]