From e4862fe8ea43bb91048c318dedc2714caa9648b9 Mon Sep 17 00:00:00 2001 From: Vladimir Mandic Date: Thu, 10 Feb 2022 15:35:32 -0500 Subject: [PATCH] add config option wasmPlatformFetch --- CHANGELOG.md | 5 ++++- src/config.ts | 7 +++++++ src/tfjs/backend.ts | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fc1b9c15..6e64d185 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,7 +9,10 @@ ## Changelog -### **HEAD -> main** 2022/02/07 mandic00@live.com +### **2.6.3** 2022/02/10 mandic00@live.com + + +### **origin/main** 2022/02/10 mandic00@live.com ### **2.6.2** 2022/02/07 mandic00@live.com diff --git a/src/config.ts b/src/config.ts index 9b938a1e..0dd778b2 100644 --- a/src/config.ts +++ b/src/config.ts @@ -221,6 +221,12 @@ export interface Config { */ wasmPath: string, + /** Force WASM loader to use platform fetch + * + * default: auto-detects to link to CDN `jsdelivr` when running in browser + */ + wasmPlatformFetch: false, + /** Print debug statements to console * * default: `true` @@ -295,6 +301,7 @@ const config: Config = { modelBasePath: '', cacheModels: true, wasmPath: '', + wasmPlatformFetch: false, debug: true, async: true, warmup: 'full', diff --git a/src/tfjs/backend.ts b/src/tfjs/backend.ts index 57dede6a..a55dfc3b 100644 --- a/src/tfjs/backend.ts +++ b/src/tfjs/backend.ts @@ -77,7 +77,7 @@ export async function check(instance: Human, force = false) { // customize wasm if (instance.config.backend === 'wasm') { if (instance.config.debug) log('wasm path:', instance.config.wasmPath); - if (typeof tf?.setWasmPaths !== 'undefined') await tf.setWasmPaths(instance.config.wasmPath); + if (typeof tf?.setWasmPaths !== 'undefined') await tf.setWasmPaths(instance.config.wasmPath, instance.config.wasmPlatformFetch); else throw new Error('backend error: attempting to use wasm backend but wasm path is not set'); const simd = await tf.env().getAsync('WASM_HAS_SIMD_SUPPORT'); const mt = await tf.env().getAsync('WASM_HAS_MULTITHREAD_SUPPORT');