@qvac/ocr-ggml 0.27.3 → 0.28.0

package/README.md

@@ -175,7 +175,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` | | 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.backendsDir` | `string` | | fabric's backends | directory holding `libqvac-ggml-*.so` backend shared libs. When omitted, the backends `@qvac/fabric` ships are loaded; fabric locates them next to its runtime on every platform |
 | `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) |
@@ -260,7 +260,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` (on desktop, the root `@qvac/fabric/backends` resolves; on mobile, this package's `prebuilds/<target>/`), plus a working
+  `backendsDir` (by default, the directory `@qvac/fabric` ships its backends in), 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`

package/binding.js

@@ -2,7 +2,7 @@
 
 // Pre-load @qvac/fabric so its shared .bare module (the ggml runtime) is
 // registered with the bare runtime before our addon resolves its DT_NEEDED
-// dependency qvac__fabric@0.bare.
+// dependency qvac__fabric-<host>@0.bare (shipped by @qvac/fabric-<host>).
 require('@qvac/fabric')
 
 module.exports = require.addon()

package/fit.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, '__esModule', { value: true })
 exports.assessFit = assessFit
 /* eslint-disable @typescript-eslint/no-require-imports -- bare-path exposes a CommonJS export shape. */
 const path = require('bare-path')
-const backends_dir_1 = require('./lib/backends-dir')
 /**
  * Assess loading the detector and recognizer weights from GGUF metadata.
  * This does not load weights or account for image-dependent inference memory.
@@ -24,8 +23,5 @@ function assessFit(request) {
   // Resolve lazily so importing this package never loads the native binding.
   // eslint-disable-next-line @typescript-eslint/no-require-imports -- native prebuild is resolved lazily.
   const binding = require('./binding')
-  return binding.assessFit({
-    ...request,
-    backendsDir: request.backendsDir ?? (0, backends_dir_1.resolveBackendsDir)()
-  })
+  return binding.assessFit(request)
 }

package/index.d.ts

@@ -61,9 +61,8 @@ export interface OcrGgmlParams {
      */
     nThreads?: number;
     /**
-     * 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.
+     * Directory holding ggml backend shared libraries. Default: the ones
+     * @qvac/fabric ships, which it locates itself next to its runtime.
      */
     backendsDir?: string;
     /**

package/index.js

@@ -11,7 +11,6 @@ const error_1 = require("./lib/error");
 Object.defineProperty(exports, "QvacErrorAddonOcrGgml", { enumerable: true, get: function () { return error_1.QvacErrorAddonOcrGgml; } });
 Object.defineProperty(exports, "ERR_CODES", { enumerable: true, get: function () { return error_1.ERR_CODES; } });
 const main_gpu_1 = require("./lib/main-gpu");
-const backends_dir_1 = require("./lib/backends-dir");
 const fit_1 = require("./fit");
 var fit_2 = require("./fit");
 Object.defineProperty(exports, "assessFit", { enumerable: true, get: function () { return fit_2.assessFit; } });
@@ -163,10 +162,9 @@ class OcrGgml {
                 configurationParams[field] = this.params[field];
             }
         }
-        configurationParams.backendsDir =
-            this.params.backendsDir !== undefined
-                ? this.params.backendsDir
-                : (0, backends_dir_1.resolveBackendsDir)();
+        if (this.params.backendsDir !== undefined) {
+            configurationParams.backendsDir = this.params.backendsDir;
+        }
         this.logger.info("Creating ocr-ggml addon");
         try {
             this.addon = this._createAddon(configurationParams);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qvac/ocr-ggml",
-  "version": "0.27.3",
+  "version": "0.28.0",
   "description": "GGML-backed OCR addon for qvac (EasyOCR and DocTR pipelines on GGUF weights)",
   "addon": true,
   "engines": {
@@ -77,13 +77,13 @@
   "bugs": "https://github.com/tetherto/qvac/issues",
   "homepage": "https://qvac.tether.io",
   "devDependencies": {
-    "@qvac/fabric-android-arm64": "^0.20.0",
-    "@qvac/fabric-ios": "^0.20.0",
+    "@qvac/fabric-android-arm64": "0.21.1",
+    "@qvac/fabric-ios": "0.21.1",
     "@qvac/registry-client": "^0.4.0",
     "@types/node": "^24.2.1",
     "bare-stream": "^2.7.0",
     "bare-subprocess": "^6.2.1",
-    "cmake-bare": "^1.7.5",
+    "cmake-bare": "^1.9.0",
     "cmake-vcpkg": "^1.1.0",
     "eslint": "^9.39.4",
     "eslint-import-resolver-typescript": "^4.4.5",
@@ -99,7 +99,7 @@
   },
   "dependencies": {
     "@qvac/error": "^0.1.0",
-    "@qvac/fabric": "^0.20.0",
+    "@qvac/fabric": "^0.21.1",
     "@qvac/infer-base": "^0.6.2",
     "@qvac/logging": "^0.1.0",
     "bare-fetch": "^3.0.1",
@@ -110,6 +110,25 @@
     "bare-url": "^2.1.6",
     "brittle": "^3.4.0"
   },
+  "optionalDependencies": {
+    "@qvac/fabric-linux-x64": "^0.21.1",
+    "@qvac/fabric-linux-arm64": "^0.21.1",
+    "@qvac/fabric-darwin-arm64": "^0.21.1",
+    "@qvac/fabric-darwin-x64": "^0.21.1",
+    "@qvac/fabric-win32-x64": "^0.21.1"
+  },
+  "peerDependencies": {
+    "@qvac/fabric-android-arm64": "^0.21.1",
+    "@qvac/fabric-ios": "^0.21.1"
+  },
+  "peerDependenciesMeta": {
+    "@qvac/fabric-android-arm64": {
+      "optional": true
+    },
+    "@qvac/fabric-ios": {
+      "optional": true
+    }
+  },
   "exports": {
     "./package": "./package.json",
     ".": {

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

@@ -7,7 +7,7 @@
     ],
     "current_versions": [
       {
-        "version": "0.27.3"
+        "version": "0.28"
       }
     ],
     "exported_symbols": [

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

@@ -7,7 +7,7 @@
     ],
     "current_versions": [
       {
-        "version": "0.27.3"
+        "version": "0.28"
       }
     ],
     "exported_symbols": [

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

@@ -7,7 +7,7 @@
     ],
     "current_versions": [
       {
-        "version": "0.27.3"
+        "version": "0.28"
       }
     ],
     "exported_symbols": [

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

@@ -7,7 +7,7 @@
     ],
     "current_versions": [
       {
-        "version": "0.27.3"
+        "version": "0.28"
       }
     ],
     "exported_symbols": [

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

@@ -7,7 +7,7 @@
     ],
     "current_versions": [
       {
-        "version": "0.27.3"
+        "version": "0.28"
       }
     ],
     "exported_symbols": [

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

@@ -31,24 +31,13 @@ const {
 const TEST_TIMEOUT = 120 * 1000
 
 const vulkanBackendLib = findVulkanBackendLib(
-  isMobile
-    ? PREBUILDS_DIR
-    : (require('@qvac/fabric/backends').resolveBackendsDir() ?? PREBUILDS_DIR)
+  isMobile ? PREBUILDS_DIR : require('@qvac/fabric').backendsDir()
 )
 
 // Skip on mobile (prebuilds layout / device provisioning differ) and on any
 // host that did not ship a Vulkan backend lib.
 const shouldSkip = isMobile || !vulkanBackendLib
 
-function nativeBackendsDir() {
-  if (isMobile) return PREBUILDS_DIR
-  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']) {
   for (const value of [0, '+0', 'DEDICATED', 'Integrated']) {
     test(
@@ -66,7 +55,6 @@ for (const key of ['main-gpu', 'main_gpu']) {
             pathRecognizer,
             langList: ['en'],
             backendDevice,
-            backendsDir: nativeBackendsDir(),
             [key]: value
           },
           () => {}

package/lib/backends-dir.d.ts

@@ -1 +0,0 @@
-export declare function resolveBackendsDir(): string;

package/lib/backends-dir.js

@@ -1,16 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolveBackendsDir = resolveBackendsDir;
-/* eslint-disable @typescript-eslint/no-require-imports -- Bare modules and fabric expose CommonJS export shapes. */
-const path = require("bare-path");
-const fs = require("bare-fs");
-const fabricBackends = require("@qvac/fabric/backends");
-/* eslint-enable @typescript-eslint/no-require-imports */
-// The ggml backends ship beside @qvac/fabric on desktop. Mobile bundles stage
-// them beside this addon because the package tree is not resolved at runtime.
-function resolveBackendsDir() {
-    const fabricRoot = fabricBackends.resolveBackendsDir();
-    if (fabricRoot !== null && fs.existsSync(fabricRoot))
-        return fabricRoot;
-    return path.join(__dirname, "..", "prebuilds");
-}