saymrwulf/onnxruntime
1
0
Fork 0
mirror of https://github.com/saymrwulf/onnxruntime.git synced 2026-06-04 23:59:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[WebNN EP] Fixed WebNN constant operand is detached issue (#20229)

Browse source 
Wasm allows growing the memory size, this will cause all array buffers
reallocation. WebNN EP passes a wasm view to a WebNN constant directly
which would lead to the WebNN constant be treated as detached buffers in
JS side. Simply create a copy for WebNN constant to fix it.
This commit is contained in:
Wanming Lin 2024-04-11 11:30:03 +08:00 committed by GitHub
parent e6ca360695
commit ee603ee326
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 6 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
onnxruntime/core/providers/webnn/builders/model_builder.cc
View file

@ -197,14 +197,10 @@ Status ModelBuilder::RegisterInitializers() {
default:
break;
}
#ifdef ENABLE_WEBASSEMBLY_THREADS
// Workaround for WebAssembly multi-threads enabled since WebNN API only accepts non-shared ArrayBufferView.
// https://www.w3.org/TR/webnn/#typedefdef-mlnamedarraybufferviews
operand = wnn_builder_.call<emscripten::val>("constant", desc, view.call<emscripten::val>("slice"));
#else
operand = wnn_builder_.call<emscripten::val>("constant", desc, view);
#endif
// Wasm memory grow will cause all array buffers reallocation, which will be treated as detached
// buffers in JS side. Simply create a copy to fix it.
operand = wnn_builder_.call<emscripten::val>("constant", desc, view.call<emscripten::val>("slice"));
} else {
// TODO: support other type.
return ORT_MAKE_STATUS(ONNXRUNTIME, INVALID_ARGUMENT,
@ -360,13 +356,10 @@ Status ModelBuilder::AddOperandFromPersistMemoryBuffer(
desc.set("dimensions", emscripten::val::array(shape));
emscripten::val operand = emscripten::val::object();
#ifdef ENABLE_WEBASSEMBLY_THREADS
// Workaround for WebAssembly multi-threads enabled since WebNN API only accepts non-shared ArrayBufferView.
// https://www.w3.org/TR/webnn/#typedefdef-mlnamedarraybufferviews
// Wasm memory grow will cause all array buffers reallocation, which will be treated as detached
// buffers in JS side. Simply create a copy to fix it.
operand = wnn_builder_.call<emscripten::val>("constant", desc, view.call<emscripten::val>("slice"));
#else
operand = wnn_builder_.call<emscripten::val>("constant", desc, view);
#endif
AddOperand(name, operand);
mem_persist_buffers_.push_back(std::move(persist_buffer));
return Status::OK();