change arrayAsync

package-lock.json

@@ -123,17 +123,17 @@
     },
     "@types/seedrandom": {
       "version": "2.4.27",
-      "resolved": "https://tclar30.es.telefonica/artifacts/repo/npm/@types/seedrandom/-/seedrandom-2.4.27.tgz",
+      "resolved": "http://registry.npmjs.org/@types/seedrandom/-/seedrandom-2.4.27.tgz",
       "integrity": "sha1-nbVjk33YaRX2kJK8QyWdL0hXjkE="
     },
     "@types/webgl-ext": {
       "version": "0.0.30",
-      "resolved": "https://tclar30.es.telefonica/artifacts/repo/npm/@types/webgl-ext/-/webgl-ext-0.0.30.tgz",
+      "resolved": "https://registry.npmjs.org/@types/webgl-ext/-/webgl-ext-0.0.30.tgz",
       "integrity": "sha512-LKVgNmBxN0BbljJrVUwkxwRYqzsAEPcZOe6S2T6ZaBDIrFp0qu4FNlpc5sM1tGbXUYFgdVQIoeLk1Y1UoblyEg=="
     },
     "@types/webgl2": {
       "version": "0.0.4",
-      "resolved": "https://tclar30.es.telefonica/artifacts/repo/npm/@types/webgl2/-/webgl2-0.0.4.tgz",
+      "resolved": "https://registry.npmjs.org/@types/webgl2/-/webgl2-0.0.4.tgz",
       "integrity": "sha512-PACt1xdErJbMUOUweSrbVM7gSIYm1vTncW2hF6Os/EeWi6TXYAYMPp+8v6rzHmypE5gHrxaxZNXgMkJVIdZpHw=="
     },
     "abbrev": {
@@ -4718,7 +4718,7 @@
     },
     "seedrandom": {
       "version": "2.4.3",
-      "resolved": "https://tclar30.es.telefonica/artifacts/repo/npm/seedrandom/-/seedrandom-2.4.3.tgz",
+      "resolved": "https://registry.npmjs.org/seedrandom/-/seedrandom-2.4.3.tgz",
       "integrity": "sha1-JDhQTa0zkXMUv/GKxNeU8W1qrsw="
     },
     "semver": {
@@ -5240,25 +5240,12 @@
       }
     },
     "tfjs-image-recognition-base": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/tfjs-image-recognition-base/-/tfjs-image-recognition-base-0.4.1.tgz",
-      "integrity": "sha512-oJOLByZa0OgPaLB17ZlL2qO8dIQwgV1ma4/iEFbzVbF8yd0qOomIuEGvyPzXDfD0dmyPwzj8Ysa3Jq+O375Fpw==",
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/tfjs-image-recognition-base/-/tfjs-image-recognition-base-0.5.0.tgz",
+      "integrity": "sha512-u/BPhsoieBm8bE3QXd5WdKmo/CKXoeab0x4x11yyg7O24esUM9RqdX9dI5Byw8jcjjrb705izSSznqXr61GTHg==",
       "requires": {
-        "@tensorflow/tfjs-core": "0.14.2",
+        "@tensorflow/tfjs-core": "1.0.1",
         "tslib": "^1.9.3"
-      },
-      "dependencies": {
-        "@tensorflow/tfjs-core": {
-          "version": "0.14.2",
-          "resolved": "https://tclar30.es.telefonica/artifacts/repo/npm/@tensorflow/tfjs-core/-/tfjs-core-0.14.2.tgz",
-          "integrity": "sha512-VVbcu6H3ioKCkfkep/gQASfzPnQt3C5v+4ppH9pQ6Lf0lD+l3NMuMJYxa8Wjac1TfiWhFEX58bJvhpMfTGsUlg==",
-          "requires": {
-            "@types/seedrandom": "2.4.27",
-            "@types/webgl-ext": "0.0.30",
-            "@types/webgl2": "0.0.4",
-            "seedrandom": "2.4.3"
-          }
-        }
       }
     },
     "through2": {

src/mtcnn/stage2.ts

@@ -54,13 +54,15 @@ export async function stage2(
     )
     stats.stage2_nms = Date.now() - ts
 
-    const regions = indicesNms.map(idx =>
-      new MtcnnBox(
-        rnetOuts[indices[idx]].regions.arraySync()[0][0],
-        rnetOuts[indices[idx]].regions.arraySync()[0][1],
-        rnetOuts[indices[idx]].regions.arraySync()[0][2],
-        rnetOuts[indices[idx]].regions.arraySync()[0][3]
-      )
+    const regions = indicesNms.map(idx =>{
+        const regionsData = rnetOuts[indices[idx]].regions.arraySync()
+        return new MtcnnBox(
+          regionsData[0][0],
+          regionsData[0][1],
+          regionsData[0][2],
+          regionsData[0][3]
+        )
+      }
     )
 
     finalScores = indicesNms.map(idx => filteredScores[idx])

src/mtcnn/stage3.ts

@@ -39,12 +39,14 @@ export async function stage3(
     .filter(c => c.score > scoreThreshold)
     .map(({ idx }) => idx)
 
-  const filteredRegions = indices.map(idx => new MtcnnBox(
-    onetOuts[idx].regions.arraySync()[0][0],
-    onetOuts[idx].regions.arraySync()[0][1],
-    onetOuts[idx].regions.arraySync()[0][2],
-    onetOuts[idx].regions.arraySync()[0][3]
-  ))
+  const filteredRegions = indices.map(idx => {
+    const regionsData = onetOuts[idx].regions.arraySync();
+    return new MtcnnBox(
+      regionsData[0][0],
+      regionsData[0][1],
+      regionsData[0][2],
+      regionsData[0][3]
+  )})
   const filteredBoxes = indices
     .map((idx, i) => inputBoxes[idx].calibrate(filteredRegions[i]))
   const filteredScores = indices.map(idx => scores[idx])
@@ -67,11 +69,13 @@ export async function stage3(
     finalBoxes = indicesNms.map(idx => filteredBoxes[idx])
     finalScores = indicesNms.map(idx => filteredScores[idx])
     points = indicesNms.map((idx, i) =>
-      Array(5).fill(0).map((_, ptIdx) =>
-        new Point(
-          ((onetOuts[idx].points.arraySync()[0][ptIdx] * (finalBoxes[i].width + 1)) + finalBoxes[i].left) ,
-          ((onetOuts[idx].points.arraySync()[0][ptIdx+5] * (finalBoxes[i].height + 1)) + finalBoxes[i].top)
-        )
+      Array(5).fill(0).map((_, ptIdx) =>{
+          const pointsData = onetOuts[idx].points.arraySync()
+          return new Point(
+            ((pointsData[0][ptIdx] * (finalBoxes[i].width + 1)) + finalBoxes[i].left) ,
+            ((pointsData[0][ptIdx+5] * (finalBoxes[i].height + 1)) + finalBoxes[i].top)
+          )
+        }
       )
     )
   }