Test different layout for CPU backend

Honry · Aug 6, 2024 · 5019005 · 5019005
1 parent 897226c
commit 5019005
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/common/utils.js b/common/utils.js
@@ -342,7 +342,12 @@ export function getUrlParams() {
     }
   }
 
-  return [numRuns, powerPreference, numThreads];
+  let new_layout = 'nchw';
+  if (['nhwc', 'nchw'].includes(params.get('layout'))) {
+    new_layout = params.get('layout');
+  }
+
+  return [numRuns, powerPreference, numThreads, new_layout];
 }
 
 // Set backend for using WebNN-polyfill or WebNN

diff --git a/image_classification/main.js b/image_classification/main.js
@@ -95,7 +95,7 @@ $('#backendBtns .btn').on('change', async (e) => {
     await stopCamRender();
   }
   const backendId = $(e.target).attr('id');
-  layout = utils.getDefaultLayout(backendId);
+  // layout = utils.getDefaultLayout(backendId);
   [backend, deviceType] = backendId.split('_');
   // Only show the supported models for each deviceType. Now fp16 nchw models
   // are only supported on gpu/npu.
@@ -313,7 +313,8 @@ async function main() {
     ui.handleClick(disabledSelectors, true);
     if (isFirstTimeLoad) $('#hint').hide();
     let start;
-    const [numRuns, powerPreference, numThreads] = utils.getUrlParams();
+    const [numRuns, powerPreference, numThreads, new_layout] = utils.getUrlParams();
+    layout = new_layout;
 
     // Only do load() and build() when model first time loads,
     // there's new model choosed, backend changed or device changed