Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WebNN EP] Support WebNN async API with Asyncify #19145

Merged
merged 9 commits into from
Jan 24, 2024
+30 −49
Merged

[WebNN EP] Support WebNN async API with Asyncify #19145

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e034c53
[Draft][WebNN EP] Test WebNN async API with Asyncify
Honry Jan 15, 2024
a5dca52
Try to register async _OrtCreateSession in jsep
Honry Jan 17, 2024
649e1f5
Addressed comments and added debug log
Honry Jan 18, 2024
7f96b03
Let webnn be used in initJsep
Honry Jan 18, 2024
d8a5c92
Enable webnn async compute, remove debug log, remove unnecessary flags
Honry Jan 19, 2024
1a7edbb
Remove rest debug log
Honry Jan 19, 2024
76a55ab
Remove rest debug log
Honry Jan 19, 2024
47de070
Addressed Ningxin's comment
Honry Jan 22, 2024
564dbb1
Fixed lint error
Honry Jan 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmake/onnxruntime_webassembly.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ else()
endif()

if (onnxruntime_USE_WEBNN)
set_property(TARGET onnxruntime_webassembly APPEND_STRING PROPERTY LINK_FLAGS " --bind -sWASM_BIGINT")
set_property(TARGET onnxruntime_webassembly APPEND_STRING PROPERTY LINK_FLAGS " --bind -sWASM_BIGINT -sASYNCIFY=1 -sASYNCIFY_STACK_SIZE=65536")
guschmue marked this conversation as resolved.
Show resolved Hide resolved
if (onnxruntime_DISABLE_RTTI)
set_property(TARGET onnxruntime_webassembly APPEND_STRING PROPERTY LINK_FLAGS " -fno-rtti -DEMSCRIPTEN_HAS_UNBOUND_TYPE_NAMES=0")
endif()
Expand Down
2 changes: 1 addition & 1 deletion js/web/lib/wasm/binding/ort-wasm.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export interface OrtWasmModule extends EmscriptenModule {

_OrtGetLastError(errorCodeOffset: number, errorMessageOffset: number): void;

_OrtCreateSession(dataOffset: number, dataLength: number, sessionOptionsHandle: number): number;
_OrtCreateSession(dataOffset: number, dataLength: number, sessionOptionsHandle: number): Promise<number>;
_OrtReleaseSession(sessionHandle: number): void;
_OrtGetInputOutputCount(sessionHandle: number, inputCountOffset: number, outputCountOffset: number): number;
_OrtGetInputName(sessionHandle: number, index: number): number;
Expand Down
2 changes: 1 addition & 1 deletion js/web/lib/wasm/wasm-core-impl.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ export const createSession = async(
await Promise.all(loadingPromises);
}

sessionHandle = wasm._OrtCreateSession(modelDataOffset, modelDataLength, sessionOptionsHandle);
sessionHandle = await wasm._OrtCreateSession(modelDataOffset, modelDataLength, sessionOptionsHandle);
if (sessionHandle === 0) {
checkLastError('Can\'t create a session.');
}
Expand Down
2 changes: 1 addition & 1 deletion js/web/script/build.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,7 +397,7 @@ async function main() {
// ort.webgpu[.min].js
await addAllWebBuildTasks({
outputBundleName: 'ort.webgpu',
define: {...DEFAULT_DEFINE, 'BUILD_DEFS.DISABLE_WEBGL': 'true', 'BUILD_DEFS.DISABLE_WEBNN': 'true'},
define: {...DEFAULT_DEFINE, 'BUILD_DEFS.DISABLE_WEBGL': 'true', 'BUILD_DEFS.DISABLE_WEBNN': 'false'},
fs-eire marked this conversation as resolved.
Show resolved Hide resolved
});
// ort.wasm[.min].js
await addAllWebBuildTasks({
Expand Down
7 changes: 6 additions & 1 deletion onnxruntime/core/providers/webnn/builders/model_builder.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,7 +386,12 @@ Status ModelBuilder::Compile(std::unique_ptr<Model>& model) {
for (auto& name : output_names_) {
named_operands.set(name, wnn_operands_.at(name));
}
emscripten::val wnn_graph = wnn_builder_.call<emscripten::val>("buildSync", named_operands);

emscripten::val console = emscripten::val::global("console");
console.call<void>("log", emscripten::val("start webnn async build()..."));
emscripten::val wnn_graph = wnn_builder_.call<emscripten::val>("build", named_operands).await();
console.call<void>("log", wnn_builder_);
console.call<void>("log", emscripten::val("Done webnn async build()..."));
if (!wnn_graph.as<bool>()) {
return ORT_MAKE_STATUS(ONNXRUNTIME, FAIL, "Failed to build WebNN graph.");
}
Expand Down
6 changes: 5 additions & 1 deletion onnxruntime/core/providers/webnn/webnn_execution_provider.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,11 @@ WebNNExecutionProvider::WebNNExecutionProvider(const std::string& webnn_device_f
if (webnn_power_flags.compare("default") != 0) {
context_options.set("powerPreference", emscripten::val(webnn_power_flags));
}
wnn_context_ = ml.call<emscripten::val>("createContextSync", context_options);
emscripten::val console = emscripten::val::global("console");
console.call<void>("log", emscripten::val("start webnn async createContext()..."));
wnn_context_ = ml.call<emscripten::val>("createContext", context_options).await();
console.call<void>("log", wnn_context_);
console.call<void>("log", emscripten::val("Done webnn async createContext()..."));
if (!wnn_context_.as<bool>()) {
ORT_THROW("Failed to create WebNN context.");
}
Expand Down
4 changes: 4 additions & 0 deletions onnxruntime/wasm/js_internal_api.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,10 @@ Module['jsepInit'] = (backend, alloc, free, copy, copyAsync, createKernel, relea
};

// replace the original functions with asyncified versions
Module['_OrtCreateSession'] = runAsync(jsepWrapAsync(
guschmue marked this conversation as resolved.
Show resolved Hide resolved
Module['_OrtCreateSession'],
() => Module['_OrtCreateSession'],
v => Module['_OrtCreateSession'] = v));
Module['_OrtRun'] = runAsync(jsepWrapAsync(
Module['_OrtRun'],
() => Module['_OrtRun'],
Expand Down