Refactoring the origin of weights (#199)

* Update README to add HTTPS support and change the weights file to CDN service * refactoring origin of weights
webmachinelearning · Mar 18, 2024 · 994351d · 994351d
1 parent dbfab8f
commit 994351d
Show file tree

Hide file tree

Showing 23 changed files with 76 additions and 116 deletions.
diff --git a/common/utils.js b/common/utils.js
@@ -3,6 +3,14 @@
 import {numpy} from './libs/numpy.js';
 import {addAlert} from './ui.js';
 
+export function weightsOrigin() {
+  if (location.hostname.toLowerCase().indexOf('github.io') > -1) {
+    return 'https://d3i5xkfad89fac.cloudfront.net';
+  } else {
+    return '..';
+  }
+}
+
 export function sizeOfShape(shape) {
   return shape.reduce((a, b) => {
     return a * b;

diff --git a/face_recognition/facenet_nchw.js b/face_recognition/facenet_nchw.js
@@ -1,6 +1,6 @@
 'use strict';
 
-import {buildConstantByNpy, computePadding2DForAutoPad} from '../common/utils.js';
+import {buildConstantByNpy, computePadding2DForAutoPad, weightsOrigin} from '../common/utils.js';
 const strides = [2, 2];
 const autoPad = 'same-upper';
 
@@ -12,10 +12,8 @@ export class FaceNetNchw {
     this.context_ = null;
     this.builder_ = null;
     this.graph_ = null;
-    this.weightsUrl_ = '../test-data/models/facenet_nchw/weights';
-    if (location.hostname.toLowerCase().indexOf('github.io') > -1) {
-      this.weightsUrl_ = 'https://d3i5xkfad89fac.cloudfront.net/test-data/models/facenet_nchw/weights';
-    }
+    this.weightsUrl_ = weightsOrigin() +
+      '/test-data/models/facenet_nchw/weights';
     this.inputOptions = {
       mean: [127.5, 127.5, 127.5, 127.5],
       std: [127.5, 127.5, 127.5, 127.5],

diff --git a/face_recognition/facenet_nhwc.js b/face_recognition/facenet_nhwc.js
@@ -1,6 +1,6 @@
 'use strict';
 
-import {buildConstantByNpy, computePadding2DForAutoPad} from '../common/utils.js';
+import {buildConstantByNpy, computePadding2DForAutoPad, weightsOrigin} from '../common/utils.js';
 const strides = [2, 2];
 const autoPad = 'same-upper';
 
@@ -12,10 +12,8 @@ export class FaceNetNhwc {
     this.context_ = null;
     this.builder_ = null;
     this.graph_ = null;
-    this.weightsUrl_ = '../test-data/models/facenet_nhwc/weights';
-    if (location.hostname.toLowerCase().indexOf('github.io') > -1) {
-      this.weightsUrl_ = 'https://d3i5xkfad89fac.cloudfront.net/test-data/models/facenet_nhwc/weights';
-    }
+    this.weightsUrl_ = weightsOrigin() +
+      '/test-data/models/facenet_nhwc/weights';
     this.inputOptions = {
       mean: [127.5, 127.5, 127.5, 127.5],
       std: [127.5, 127.5, 127.5, 127.5],

diff --git a/facial_landmark_detection/face_landmark_nchw.js b/facial_landmark_detection/face_landmark_nchw.js
@@ -1,17 +1,15 @@
 'use strict';
 
-import {buildConstantByNpy} from '../common/utils.js';
+import {buildConstantByNpy, weightsOrigin} from '../common/utils.js';
 
 // SimpleCNN model with 'nchw' layout.
 export class FaceLandmarkNchw {
   constructor() {
     this.context_ = null;
     this.builder_ = null;
     this.graph_ = null;
-    this.weightsUrl_ = '../test-data/models/face_landmark_nchw/weights';
-    if (location.hostname.toLowerCase().indexOf('github.io') > -1) {
-      this.weightsUrl_ = 'https://d3i5xkfad89fac.cloudfront.net/test-data/models/face_landmark_nchw/weights';
-    }
+    this.weightsUrl_ = weightsOrigin() +
+      '/test-data/models/face_landmark_nchw/weights/';
     this.inputOptions = {
       inputLayout: 'nchw',
       inputDimensions: [1, 3, 128, 128],

diff --git a/facial_landmark_detection/face_landmark_nhwc.js b/facial_landmark_detection/face_landmark_nhwc.js
@@ -1,17 +1,15 @@
 'use strict';
 
-import {buildConstantByNpy} from '../common/utils.js';
+import {buildConstantByNpy, weightsOrigin} from '../common/utils.js';
 
 // SimpleCNN model with 'nhwc' layout.
 export class FaceLandmarkNhwc {
   constructor() {
     this.context_ = null;
     this.builder_ = null;
     this.graph_ = null;
-    this.weightsUrl_ = '../test-data/models/face_landmark_nhwc/weights';
-    if (location.hostname.toLowerCase().indexOf('github.io') > -1) {
-      this.weightsUrl_ = 'https://d3i5xkfad89fac.cloudfront.net/test-data/models/face_landmark_nhwc/weights';
-    }
+    this.weightsUrl_ = weightsOrigin() +
+      '/test-data/models/face_landmark_nhwc/weights/';
     this.inputOptions = {
       inputLayout: 'nhwc',
       inputDimensions: [1, 128, 128, 3],

diff --git a/facial_landmark_detection/ssd_mobilenetv2_face_nchw.js b/facial_landmark_detection/ssd_mobilenetv2_face_nchw.js
@@ -1,6 +1,6 @@
 'use strict';
 
-import {buildConstantByNpy, computePadding2DForAutoPad} from '../common/utils.js';
+import {buildConstantByNpy, computePadding2DForAutoPad, weightsOrigin} from '../common/utils.js';
 
 // SSD MobileNet V2 Face model with 'nchw' layout.
 export class SsdMobilenetV2FaceNchw {
@@ -9,10 +9,8 @@ export class SsdMobilenetV2FaceNchw {
     this.deviceType_ = null;
     this.builder_ = null;
     this.graph_ = null;
-    this.weightsUrl_ = '../test-data/models/ssd_mobilenetv2_face_nchw/weights/';
-    if (location.hostname.toLowerCase().indexOf('github.io') > -1) {
-      this.weightsUrl_ = 'https://d3i5xkfad89fac.cloudfront.net/test-data/models/ssd_mobilenetv2_face_nchw/weights/';
-    }
+    this.weightsUrl_ = weightsOrigin() +
+    '/test-data/models/ssd_mobilenetv2_face_nchw/weights/';
     this.inputOptions = {
       inputLayout: 'nchw',
       margin: [1.2, 1.2, 0.8, 1.1],

diff --git a/facial_landmark_detection/ssd_mobilenetv2_face_nhwc.js b/facial_landmark_detection/ssd_mobilenetv2_face_nhwc.js
@@ -1,6 +1,6 @@
 'use strict';
 
-import {buildConstantByNpy, computePadding2DForAutoPad} from '../common/utils.js';
+import {buildConstantByNpy, computePadding2DForAutoPad, weightsOrigin} from '../common/utils.js';
 
 // SSD MobileNet V2 Face model with 'nhwc' layout.
 export class SsdMobilenetV2FaceNhwc {
@@ -9,10 +9,8 @@ export class SsdMobilenetV2FaceNhwc {
     this.deviceType_ = null;
     this.builder_ = null;
     this.graph_ = null;
-    this.weightsUrl_ = '../test-data/models/ssd_mobilenetv2_face_nhwc/weights/';
-    if (location.hostname.toLowerCase().indexOf('github.io') > -1) {
-      this.weightsUrl_ = 'https://d3i5xkfad89fac.cloudfront.net/test-data/models/ssd_mobilenetv2_face_nhwc/weights/';
-    }
+    this.weightsUrl_ = weightsOrigin() +
+      '/test-data/models/ssd_mobilenetv2_face_nhwc/weights/';
     this.inputOptions = {
       inputLayout: 'nhwc',
       margin: [1.2, 1.2, 0.8, 1.1],

diff --git a/image_classification/mobilenet_nchw.js b/image_classification/mobilenet_nchw.js
@@ -1,6 +1,6 @@
 'use strict';
 
-import {buildConstantByNpy} from '../common/utils.js';
+import {buildConstantByNpy, weightsOrigin} from '../common/utils.js';
 
 // MobileNet V2 model with 'nchw' input layout
 export class MobileNetV2Nchw {
@@ -9,10 +9,8 @@ export class MobileNetV2Nchw {
     this.deviceType_ = null;
     this.builder_ = null;
     this.graph_ = null;
-    this.weightsUrl_ = '../test-data/models/mobilenetv2_nchw/weights/';
-    if (location.hostname.toLowerCase().indexOf('github.io') > -1) {
-      this.weightsUrl_ = 'https://d3i5xkfad89fac.cloudfront.net/test-data/models/mobilenetv2_nchw/weights/';
-    }
+    this.weightsUrl_ = weightsOrigin() +
+      '/test-data/models/mobilenetv2_nchw/weights/';
     this.inputOptions = {
       mean: [0.485, 0.456, 0.406],
       std: [0.229, 0.224, 0.225],

diff --git a/image_classification/mobilenet_nhwc.js b/image_classification/mobilenet_nhwc.js
@@ -1,6 +1,6 @@
 'use strict';
 
-import {buildConstantByNpy, computePadding2DForAutoPad} from '../common/utils.js';
+import {buildConstantByNpy, computePadding2DForAutoPad, weightsOrigin} from '../common/utils.js';
 
 /* eslint max-len: ["error", {"code": 120}] */
 
@@ -11,10 +11,8 @@ export class MobileNetV2Nhwc {
     this.deviceType_ = null;
     this.builder_ = null;
     this.graph_ = null;
-    this.weightsUrl_ = '../test-data/models/mobilenetv2_nhwc/weights/';
-    if (location.hostname.toLowerCase().indexOf('github.io') > -1) {
-      this.weightsUrl_ = 'https://d3i5xkfad89fac.cloudfront.net/test-data/models/mobilenetv2_nhwc/weights/';
-    }
+    this.weightsUrl_ = weightsOrigin() +
+      '/test-data/models/mobilenetv2_nhwc/weights/';
     this.inputOptions = {
       mean: [127.5, 127.5, 127.5],
       std: [127.5, 127.5, 127.5],

diff --git a/image_classification/resnet50v2_nchw.js b/image_classification/resnet50v2_nchw.js
@@ -1,17 +1,15 @@
 'use strict';
 
-import {buildConstantByNpy} from '../common/utils.js';
+import {buildConstantByNpy, weightsOrigin} from '../common/utils.js';
 
 // ResNet50 V2 model with 'nchw' input layout
 export class ResNet50V2Nchw {
   constructor() {
     this.context_ = null;
     this.builder_ = null;
     this.graph_ = null;
-    this.weightsUrl_ = '../test-data/models/resnet50v2_nchw/weights/';
-    if (location.hostname.toLowerCase().indexOf('github.io') > -1) {
-      this.weightsUrl_ = 'https://d3i5xkfad89fac.cloudfront.net/test-data/models/resnet50v2_nchw/weights/';
-    }
+    this.weightsUrl_ = weightsOrigin() +
+      '/test-data/models/resnet50v2_nchw/weights/';
     this.inputOptions = {
       mean: [0.485, 0.456, 0.406],
       std: [0.229, 0.224, 0.225],

diff --git a/image_classification/resnet50v2_nhwc.js b/image_classification/resnet50v2_nhwc.js
@@ -1,6 +1,6 @@
 'use strict';
 
-import {buildConstantByNpy, computePadding2DForAutoPad} from '../common/utils.js';
+import {buildConstantByNpy, computePadding2DForAutoPad, weightsOrigin} from '../common/utils.js';
 
 const autoPad = 'same-upper';
 const strides = [2, 2];
@@ -12,10 +12,8 @@ export class ResNet50V2Nhwc {
     this.context_ = null;
     this.builder_ = null;
     this.graph_ = null;
-    this.weightsUrl_ = '../test-data/models/resnet50v2_nhwc/weights/';
-    if (location.hostname.toLowerCase().indexOf('github.io') > -1) {
-      this.weightsUrl_ = 'https://d3i5xkfad89fac.cloudfront.net/test-data/models/resnet50v2_nhwc/weights/';
-    }
+    this.weightsUrl_ = weightsOrigin() +
+      '/test-data/models/resnet50v2_nhwc/weights/';
     this.inputOptions = {
       mean: [127.5, 127.5, 127.5],
       std: [127.5, 127.5, 127.5],

diff --git a/image_classification/squeezenet_nchw.js b/image_classification/squeezenet_nchw.js
@@ -1,17 +1,15 @@
 'use strict';
 
-import {buildConstantByNpy} from '../common/utils.js';
+import {buildConstantByNpy, weightsOrigin} from '../common/utils.js';
 
 // SqueezeNet 1.1 model with 'nchw' input layout
 export class SqueezeNetNchw {
   constructor() {
     this.context_ = null;
     this.builder_ = null;
     this.graph_ = null;
-    this.weightsUrl_ = '../test-data/models/squeezenet1.1_nchw/weights/';
-    if (location.hostname.toLowerCase().indexOf('github.io') > -1) {
-      this.weightsUrl_ = 'https://d3i5xkfad89fac.cloudfront.net/test-data/models/squeezenet1.1_nchw/weights/';
-    }
+    this.weightsUrl_ = weightsOrigin() +
+      '/test-data/models/squeezenet1.1_nchw/weights/';
     this.inputOptions = {
       mean: [0.485, 0.456, 0.406],
       std: [0.229, 0.224, 0.225],

diff --git a/image_classification/squeezenet_nhwc.js b/image_classification/squeezenet_nhwc.js
@@ -1,17 +1,15 @@
 'use strict';
 
-import {buildConstantByNpy, computePadding2DForAutoPad} from '../common/utils.js';
+import {buildConstantByNpy, computePadding2DForAutoPad, weightsOrigin} from '../common/utils.js';
 
 // SqueezeNet 1.0 model with 'nhwc' layout
 export class SqueezeNetNhwc {
   constructor() {
     this.context_ = null;
     this.builder_ = null;
     this.graph_ = null;
-    this.weightsUrl_ = '../test-data/models/squeezenet1.0_nhwc/weights/';
-    if (location.hostname.toLowerCase().indexOf('github.io') > -1) {
-      this.weightsUrl_ = 'https://d3i5xkfad89fac.cloudfront.net/test-data/models/squeezenet1.0_nhwc/weights/';
-    }
+    this.weightsUrl_ = weightsOrigin() +
+    '/test-data/models/squeezenet1.0_nhwc/weights/';
     this.inputOptions = {
       mean: [127.5, 127.5, 127.5],
       std: [127.5, 127.5, 127.5],

diff --git a/lenet/main.js b/lenet/main.js
@@ -64,10 +64,8 @@ async function main() {
   await utils.setBackend(backend, deviceType);
   drawNextDigitFromMnist();
   const pen = new Pen(visualCanvas);
-  let weightUrl = '../test-data/models/lenet_nchw/weights/lenet.bin';
-  if (location.hostname.toLowerCase().indexOf('github.io') > -1) {
-    weightUrl = 'https://d3i5xkfad89fac.cloudfront.net/test-data/models/lenet_nchw/weights/lenet.bin';
-  }
+  const weightUrl = utils.weightsOrigin() +
+    '/test-data/models/lenet_nchw/weights/lenet.bin';
   const lenet = new LeNet(weightUrl);
   const [numRuns, powerPreference, numThreads] = utils.getUrlParams();
   try {

diff --git a/nsnet2/denoiser.js b/nsnet2/denoiser.js
@@ -1,6 +1,6 @@
 import {NSNet2} from './nsnet2.js';
 import * as featurelib from './featurelib.js';
-import {sizeOfShape, getUrlParams} from '../common/utils.js';
+import {sizeOfShape, getUrlParams, weightsOrigin} from '../common/utils.js';
 
 export class Denoiser {
   constructor(batchSize, frames, sampleRate) {
@@ -29,10 +29,8 @@ export class Denoiser {
     return new Promise((resolve, reject) => {
       this.log(' - Loading weights... ');
       const start = performance.now();
-      let weightsUrl = '../test-data/models/nsnet2/weights/';
-      if (location.hostname.toLowerCase().indexOf('github.io') > -1) {
-        weightsUrl = 'https://d3i5xkfad89fac.cloudfront.net/test-data/models/nsnet2/weights/';
-      }
+      const weightsUrl = weightsOrigin() +
+        '/test-data/models/nsnet2/weights/';
       const powerPreference = getUrlParams()[1];
       const contextOptions = {deviceType};
       if (powerPreference) {

diff --git a/object_detection/ssd_mobilenetv1_nchw.js b/object_detection/ssd_mobilenetv1_nchw.js
@@ -1,6 +1,6 @@
 'use strict';
 
-import {buildConstantByNpy, computePadding2DForAutoPad} from '../common/utils.js';
+import {buildConstantByNpy, computePadding2DForAutoPad, weightsOrigin} from '../common/utils.js';
 
 // SSD MobileNet V1 model with 'nchw' layout, trained on the COCO dataset.
 export class SsdMobilenetV1Nchw {
@@ -10,15 +10,11 @@ export class SsdMobilenetV1Nchw {
     this.model_ = null;
     this.builder_ = null;
     this.graph_ = null;
-    this.weightsUrl_ = '../test-data/models/ssd_mobilenetv1_nchw/weights/';
-    if (location.hostname.toLowerCase().indexOf('github.io') > -1) {
-      this.weightsUrl_ = 'https://d3i5xkfad89fac.cloudfront.net/test-data/models/ssd_mobilenetv1_nchw/weights/';
-    }
+    this.weightsUrl_ = weightsOrigin() +
+      '/test-data/models/ssd_mobilenetv1_nchw/weights/';
     // Shares the same bias files with 'nhwc' layout
-    this.biasUrl_ = '../test-data/models/ssd_mobilenetv1_nhwc/weights/';
-    if (location.hostname.toLowerCase().indexOf('github.io') > -1) {
-      this.biasUrl_ = 'https://d3i5xkfad89fac.cloudfront.net/test-data/models/ssd_mobilenetv1_nhwc/weights/';
-    }
+    this.biasUrl_ = weightsOrigin() +
+      '/test-data/models/ssd_mobilenetv1_nhwc/weights/';
     this.inputOptions = {
       inputLayout: 'nchw',
       labelUrl: './labels/coco_classes.txt',

diff --git a/object_detection/ssd_mobilenetv1_nhwc.js b/object_detection/ssd_mobilenetv1_nhwc.js
@@ -1,6 +1,6 @@
 'use strict';
 
-import {buildConstantByNpy, computePadding2DForAutoPad} from '../common/utils.js';
+import {buildConstantByNpy, computePadding2DForAutoPad, weightsOrigin} from '../common/utils.js';
 
 // SSD MobileNet V1 model with 'nhwc' layout, trained on the COCO dataset.
 export class SsdMobilenetV1Nhwc {
@@ -10,10 +10,8 @@ export class SsdMobilenetV1Nhwc {
     this.model_ = null;
     this.builder_ = null;
     this.graph_ = null;
-    this.weightsUrl_ = '../test-data/models/ssd_mobilenetv1_nhwc/weights/';
-    if (location.hostname.toLowerCase().indexOf('github.io') > -1) {
-      this.weightsUrl_ = 'https://d3i5xkfad89fac.cloudfront.net/test-data/models/ssd_mobilenetv1_nhwc/weights/';
-    }
+    this.weightsUrl_ = weightsOrigin() +
+      '/test-data/models/ssd_mobilenetv1_nhwc/weights/';
     this.inputOptions = {
       inputLayout: 'nhwc',
       labelUrl: './labels/coco_classes.txt',

diff --git a/object_detection/tiny_yolov2_nchw.js b/object_detection/tiny_yolov2_nchw.js
@@ -1,17 +1,15 @@
 'use strict';
 
-import {buildConstantByNpy, computePadding2DForAutoPad} from '../common/utils.js';
+import {buildConstantByNpy, computePadding2DForAutoPad, weightsOrigin} from '../common/utils.js';
 
 // Tiny Yolo V2 model with 'nchw' layout, trained on the Pascal VOC dataset.
 export class TinyYoloV2Nchw {
   constructor() {
     this.context_ = null;
     this.builder_ = null;
     this.graph_ = null;
-    this.weightsUrl_ = '../test-data/models/tiny_yolov2_nchw/weights/';
-    if (location.hostname.toLowerCase().indexOf('github.io') > -1) {
-      this.weightsUrl_ = 'https://d3i5xkfad89fac.cloudfront.net/test-data/models/tiny_yolov2_nchw/weights/';
-    }
+    this.weightsUrl_ = weightsOrigin() +
+      '/test-data/models/tiny_yolov2_nchw/weights/';
     this.inputOptions = {
       inputLayout: 'nchw',
       labelUrl: './labels/pascal_classes.txt',

diff --git a/object_detection/tiny_yolov2_nhwc.js b/object_detection/tiny_yolov2_nhwc.js
@@ -1,17 +1,15 @@
 'use strict';
 
-import {buildConstantByNpy, computePadding2DForAutoPad} from '../common/utils.js';
+import {buildConstantByNpy, computePadding2DForAutoPad, weightsOrigin} from '../common/utils.js';
 
 // Tiny Yolo V2 model with 'nhwc' layout, trained on the Pascal VOC dataset.
 export class TinyYoloV2Nhwc {
   constructor() {
     this.context_ = null;
     this.builder_ = null;
     this.graph_ = null;
-    this.weightsUrl_ = '../test-data/models/tiny_yolov2_nhwc/weights/';
-    if (location.hostname.toLowerCase().indexOf('github.io') > -1) {
-      this.weightsUrl_ = 'https://d3i5xkfad89fac.cloudfront.net/test-data/models/tiny_yolov2_nhwc/weights/';
-    }
+    this.weightsUrl_ = weightsOrigin() +
+      '/test-data/models/tiny_yolov2_nhwc/weights/';
     this.inputOptions = {
       inputLayout: 'nhwc',
       labelUrl: './labels/pascal_classes.txt',