[go: nahoru, domu]

Skip to content

Commit

Permalink
[wasm] fix #5021: wechat webassembly support (#5056)
Browse files Browse the repository at this point in the history
BUG
* fix: wechat webassembly support

* replace createInstantiateWasmFunc in better way

* revert miniprogram build target

* Update rollup.config.js

* Update backend_wasm.ts

Co-authored-by: Ping Yu <4018+pyu10055@users.noreply.github.com>
  • Loading branch information
deepkolos and pyu10055 committed May 11, 2021
1 parent 45a10f0 commit f064ce4
Show file tree
Hide file tree
Showing 3 changed files with 62 additions and 1 deletion.
4 changes: 3 additions & 1 deletion tfjs-backend-wasm/rollup.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import node from '@rollup/plugin-node-resolve';
import typescript from '@rollup/plugin-typescript';
import visualizer from 'rollup-plugin-visualizer';
import {getBrowserBundleConfigOptions} from '../rollup.config.helpers';
import {patchWechatWebAssembly} from './scripts/patch-wechat-webassembly';

const PREAMBLE = `/**
* @license
Expand Down Expand Up @@ -143,7 +144,8 @@ module.exports = cmdOptions => {
freeze: false
},
ignore: ['fs', 'path', 'worker_threads', 'perf_hooks', 'os'],
tsCompilerOptions: {target: 'es5'}
tsCompilerOptions: {target: 'es5'},
plugins: [ patchWechatWebAssembly() ]
}));
} else {
const browserBundles = getBrowserBundleConfigOptions(
Expand Down
57 changes: 57 additions & 0 deletions tfjs-backend-wasm/scripts/patch-wechat-webassembly.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
import { walk } from 'estree-walker';

function createInstantiateWasmFunc(path) {
return function (imports, callback) {
WebAssembly.instantiate(path, imports).then(function (output) {
callback(output.instance, output.module);
});
return {};
};
}

/**
* WebAssembly has changed to WXWebAssembly after WeChat 8.0
* 0. not simd or thread support.
* 1. only load local wasm file is allowed.
* 2. WebAssembly.validate not working so env registerFlag doesn't work
* @see https://developers.weixin.qq.com/community/develop/doc/000e2c019f8a003d5dfbb54c251c00?jumpto=comment&commentid=000eac66934960576d0cb1a7256c
*/
export function patchWechatWebAssembly() {
return {
transform(code, file) {
// remove node imports
if (
file.endsWith('tfjs-backend-wasm-threaded-simd.worker.js') ||
file.endsWith('tfjs-backend-wasm-threaded-simd.js')
) {
code = code.replace(`require("worker_threads")`, 'null');
code = code.replace(`require("perf_hooks")`, 'null');
}

// it is not a nice way, but WebAssembly.validate not working and SIMD is not support in WXWebAssembly
// tf.env().set('WASM_HAS_SIMD_SUPPORT', false) will be done in tfjs-wechat or application code
// so does the WASM_HAS_MULTITHREAD_SUPPORT
if (file.endsWith('backend_wasm.ts')) {
const ast = this.parse(code);
walk(ast, {
enter(node) {
if (
node.type === 'FunctionDeclaration' &&
node.id &&
node.id.name === 'createInstantiateWasmFunc'
) {
code = code.replace(
code.slice(node.start, node.end),
createInstantiateWasmFunc.toString(),
);
}
},
});
}

code = code.replace(/WebAssembly\./g, `WXWebAssembly.`);
code = code.replace(/typeof WebAssembly/g, `typeof WXWebAssembly`);
return { code, map: null };
},
};
}
2 changes: 2 additions & 0 deletions tfjs-backend-wasm/src/backend_wasm.ts
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,8 @@ export class BackendWasm extends KernelBackend {
}

function createInstantiateWasmFunc(path: string) {
// this will be replace by rollup plugin patchWechatWebAssembly in
// minprogram's output.
// tslint:disable-next-line:no-any
return (imports: any, callback: any) => {
util.fetch(path, {credentials: 'same-origin'}).then((response) => {
Expand Down

0 comments on commit f064ce4

Please sign in to comment.