@qvac/ocr-ggml 0.25.1 → 0.26.1

package/README.md

@@ -149,7 +149,7 @@ bare examples/backend-device.js --backend metal
 | `params.lowConfidenceThreshold` | `number` | | `0.4` | retry threshold (`easyocr` only) |
 | `params.recognizerBatchSize` | `number` | | `32` | recognizer batch size (`easyocr` only) |
 | `params.nThreads` | `number` | | `0` (auto) | CPU thread count for GGML; `<0` leaves the GGML default |
-| `params.backendsDir` | `string` | | `<package>/prebuilds` | directory holding `libggml-*.so` backend shared libs |
+| `params.backendsDir` | `string` | | fabric backends root | directory holding `libqvac-ggml-*.so` backend shared libs. On desktop, the root `@qvac/fabric/backends` resolves; on mobile, this package's `prebuilds/` |
 | `params.backendDevice` | `'cpu'` \| `'vulkan'` \| `'metal'` \| `'opencl'` | | `'cpu'` | ggml backend device. `'vulkan'` (Linux/Windows/Android), `'metal'` (Apple) and `'opencl'` (Android/Adreno) opt in to GPU inference with transparent CPU fallback — see [Backend device](#backend-device-cpu--vulkan--metal--opencl) |
 | `params.main-gpu` / `params.main_gpu` | `number` \| `string` | | _prefer dedicated_ | Raw ggml registry index or strict GPU class; requires GPU `backendDevice`. See below. |
 | `params.gpuDevice` | `number` | | _prefer discrete_ | 0-based index into the matching GPU/iGPU devices for `'vulkan'`/`'metal'`/`'opencl'`; out-of-range → CPU fallback — see [Selecting a specific GPU](#selecting-a-specific-gpu-gpudevice) |
@@ -234,7 +234,7 @@ Behaviour and expectations:
   `backendIsGpu` stat). It never silently does the wrong thing.
 - **Required backend libs.** Vulkan execution needs the `libggml-vulkan`
   backend shared library (`libggml-vulkan.so` / `.dll` / `.dylib`) present in
-  `backendsDir` (default `<package>/prebuilds/<target>/`), plus a working
+  `backendsDir` (on desktop, the root `@qvac/fabric/backends` resolves; on mobile, this package's `prebuilds/<target>/`), plus a working
   Vulkan driver/ICD and a Vulkan-capable GPU on the host. **OpenCL** likewise
   needs the `libggml-opencl` backend shared library plus a working OpenCL
   runtime (`libOpenCL.so`); it is built primarily for **Android** (the `opencl`
@@ -667,7 +667,7 @@ omission for v1: `--debug-png` (annotated overlay) — print boxes via
 
 | Script | Purpose |
 |---|---|
-| [`scripts/check_ggml_backends.sh`](./scripts/check_ggml_backends.sh) | Probe shipped ggml backends + BLAS/Vulkan/OpenCL paths in `prebuilds/` |
+| [`scripts/check_ggml_backends.sh`](./scripts/check_ggml_backends.sh) | Probe shipped ggml backends + BLAS/Vulkan/OpenCL paths in the installed `@qvac/fabric` runtime |
 | [`scripts/pth_to_gguf.py`](./scripts/pth_to_gguf.py) | Weight converter: EasyOCR PyTorch `.pth` → `.gguf` (optionally `Q8_0` / `Q4_K` quantized) |
 | [`scripts/convert-model.sh`](./scripts/convert-model.sh) | Wrapper around the converter (`npm run convert-model`) — venv discovery, sanity checks |
 | [`scripts/setup-venv.sh`](./scripts/setup-venv.sh) | One-time provisioning of the converter venv (`npm run setup:venv`) |

package/index.d.ts

@@ -59,8 +59,8 @@ export interface OcrGgmlParams {
      */
     nThreads?: number;
     /**
-     * Directory holding ggml backend shared libraries. Default: `@qvac/fabric`'s
-     * `prebuilds/` (desktop), falling back to this package's `prebuilds/` on
+     * Directory holding ggml backend shared libraries. Default: the root
+     * `@qvac/fabric/backends` resolves (desktop), falling back to this package's `prebuilds/` on
      * mobile where the package tree isn't resolvable from the packed worklet.
      */
     backendsDir?: string;

package/index.js

@@ -5,6 +5,7 @@ exports.ERR_CODES = exports.QvacErrorAddonOcrGgml = exports.OcrGgml = void 0;
 const path = require("bare-path");
 const fs = require("bare-fs");
 const QvacLogger = require("@qvac/logging");
+const fabricBackends = require("@qvac/fabric/backends");
 /* eslint-enable @typescript-eslint/no-require-imports */
 const infer_base_1 = require("@qvac/infer-base");
 const ocr_ggml_1 = require("./ocr-ggml");
@@ -20,24 +21,20 @@ const DOCTR_INTERNAL_LANG_LIST = ["en"];
  * create-time failures to ERR_CODES.UNSUPPORTED_LANGUAGE.
  */
 const NATIVE_LANGUAGE_ERROR = /unsupported languages|only compatible with english/i;
-// The ggml compute backends (GGML_BACKEND_DL modules) ship exactly once, in the
-// @qvac/fabric dependency (prebuilds/<host>/qvac__fabric). We deliberately do
-// not copy them into this addon to avoid duplicating tens of MB per fabric
-// consumer. On desktop, resolve the single @qvac/fabric install and load the
-// backends from there. On mobile the package tree isn't resolvable at runtime
-// (the worklet runs from a packed bundle), so fall back to this addon's own
-// prebuilds, where the mobile packaging stages the backends. The native side
+// The ggml compute backends (GGML_BACKEND_DL modules) ship exactly once, next to
+// the @qvac/fabric runtime (<root>/<host>/qvac__fabric). We deliberately do not
+// copy them into this addon to avoid duplicating tens of MB per fabric
+// consumer. On desktop, @qvac/fabric/backends resolves that root in whichever
+// package holds the runtime. On mobile the package tree isn't resolvable at
+// runtime (the worklet runs from a packed bundle), so fall back to this addon's
+// own prebuilds, where the mobile packaging stages the backends. The native side
 // appends BACKENDS_SUBDIR ("<host>/qvac__fabric") to whichever root we return.
 function resolveBackendsDir() {
-    try {
-        const fabricPkg = require.resolve("@qvac/fabric/package");
-        const fabricPrebuilds = path.join(path.dirname(fabricPkg), "prebuilds");
-        if (fs.existsSync(fabricPrebuilds))
-            return fabricPrebuilds;
-    }
-    catch {
-        // Mobile worklets cannot resolve the @qvac/fabric package tree.
-    }
+    // fabric's resolver only checks that the platform package resolves, not that
+    // its prebuilds are on disk.
+    const fabricRoot = fabricBackends.resolveBackendsDir();
+    if (fabricRoot !== null && fs.existsSync(fabricRoot))
+        return fabricRoot;
     return path.join(__dirname, "prebuilds");
 }
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qvac/ocr-ggml",
-  "version": "0.25.1",
+  "version": "0.26.1",
   "description": "GGML-backed OCR addon for qvac (EasyOCR and DocTR pipelines on GGUF weights)",
   "addon": true,
   "engines": {
@@ -75,6 +75,8 @@
   "bugs": "https://github.com/tetherto/qvac/issues",
   "homepage": "https://qvac.tether.io",
   "devDependencies": {
+    "@qvac/fabric-android-arm64": "^0.19.0",
+    "@qvac/fabric-ios": "^0.19.0",
     "@qvac/registry-client": "^0.4.0",
     "@types/node": "^24.2.1",
     "bare-stream": "^2.7.0",
@@ -95,7 +97,7 @@
   },
   "dependencies": {
     "@qvac/error": "^0.1.0",
-    "@qvac/fabric": "^0.17.0",
+    "@qvac/fabric": "^0.19.0",
     "@qvac/infer-base": "^0.6.2",
     "@qvac/logging": "^0.1.0",
     "bare-fetch": "^3.0.1",

package/prebuilds/darwin-arm64/qvac__ocr-ggml.bare.exports

@@ -7,7 +7,7 @@
     ],
     "current_versions": [
       {
-        "version": "0.25.1"
+        "version": "0.26.1"
       }
     ],
     "exported_symbols": [

package/prebuilds/darwin-x64/qvac__ocr-ggml.bare.exports

@@ -7,7 +7,7 @@
     ],
     "current_versions": [
       {
-        "version": "0.25.1"
+        "version": "0.26.1"
       }
     ],
     "exported_symbols": [

package/prebuilds/ios-arm64/qvac__ocr-ggml.bare.exports

@@ -7,7 +7,7 @@
     ],
     "current_versions": [
       {
-        "version": "0.25.1"
+        "version": "0.26.1"
       }
     ],
     "exported_symbols": [

package/prebuilds/ios-arm64-simulator/qvac__ocr-ggml.bare.exports

@@ -7,7 +7,7 @@
     ],
     "current_versions": [
       {
-        "version": "0.25.1"
+        "version": "0.26.1"
       }
     ],
     "exported_symbols": [

package/prebuilds/ios-x64-simulator/qvac__ocr-ggml.bare.exports

@@ -7,7 +7,7 @@
     ],
     "current_versions": [
       {
-        "version": "0.25.1"
+        "version": "0.26.1"
       }
     ],
     "exported_symbols": [

package/test/integration/backend-device.test.js

@@ -2,7 +2,6 @@
 
 const { OcrGgml } = require('../..')
 const test = require('brittle')
-const path = require('bare-path')
 const { MIN_MAIN_GPU_INDEX, MAX_MAIN_GPU_INDEX } = require('@qvac/ocr-ggml/lib/main-gpu')
 const {
   isMobile,
@@ -20,8 +19,9 @@ const {
 // (covered by the rest of the suite), so this test only exercises the Vulkan
 // opt-in path.
 //
-// The Vulkan execution path can only be validated where a `libggml-vulkan`
-// backend shared library was shipped into prebuilds/. We gate on that file so
+// The Vulkan execution path can only be validated where a `libqvac-ggml-vulkan`
+// backend shared library ships, which on desktop is next to the @qvac/fabric
+// runtime rather than in this package's prebuilds/. We gate on that file so
 // the test skips cleanly on hosts that never built the Vulkan backend (e.g.
 // plain desktop CI) instead of failing. On a host that ships the lib but has
 // no Vulkan-capable GPU, the selection falls back to CPU and we assert the
@@ -29,7 +29,11 @@ const {
 
 const TEST_TIMEOUT = 120 * 1000
 
-const vulkanBackendLib = findVulkanBackendLib(PREBUILDS_DIR)
+const vulkanBackendLib = findVulkanBackendLib(
+  isMobile
+    ? PREBUILDS_DIR
+    : (require('@qvac/fabric/backends').resolveBackendsDir() ?? PREBUILDS_DIR)
+)
 
 // Skip on mobile (prebuilds layout / device provisioning differ) and on any
 // host that did not ship a Vulkan backend lib.
@@ -37,7 +41,11 @@ const shouldSkip = isMobile || !vulkanBackendLib
 
 function nativeBackendsDir() {
   if (isMobile) return PREBUILDS_DIR
-  return path.join(path.dirname(require.resolve('@qvac/fabric/package')), 'prebuilds')
+  const dir = require('@qvac/fabric/backends').resolveBackendsDir()
+  if (dir === null) {
+    throw new Error('@qvac/fabric backends not found; is @qvac/fabric-<host> installed?')
+  }
+  return dir
 }
 
 for (const key of ['main-gpu', 'main_gpu']) {