Merge branch 'test-async' of https://github.com/Honry/onnxruntime int…

…o test-async
microsoft · Jan 17, 2024 · 1e1d6bd · 1e1d6bd
2 parents 9876cc7 + 910efe7
commit 1e1d6bd
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/cmake/onnxruntime_webassembly.cmake b/cmake/onnxruntime_webassembly.cmake
@@ -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")
     if (onnxruntime_DISABLE_RTTI)
       set_property(TARGET onnxruntime_webassembly APPEND_STRING PROPERTY LINK_FLAGS " -fno-rtti -DEMSCRIPTEN_HAS_UNBOUND_TYPE_NAMES=0")
     endif()

diff --git a/onnxruntime/core/providers/webnn/builders/model_builder.cc b/onnxruntime/core/providers/webnn/builders/model_builder.cc
@@ -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.");
   }

diff --git a/onnxruntime/core/providers/webnn/webnn_execution_provider.cc b/onnxruntime/core/providers/webnn/webnn_execution_provider.cc
@@ -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.");
   }