From 9ec14871a0a16a65629aae51f8cfa60ee3100658 Mon Sep 17 00:00:00 2001 From: Ann Yuan Date: Thu, 6 Aug 2020 14:34:51 -0400 Subject: [PATCH 1/3] fix --- tfjs-backend-wasm/scripts/create-worker-module.js | 13 ++++--------- tfjs-backend-wasm/src/backend_wasm.ts | 2 +- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/tfjs-backend-wasm/scripts/create-worker-module.js b/tfjs-backend-wasm/scripts/create-worker-module.js index f8b3f8730fa..693f8e945ea 100755 --- a/tfjs-backend-wasm/scripts/create-worker-module.js +++ b/tfjs-backend-wasm/scripts/create-worker-module.js @@ -16,9 +16,8 @@ */ /** - * This file creates a TypeScript module that exports the contents of the - * Emscripten-generated WASM worker script so that it can be inlined by the - * tf-backend-wasm bundle. + * This file modifies the Emscripten-generated WASM worker script so that it can + * be inlined by the tf-backend-wasm bundle. */ const fs = require('fs'); @@ -26,10 +25,6 @@ const fs = require('fs'); const BASE_PATH = './wasm-out/'; const WORKER_PATH = `${BASE_PATH}tfjs-backend-wasm-threaded-simd.worker.js`; -// Write out a worker TypeScript module. const workerContents = fs.readFileSync(WORKER_PATH, "utf8"); -fs.writeFileSync(`${BASE_PATH}tfjs-backend-wasm-threaded-simd.worker.ts`, - `export const wasmWorkerContents = '${workerContents.trim()}';`); - -// Delete the original worker file. -fs.unlinkSync(WORKER_PATH) +fs.writeFileSync(`${BASE_PATH}tfjs-backend-wasm-threaded-simd.worker.js`, + `export const wasmWorkerContents = '${workerContents}';`); diff --git a/tfjs-backend-wasm/src/backend_wasm.ts b/tfjs-backend-wasm/src/backend_wasm.ts index 1c8281e7046..395a6921362 100644 --- a/tfjs-backend-wasm/src/backend_wasm.ts +++ b/tfjs-backend-wasm/src/backend_wasm.ts @@ -21,7 +21,7 @@ import {backend_util, BackendTimingInfo, DataStorage, DataType, deprecationWarn, import {BackendWasmModule, WasmFactoryConfig} from '../wasm-out/tfjs-backend-wasm'; import wasmFactoryThreadedSimd from '../wasm-out/tfjs-backend-wasm-threaded-simd.js'; // @ts-ignore -import {wasmWorkerContents} from '../wasm-out/tfjs-backend-wasm-threaded-simd.worker'; +import {wasmWorkerContents} from '../wasm-out/tfjs-backend-wasm-threaded-simd.worker.js'; import wasmFactory from '../wasm-out/tfjs-backend-wasm.js'; const WASM_PRIORITY = 2; From 714088fdf8efa75fb0903730f23fbc930482cf3a Mon Sep 17 00:00:00 2001 From: Ann Yuan Date: Thu, 6 Aug 2020 14:44:51 -0400 Subject: [PATCH 2/3] fix --- tfjs-backend-wasm/scripts/create-worker-module.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tfjs-backend-wasm/scripts/create-worker-module.js b/tfjs-backend-wasm/scripts/create-worker-module.js index 693f8e945ea..6de869e1b8c 100755 --- a/tfjs-backend-wasm/scripts/create-worker-module.js +++ b/tfjs-backend-wasm/scripts/create-worker-module.js @@ -26,5 +26,5 @@ const BASE_PATH = './wasm-out/'; const WORKER_PATH = `${BASE_PATH}tfjs-backend-wasm-threaded-simd.worker.js`; const workerContents = fs.readFileSync(WORKER_PATH, "utf8"); -fs.writeFileSync(`${BASE_PATH}tfjs-backend-wasm-threaded-simd.worker.js`, - `export const wasmWorkerContents = '${workerContents}';`); +fs.writeFileSync(`${WORKER_PATH}`, + `export const wasmWorkerContents = '${workerContents.trim()}';`); From 98ec98cae2f28c928a8afdb0d7f2336b8848dc88 Mon Sep 17 00:00:00 2001 From: Ann Yuan Date: Thu, 6 Aug 2020 14:54:05 -0400 Subject: [PATCH 3/3] save