Update builds to support MLDeviceType enum (cpu, gpu,npu) and numThreads (tensorflow#10)

* Update tensorflow_lite_webnn_delegate.patch

* Update builds to support MLDeviceType enum (cpu, gpu, npu)

Author: Honry

tensorflow_lite_support/web/tflite_model_runner/cc/tflite_model_runner.cc

@@ -105,6 +105,7 @@ TfLiteStatus TFLiteWebModelRunner::InitFromBuffer(
     TfLiteWebNNDelegateOptions options =
         TfLiteWebNNDelegateOptionsDefault();
     options.deviceType = options_.webnn_device_preference;
+    options.numThreads = options_.webnn_num_threads;
     auto webnn_delegate = TfLiteWebNNDelegateCreate(&options);
     auto delegate_ptr = tflite::Interpreter::TfLiteDelegatePtr(webnn_delegate, [](TfLiteDelegate* delegate) {
       TfLiteWebNNDelegateDelete(delegate);

tensorflow_lite_support/web/tflite_model_runner/cc/tflite_model_runner.h

@@ -37,9 +37,11 @@ struct TFLiteWebModelRunnerOptions {
 
   bool enable_webnn_delegate = false;
 
-  // 0 - default, 1 - gpu, 2 - cpu
+  // 0 - cpu, 1 - gpu, 2 - npu
   int webnn_device_preference = 0;
 
+  int webnn_num_threads = 0;
+
   // TODO(jingjin): Add more as needed.
 };
 

tensorflow_lite_support/web/tflite_model_runner/cc/tflite_model_runner_wasm.cc

@@ -97,7 +97,9 @@ EMSCRIPTEN_BINDINGS(tf_lite_web_model_runner_structs) {
       .field("enableWebNNDelegate",
              &tfweb::generic::TFLiteWebModelRunnerOptions::enable_webnn_delegate)
       .field("webNNDevicePreference",
-             &tfweb::generic::TFLiteWebModelRunnerOptions::webnn_device_preference);
+             &tfweb::generic::TFLiteWebModelRunnerOptions::webnn_device_preference)
+      .field("webNNNumThreads",
+             &tfweb::generic::TFLiteWebModelRunnerOptions::webnn_num_threads);
   class_<tfweb::generic::TFLiteWebModelRunnerTensorInfo>(
       "TFLiteWebModelRunnerTensorInfo")
       .function("data", &GetRawBufferFromTFLiteWebModelRunnerTensorInfo)

tensorflow_lite_support/web/tflite_model_runner/demo/dist/builtin_delegate_worker.js

@@ -36,6 +36,7 @@ onmessage = async (message) => {
               ),
               enableWebNNDelegate: message.data.enableWebNNDelegate,
               webNNDevicePreference: parseInt(message.data.webNNDevicePreference),
+              webNNNumThreads: 0,
             }
           );
 

tensorflow_lite_support/web/tflite_model_runner/demo/dist/external_delegate_worker.js

@@ -1,7 +1,7 @@
 'use strict';
 
 // tfjs-tflite + webnn external delegate
-importScripts('https://cdn.jsdelivr.net/npm/@webmachinelearning/webnn-polyfill/dist/webnn-polyfill.js');
+// importScripts('https://cdn.jsdelivr.net/npm/@webmachinelearning/webnn-polyfill/dist/webnn-polyfill.js');
 importScripts("https://cdn.jsdelivr.net/npm/@tensorflow/tfjs-core");
 importScripts("https://cdn.jsdelivr.net/npm/@tensorflow/tfjs-backend-cpu");
 importScripts('./tfjs-tflite/tf-tflite.js');
@@ -25,7 +25,7 @@ onmessage = async (message) => {
         const webNNDevicePreference = parseInt(message.data.webNNDevicePreference);
 
         if (enableWebNNDelegate) {
-          options.delegatePath = './webnn_external_delegate_wasm.wasm';
+          options.delegatePath = '../webnn_external_delegate_wasm.wasm';
         }
 
         tflite.setWasmPath('./tfjs-tflite/');

tensorflow_lite_support/web/tflite_model_runner/demo/dist/index.html

@@ -63,8 +63,9 @@ <h1>TFLite Web API Model Runner Demo</h1>
     Use WebNN delegate: <input type="checkbox" id="webnnDelegate" />
     Device preference:
     <select id="webnnDevice">
+      <option value="0">cpu</option>
       <option value="1">gpu</option>
-      <option value="2">cpu</option>
+      <option value="2">npu</option>
     </select>
   </div>
   <div>
@@ -75,7 +76,7 @@ <h1>TFLite Web API Model Runner Demo</h1>
     <img src="wine.jpeg" alt="wine" />
     <div class="result"></div>
   </div>
-  <script src="./tflite_model_runner_cc_simd.js"></script>
+  <!-- <script src="./tflite_model_runner_cc_simd.js"></script> -->
   <script src="https://cdn.jsdelivr.net/npm/@tensorflow/tfjs/dist/tf.min.js"></script>
   <script src="./script.js"></script>
 </body>