opensportslib 0.3.0.dev14__tar.gz → 0.3.0.dev16__tar.gz

{opensportslib-0.3.0.dev14/opensportslib.egg-info → opensportslib-0.3.0.dev16}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: opensportslib
-Version: 0.3.0.dev14
+Version: 0.3.0.dev16
 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.0.dev14 → opensportslib-0.3.0.dev16}/opensportslib/setup/setup.py

@@ -2,12 +2,14 @@ import subprocess
 import sys
 
 
-CUDA_SUPPORT = [
-    "cu126",
-    "cu128",
-    "cu130",
-    "cpu"
-]
+CUDA_WHEEL_VERSIONS = {
+    "cu126": (12, 6),
+    "cu128": (12, 8),
+    "cu130": (13, 0),
+}
+MIN_SUPPORTED_COMPUTE_CAPABILITY = (7, 0)
+LEGACY_GPU_MAX_COMPUTE_CAPABILITY = (7, 4)
+LEGACY_GPU_CUDA_WHEEL = "cu126"
 
 XVARS_DEPENDENCY_PINS = {
     "transformers": "4.38.2",
@@ -33,17 +35,77 @@ def get_cuda_version():
             if "CUDA Version" in line:
                 ver  = line.split("CUDA Version:")[1].strip().split()[0]
                 print(f"CUDA Version found : {ver}")
-                return ver
+                cuda_tag = f"cu{ver.replace('.', '')}"
+                return ver, cuda_tag
     except Exception:
-        return None
+        return None, None
+    return None, None
 
 
-CUDA_VERSION = get_cuda_version()
+def get_gpu_compute_capabilities():
+    try:
+        output = subprocess.check_output(
+            ["nvidia-smi", "--query-gpu=compute_cap", "--format=csv,noheader"],
+            text=True,
+        )
+    except Exception:
+        return []
 
-def get_cpu_tag():
-    if not CUDA_VERSION:
+    capabilities = []
+    for line in output.splitlines():
+        value = line.strip()
+        if not value:
+            continue
+        try:
+            major, minor = value.split(".", 1)
+            capabilities.append((int(major), int(minor)))
+        except ValueError:
+            print(f"Ignoring unrecognized GPU compute capability: {value}")
+    return capabilities
+
+
+def select_cuda_wheel(cuda_version, compute_capabilities):
+    if not cuda_version:
         return "cpu"
 
+    try:
+        driver_version = tuple(int(part) for part in cuda_version.split(".", 1))
+    except ValueError as exc:
+        raise RuntimeError(f"Unable to parse CUDA version reported by nvidia-smi: {cuda_version}") from exc
+
+    if any(capability < MIN_SUPPORTED_COMPUTE_CAPABILITY for capability in compute_capabilities):
+        raise RuntimeError(
+            "OpenSportsLib PyTorch wheels require GPUs with compute capability "
+            f"{MIN_SUPPORTED_COMPUTE_CAPABILITY[0]}.{MIN_SUPPORTED_COMPUTE_CAPABILITY[1]} or newer. "
+            f"Detected: {compute_capabilities}."
+        )
+
+    compatible_tags = [
+        tag for tag, wheel_version in CUDA_WHEEL_VERSIONS.items() if wheel_version <= driver_version
+    ]
+    if compute_capabilities and any(
+        capability <= LEGACY_GPU_MAX_COMPUTE_CAPABILITY for capability in compute_capabilities
+    ):
+        compatible_tags = [tag for tag in compatible_tags if tag == LEGACY_GPU_CUDA_WHEEL]
+
+    if not compatible_tags:
+        raise RuntimeError(
+            f"CUDA {cuda_version} is too old for the supported PyTorch wheels: "
+            f"{', '.join(CUDA_WHEEL_VERSIONS)}."
+        )
+
+    selected = max(compatible_tags, key=lambda tag: CUDA_WHEEL_VERSIONS[tag])
+    print(
+        "Selected PyTorch wheel "
+        f"{selected} for CUDA {cuda_version} and GPU compute capabilities {compute_capabilities or 'unknown'}"
+    )
+    return selected
+
+
+CUDA_VERSION, _DETECTED_CUDA_TAG = get_cuda_version()
+GPU_COMPUTE_CAPABILITIES = get_gpu_compute_capabilities()
+CUDA_TAG = select_cuda_wheel(CUDA_VERSION, GPU_COMPUTE_CAPABILITIES)
+
 
 def install_xvars_dependencies(DEPENDENCY_PINS):
     python = sys.executable
@@ -58,42 +120,16 @@ def install_xvars_dependencies(DEPENDENCY_PINS):
 
 def install_torch():
     python = sys.executable
-    subprocess.call([python, "-m", "pip", "uninstall", "-y", "torch", "torchvision"])
-    
-    if CUDA_VERSION == "cu130":
-        cuda = "cu130"
-        subprocess.check_call([
-            python, "-m", "pip", "install",
-            "torch", "torchvision", "torchaudio",
-            "--index-url",
-            f"https://download.pytorch.org/whl/{cuda}"
-        ])
-        print(f"\nSuccess with {cuda}")
-        return cuda
-    for cuda in CUDA_SUPPORT:
-
-        print(f"\n Trying installation: {cuda}\n")
-        try:
-            if get_cpu_tag() == "cpu":
-                subprocess.check_call([
-                    python, "-m", "pip", "install",
-                    "torch", "torchvision", "torchaudio"
-                ])
-            else:
-
-                subprocess.check_call([
-                    python, "-m", "pip", "install",
-                    "torch", "torchvision", "torchaudio",
-                    "--index-url",
-                    f"https://download.pytorch.org/whl/{cuda}"
-                ])
-            print(f"\nSuccess with {cuda}")
-            return cuda
-
-        except Exception as e:
-            print(f"Failed with {cuda}: {e}")
-
-    raise RuntimeError("All CUDA installs failed")
+    subprocess.call([python, "-m", "pip", "uninstall", "-y", "torch", "torchvision", "torchaudio"])
+
+    subprocess.check_call([
+        python, "-m", "pip", "install",
+        "torch", "torchvision", "torchaudio",
+        "--index-url",
+        f"https://download.pytorch.org/whl/{CUDA_TAG}",
+    ])
+    print(f"\nSuccess with {CUDA_TAG}")
+    return CUDA_TAG
 
 def install_dali():
 
@@ -104,7 +140,7 @@ def install_dali():
     # DALI (only if GPU)
     if CUDA_VERSION:
         
-        if CUDA_VERSION == "cu130":
+        if CUDA_TAG == "cu130":
             subprocess.check_call([
                 python, "-m", "pip", "install",
                 "nvidia-dali-cuda130"
@@ -133,8 +169,7 @@ def install_pyg():
 
     python = sys.executable
     torch_version = "2.10.0" if version.parse(torch.__version__.split("+")[0]) > version.parse("2.10.0") else torch.__version__.split("+")[0]
-    cuda_tag = next((f"cu{CUDA_VERSION.replace('.', '')}" for _ in [0] if CUDA_VERSION), CUDA_SUPPORT[0])
-    cuda_tag = cuda_tag if cuda_tag in CUDA_SUPPORT else CUDA_SUPPORT[0]
+    cuda_tag = CUDA_TAG
     print("\nInstalling Py-Geometric ecosystem...\n")
     if cuda_tag == "cpu":
         url =  f"https://data.pyg.org/whl/torch-{torch_version}+cpu.html"

{opensportslib-0.3.0.dev14 → opensportslib-0.3.0.dev16/opensportslib.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: opensportslib
-Version: 0.3.0.dev14
+Version: 0.3.0.dev16
 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.0.dev14 → opensportslib-0.3.0.dev16}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "opensportslib"
-version = "0.3.0.dev14"
+version = "0.3.0.dev16"
 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.0.dev14 → opensportslib-0.3.0.dev16}/tests/test_setup_cli.py

@@ -4,6 +4,18 @@ 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():
+    assert setup_lib.select_cuda_wheel("13.0", [(7, 0)]) == "cu126"
+
+
+def test_select_cuda_wheel_uses_cu130_for_dgx_spark():
+    assert setup_lib.select_cuda_wheel("13.0", [(12, 1)]) == "cu130"
+
+
+def test_select_cuda_wheel_uses_highest_driver_compatible_wheel():
+    assert setup_lib.select_cuda_wheel("12.8", [(8, 0)]) == "cu128"
+
+
 def test_cli_setup_forwards_xvars_flag(monkeypatch):
     captured: dict[str, object] = {}