Select default layout model on different platform (#215)

* Select default layout model on different platform * remove the test-data
webmachinelearning · Apr 3, 2024 · 6bae0b2 · 6bae0b2
1 parent 553f778
commit 6bae0b2
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 35 deletions.
diff --git a/common/utils.js b/common/utils.js
@@ -484,3 +484,18 @@ export function permuteData(array, dims, axes) {
 
   return [permutedData, shape];
 }
+
+export function getDefaultLayout(deviceType) {
+  const userAgent = navigator.userAgent;
+  if (userAgent.indexOf('Linux') != -1 || userAgent.indexOf('Android') != -1 ||
+      userAgent.indexOf('CrOS') != -1) {
+    return 'nhwc';
+  } else {
+    // Windows or Mac platform.
+    if (deviceType.indexOf('cpu') != -1) {
+      return 'nhwc';
+    } else if (deviceType.indexOf('gpu') != -1) {
+      return 'nchw';
+    }
+  }
+}
diff --git a/face_recognition/main.js b/face_recognition/main.js
@@ -51,13 +51,7 @@ $(document).ready(async () => {
 
 $('#backendBtns .btn').on('change', async (e) => {
   if (inputType === 'camera') utils.stopCameraStream(rafReq, stream);
-  if ($(e.target).attr('id').indexOf('cpu') != -1) {
-    layout = 'nhwc';
-  } else if (($(e.target).attr('id').indexOf('gpu') != -1)) {
-    layout = 'nchw';
-  } else {
-    throw new Error('Unknown backend');
-  }
+  layout = utils.getDefaultLayout($(e.target).attr('id'));
   await main();
 });
 

diff --git a/facial_landmark_detection/main.js b/facial_landmark_detection/main.js
@@ -47,13 +47,7 @@ $(document).ready(async () => {
 
 $('#backendBtns .btn').on('change', async (e) => {
   if (inputType === 'camera') utils.stopCameraStream(rafReq, stream);
-  if ($(e.target).attr('id').indexOf('cpu') != -1) {
-    layout = 'nhwc';
-  } else if (($(e.target).attr('id').indexOf('gpu') != -1)) {
-    layout = 'nchw';
-  } else {
-    throw new Error('Unknown backend');
-  }
+  layout = utils.getDefaultLayout($(e.target).attr('id'));
   await main();
 });
 

diff --git a/image_classification/main.js b/image_classification/main.js
@@ -51,13 +51,7 @@ $(document).ready(async () => {
 
 $('#backendBtns .btn').on('change', async (e) => {
   if (inputType === 'camera') utils.stopCameraStream(rafReq, stream);
-  if ($(e.target).attr('id').indexOf('cpu') != -1) {
-    layout = 'nhwc';
-  } else if (($(e.target).attr('id').indexOf('gpu') != -1)) {
-    layout = 'nchw';
-  } else {
-    throw new Error('Unknown backend');
-  }
+  layout = utils.getDefaultLayout($(e.target).attr('id'));
   await main();
 });
 

diff --git a/object_detection/main.js b/object_detection/main.js
@@ -49,13 +49,7 @@ $(document).ready(async () => {
 
 $('#backendBtns .btn').on('change', async (e) => {
   if (inputType === 'camera') utils.stopCameraStream(rafReq, stream);
-  if ($(e.target).attr('id').indexOf('cpu') != -1) {
-    layout = 'nhwc';
-  } else if (($(e.target).attr('id').indexOf('gpu') != -1)) {
-    layout = 'nchw';
-  } else {
-    throw new Error('Unknown backend');
-  }
+  layout = utils.getDefaultLayout($(e.target).attr('id'));
   await main();
 });
 

diff --git a/semantic_segmentation/main.js b/semantic_segmentation/main.js
@@ -49,13 +49,7 @@ $(window).on('load', () => {
 
 $('#backendBtns .btn').on('change', async (e) => {
   if (inputType === 'camera') utils.stopCameraStream(rafReq, stream);
-  if ($(e.target).attr('id').indexOf('cpu') != -1) {
-    layout = 'nhwc';
-  } else if (($(e.target).attr('id').indexOf('gpu') != -1)) {
-    layout = 'nchw';
-  } else {
-    throw new Error('Unknown backend');
-  }
+  layout = utils.getDefaultLayout($(e.target).attr('id'));
   await main();
 });