chipwright 0.2.2__tar.gz → 0.2.3__tar.gz

{chipwright-0.2.2 → chipwright-0.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: chipwright
-Version: 0.2.2
+Version: 0.2.3
 Summary: A verified package manager for Qualcomm NPUs — resolve the artifact that loads on your exact chip, run it, and prove it against a CPU reference.
 License-Expression: MIT
 Project-URL: Homepage, https://github.com/nameissakthi25/chipwright

{chipwright-0.2.2 → chipwright-0.2.3}/chipwright/__init__.py

@@ -8,4 +8,4 @@ from .resolver import Decision, Outcome, Variant, resolve
 from .tags import ArtifactTag
 
 __all__ = ["TargetKey", "probe", "Registry", "Decision", "Outcome", "Variant", "resolve", "ArtifactTag"]
-__version__ = "0.2.2"
+__version__ = "0.2.3"

{chipwright-0.2.2 → chipwright-0.2.3}/chipwright/device.py

@@ -82,16 +82,23 @@ class RemoteQNN:
             time.sleep(wait)
         return last
 
-    def ensure_ctx(self, local_path, name):
+    def ensure_ctx(self, local_path, name, ext=None):
         """Push an artifact to the board and return a runnable context-binary path (cached).
 
         A DLC is the durable artifact; the HTP context binary is per-target, so a `.dlc` is compiled
         into a context binary ON the board (2 MB VTCM) — regenerate, don't ship brittle. A prebuilt
         context binary (`.bin`/`.qnnctx`) is pushed as-is.
+
+        `ext` is the registry-declared artifact kind ("dlc"/"bin"/…). It is authoritative: a hosted
+        artifact is fetched into the content-addressed cache under a HASHED filename with no extension,
+        so inferring "is this a DLC?" from `local_path` wrongly treats a fetched DLC as a prebuilt
+        context binary (skips context-gen → "Could not create context from binary" on-device). When
+        `ext` is given we trust it; only when it is absent do we fall back to the filename suffix.
         """
         name = _safe_board_name(name)  # registry-sourced; confine before it reaches any shell string
         self._retry(lambda: _ssh(self.pw, self.port, self.dest, f"mkdir -p {self.board_dir}", timeout=40))
-        if local_path.endswith(".dlc"):
+        is_dlc = (ext == "dlc") if ext is not None else local_path.endswith(".dlc")
+        if is_dlc:
             dlc_board = f"{self.board_dir}/{name}"
             ctx_board = f"{self.board_dir}/ctx_{name}/{name}_ctx.bin"
             present = _ssh(self.pw, self.port, self.dest, f"test -f {ctx_board} && echo OK", timeout=40)

{chipwright-0.2.2 → chipwright-0.2.3}/chipwright/run.py

@@ -81,7 +81,7 @@ def run_variant(variant, input_path=None):
 
     board_name = r.get("board_name", os.path.basename(art))
     print(f"  pushing artifact to board ({board_name}) …", flush=True)
-    ctx_board = dev.ensure_ctx(art, board_name)
+    ctx_board = dev.ensure_ctx(art, board_name, ext=variant.ext)
 
     mod = importlib.import_module(f".modalities.{r['modality']}", __package__)
     if not r.get("cpu_onnx") or not (input_path or r.get("input")):

chipwright-0.2.3/chipwright/tests/test_device_ctx.py

@@ -0,0 +1,81 @@
+"""ensure_ctx must decide DLC-vs-prebuilt by the registry-declared `ext`, not the filename.
+
+Regression for a real-silicon bug: a HOSTED artifact is fetched into the content-addressed cache under
+a hashed filename with NO extension, so `local_path.endswith('.dlc')` was False for a fetched DLC →
+ensure_ctx pushed it as a prebuilt context binary and skipped context-gen → the board reported
+"Could not create context from binary". Passing `ext` from the variant fixes it. No real SSH: _ssh/_scp
+are monkeypatched to record the commands issued.
+"""
+import os
+import sys
+
+sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))))
+
+from chipwright import device
+
+
+class _R:
+    def __init__(self, rc=0, out="", err=""):
+        self.returncode, self.stdout, self.stderr = rc, out, err
+
+
+def _fakes():
+    """Return (calls, ssh, scp) — ssh returns 'OK' to a `test -f` only AFTER a context-gen ran, so the
+    pre-gen presence check misses and the post-gen check passes (mirrors a fresh board)."""
+    calls, gen = [], {"done": False}
+
+    def ssh(pw, port, dest, *cmd, timeout=600, capture=True):
+        c = cmd[0] if cmd else ""
+        calls.append(c)
+        if "qnn-context-binary-generator" in c:
+            gen["done"] = True
+        return _R(out="OK" if ("test -f" in c and gen["done"]) else "")
+
+    def scp(pw, port, *args, timeout=1800):
+        return _R()
+
+    return calls, ssh, scp
+
+
+def _dev(monkeypatch):
+    monkeypatch.setattr(device.shutil, "which", lambda _: "/usr/bin/sshpass")
+    return device.RemoteQNN("1.2.3.4", "root", "pw", 22)
+
+
+def test_hosted_dlc_hashed_name_still_context_gens_with_ext(monkeypatch):
+    """The bug: a fetched DLC has a hashed, extension-less path. With ext='dlc' it MUST context-gen."""
+    calls, ssh, scp = _fakes()
+    monkeypatch.setattr(device, "_ssh", ssh)
+    monkeypatch.setattr(device, "_scp", scp)
+    dev = _dev(monkeypatch)
+    hashed = "/home/u/.cache/chipwright/blobs/ab/" + "a" * 64   # no .dlc suffix
+    ctx = dev.ensure_ctx(hashed, "mobilenet", ext="dlc")
+    assert any("qnn-context-binary-generator" in c for c in calls), "ext='dlc' must trigger context-gen"
+    assert ctx.endswith("ctx_mobilenet/mobilenet_ctx.bin")
+
+
+def test_without_ext_falls_back_to_suffix(monkeypatch):
+    """Back-compat: no ext → infer from the filename. A .dlc path context-gens; a .bin is pushed as-is."""
+    calls, ssh, scp = _fakes()
+    monkeypatch.setattr(device, "_ssh", ssh)
+    monkeypatch.setattr(device, "_scp", scp)
+    dev = _dev(monkeypatch)
+    dev.ensure_ctx("/x/model.dlc", "m", ext=None)
+    assert any("qnn-context-binary-generator" in c for c in calls)
+
+    calls2, ssh2, scp2 = _fakes()
+    monkeypatch.setattr(device, "_ssh", ssh2)
+    monkeypatch.setattr(device, "_scp", scp2)
+    ctx = dev.ensure_ctx("/x/prebuilt.bin", "m", ext=None)
+    assert not any("qnn-context-binary-generator" in c for c in calls2), "a .bin is pushed as-is"
+    assert ctx.endswith("/m")
+
+
+def test_ext_bin_is_pushed_as_is_even_if_path_says_dlc(monkeypatch):
+    """ext is authoritative: ext='bin' must NOT context-gen even if the path happens to end .dlc."""
+    calls, ssh, scp = _fakes()
+    monkeypatch.setattr(device, "_ssh", ssh)
+    monkeypatch.setattr(device, "_scp", scp)
+    dev = _dev(monkeypatch)
+    dev.ensure_ctx("/x/weird.dlc", "m", ext="bin")
+    assert not any("qnn-context-binary-generator" in c for c in calls)

