diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-12 05:35:29 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-12 05:35:29 +0000 |
commit | 59203c63bb777a3bacec32fb8830fba33540e809 (patch) | |
tree | 58298e711c0ff0575818c30485b44a2f21bf28a0 /toolkit/components/ml/content/MLEngine.worker.mjs | |
parent | Adding upstream version 126.0.1. (diff) | |
download | firefox-59203c63bb777a3bacec32fb8830fba33540e809.tar.xz firefox-59203c63bb777a3bacec32fb8830fba33540e809.zip |
Adding upstream version 127.0.upstream/127.0
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'toolkit/components/ml/content/MLEngine.worker.mjs')
-rw-r--r-- | toolkit/components/ml/content/MLEngine.worker.mjs | 98 |
1 files changed, 62 insertions, 36 deletions
diff --git a/toolkit/components/ml/content/MLEngine.worker.mjs b/toolkit/components/ml/content/MLEngine.worker.mjs index 1013977e07..585ac4ab04 100644 --- a/toolkit/components/ml/content/MLEngine.worker.mjs +++ b/toolkit/components/ml/content/MLEngine.worker.mjs @@ -2,74 +2,99 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -import { PromiseWorker } from "resource://gre/modules/workers/PromiseWorker.mjs"; +const lazy = {}; -// Respect the preference "browser.ml.logLevel". -let _loggingLevel = "Error"; -function log(...args) { - if (_loggingLevel !== "Error" && _loggingLevel !== "Warn") { - console.log("ML:", ...args); - } -} -function trace(...args) { - if (_loggingLevel === "Trace" || _loggingLevel === "All") { - console.log("ML:", ...args); - } -} +ChromeUtils.defineESModuleGetters( + lazy, + { + PromiseWorker: "resource://gre/modules/workers/PromiseWorker.mjs", + Pipeline: "chrome://global/content/ml/ONNXPipeline.mjs", + PipelineOptions: "chrome://global/content/ml/EngineProcess.sys.mjs", + }, + { global: "current" } +); /** * The actual MLEngine lives here in a worker. */ class MLEngineWorker { - /** @type {ArrayBuffer} */ - #wasm; - /** @type {ArrayBuffer} */ - #model; + #pipeline; constructor() { // Connect the provider to the worker. this.#connectToPromiseWorker(); } + /** Implements the `match` function from the Cache API for Transformers.js custom cache. + * + * See https://developer.mozilla.org/en-US/docs/Web/API/Cache + * + * Attempts to match and retrieve a model file based on a provided key. + * Fetches a model file by delegating the call to the worker's main thread. + * Then wraps the fetched model file into a response object compatible with Transformers.js expectations. + * + * @param {string} key The unique identifier for the model to fetch. + * @returns {Promise<Response|null>} A promise that resolves with a Response object containing the model file or null if not found. + */ + async match(key) { + let res = await this.getModelFile(key); + if (res.fail) { + return null; + } + let headers = res.ok[1]; + let modelFile = res.ok[2]; + // Transformers.js expects a response object, so we wrap the array buffer + const response = new Response(modelFile, { + status: 200, + headers, + }); + return response; + } + + async getModelFile(...args) { + let result = await self.callMainThread("getModelFile", args); + return result; + } + /** - * @param {ArrayBuffer} wasm - * @param {ArrayBuffer} model - * @param {string} loggingLevel + * Placeholder for the `put` method from the Cache API for Transformers.js custom cache. + * + * @throws {Error} Always thrown to indicate the method is not implemented. */ - initializeEngine(wasm, model, loggingLevel) { - this.#wasm = wasm; - this.#model = model; - _loggingLevel = loggingLevel; - // TODO - Initialize the engine for real here. - log("MLEngineWorker is initalized"); + put() { + throw new Error("Method not implemented."); } /** + * @param {ArrayBuffer} wasm + * @param {object} options received as an object, converted to a PipelineOptions instance + */ + async initializeEngine(wasm, options) { + this.#pipeline = await lazy.Pipeline.initialize( + this, + wasm, + new lazy.PipelineOptions(options) + ); + } + /** * Run the worker. * * @param {string} request */ - run(request) { - if (!this.#wasm) { - throw new Error("Expected the wasm to exist."); - } - if (!this.#model) { - throw new Error("Expected the model to exist"); - } + async run(request) { if (request === "throw") { throw new Error( 'Received the message "throw", so intentionally throwing an error.' ); } - trace("inference run requested with:", request); - return request.slice(0, Math.floor(request.length / 2)); + return await this.#pipeline.run(request); } /** * Glue code to connect the `MLEngineWorker` to the PromiseWorker interface. */ #connectToPromiseWorker() { - const worker = new PromiseWorker.AbstractWorker(); + const worker = new lazy.PromiseWorker.AbstractWorker(); worker.dispatch = (method, args = []) => { if (!this[method]) { throw new Error("Method does not exist: " + method); @@ -81,6 +106,7 @@ class MLEngineWorker { self.postMessage(message, ...transfers); }; + self.callMainThread = worker.callMainThread.bind(worker); self.addEventListener("message", msg => worker.handleMessage(msg)); self.addEventListener("unhandledrejection", function (error) { throw error.reason; |