Merge pull request #111 from justadudewhohacks/karma-face-recognition-model-issue

test/tests/faceRecognitionNet/faceRecognitionNet.test.ts

@@ -22,6 +22,7 @@ describe('faceRecognitionNet', () => {
     faceDescriptor2 = await fetchJson<number[]>('base/test/data/faceDescriptor2.json')
     faceDescriptorRect = await fetchJson<number[]>('base/test/data/faceDescriptorRect.json')
   })
+
   describeWithNets('quantized weights', { withFaceRecognitionNet: { quantized: true } }, ({ faceRecognitionNet }) => {
 
     it('computes face descriptor for squared input', async () => {

test/tests/faceRecognitionNet/faceRecognitionNet.uncompressed.test.ts

@@ -2,9 +2,7 @@ import { fetchImage, fetchJson } from '../../../src';
 import { euclideanDistance } from '../../../src/euclideanDistance';
 import { describeWithNets } from '../../utils';
 
-// TODO: figure out why quantized weights results in NaNs in testcases
-// apparently (net weight values differ when loading with karma)
-xdescribe('faceRecognitionNet, uncompressed', () => {
+describe('faceRecognitionNet, uncompressed', () => {
 
   let imgEl1: HTMLImageElement
   let imgElRect: HTMLImageElement

test/tests/mtcnn/mtcnn.test.ts

@@ -62,7 +62,7 @@ describe('mtcnn', () => {
       const deltas = {
         maxBoxDelta: 2,
         maxLandmarksDelta: 6,
-        maxDescriptorDelta: 0.4
+        maxDescriptorDelta: 0.2
       }
       expect(results.length).toEqual(6)
       expectFullFaceDescriptions(results, expectedFullFaceDescriptions, expectedScores, deltas)

test/tests/ssdMobilenetv1/ssdMobilenetv1.test.ts

@@ -61,7 +61,7 @@ describe('ssdMobilenetv1', () => {
       const deltas = {
         maxBoxDelta: 5,
         maxLandmarksDelta: 1,
-        maxDescriptorDelta: 0.01
+        maxDescriptorDelta: 0.1
       }
       expect(results.length).toEqual(6)
       expectFullFaceDescriptions(results, expectedFullFaceDescriptions, expectedScores, deltas)

test/utils.ts

@@ -200,9 +200,7 @@ export function describeWithNets(
       if (withFaceRecognitionNet || withAllFacesSsdMobilenetv1  || withAllFacesTinyFaceDetector|| withAllFacesMtcnn || withAllFacesTinyYolov2) {
         await initNet<FaceRecognitionNet>(
           faceRecognitionNet,
-          // TODO: figure out why quantized weights results in NaNs in testcases
-          // apparently (net weight values differ when loading with karma)
-          'face_recognition_model.weights'
+          !!withFaceRecognitionNet && !withFaceRecognitionNet.quantized && 'face_recognition_model.weights'
         )
       }
 

tools/quantize/views/quantizeModel.html

@@ -58,7 +58,7 @@
         }
 
         if (isSkipQuantization) {
-          quantizedTensorArrays.push(tensor.dataSync())
+          quantizedTensorArrays.push(new Uint8Array(tensor.dataSync().buffer))
           weightEntries.push(weightEntry)
           return
         }