{chipwright-0.2.2 → chipwright-0.2.3}/chipwright/tests/test_packaging.py

@@ -137,7 +137,7 @@ def test_run_refuses_when_no_cpu_reference(monkeypatch, tmp_path):
         def __init__(self, *a, **k):
             pass
 
-        def ensure_ctx(self, _art, _name):
+        def ensure_ctx(self, _art, _name, ext=None):
             return "/board/ctx"
 
     monkeypatch.setattr(runmod, "_board_env",

{chipwright-0.2.2 → chipwright-0.2.3}/chipwright.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: chipwright
-Version: 0.2.2
+Version: 0.2.3
 Summary: A verified package manager for Qualcomm NPUs — resolve the artifact that loads on your exact chip, run it, and prove it against a CPU reference.
 License-Expression: MIT
 Project-URL: Homepage, https://github.com/nameissakthi25/chipwright

{chipwright-0.2.2 → chipwright-0.2.3}/chipwright.egg-info/SOURCES.txt

@@ -39,6 +39,7 @@ chipwright/tests/test_build.py
 chipwright/tests/test_cache.py
 chipwright/tests/test_cli_ux.py
 chipwright/tests/test_device_adb.py
+chipwright/tests/test_device_ctx.py
 chipwright/tests/test_env.py
 chipwright/tests/test_env_adb.py
 chipwright/tests/test_llm_modality.py

{chipwright-0.2.2 → chipwright-0.2.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "chipwright"
-version = "0.2.2"
+version = "0.2.3"
 description = "A verified package manager for Qualcomm NPUs — resolve the artifact that loads on your exact chip, run it, and prove it against a CPU reference."
 readme = "README.md"
 license = "MIT"