Update dnn-metadata.json

source/dnn-metadata.json

@@ -1,139 +1,109 @@
 [
   {
-    "name": "conv",
-    "schema": {
-      "category": "Layer",
-      "inputs": [
-        { "name": "input" },
-        { "name": "weights" },
-        { "name": "biases" }
-      ]
-    }
+    "name": "batchnorm",
+    "category": "Normalization",
+    "inputs": [
+      { "name": "input" },
+      { "name": "scale" },
+      { "name": "bias" }
+    ]
   },
   {
-    "name": "depthdeconv",
-    "schema": {
-      "category": "Layer",
-      "inputs": [
-        { "name": "input" },
-        { "name": "weights" },
-        { "name": "biases" }
-      ]
-    }
+    "name": "concat",
+    "category": "Tensor",
+    "inputs": [
+      { "name": "input", "option": "variadic" }
+    ]
   },
   {
-    "name": "deconv",
-    "schema": {
-      "category": "Layer",
-      "inputs": [
-        { "name": "input" },
-        { "name": "weights" },
-        { "name": "biases" }
-      ]
-    }
+    "name": "const_v2",
+    "category": "Constant"
   },
   {
-    "name": "relu",
-    "schema": {
-      "category": "Activation",
-      "inputs": [
-        { "name": "input" }
-      ]
-    }
+    "name": "conv",
+    "category": "Layer",
+    "inputs": [
+      { "name": "input" },
+      { "name": "weights" },
+      { "name": "biases" }
+    ]
   },
   {
-    "name": "relu6",
-    "schema": {
-      "category": "Activation",
-      "inputs": [
-        { "name": "input" }
-      ]
-    }
+    "name": "deconv",
+    "category": "Layer",
+    "inputs": [
+      { "name": "input" },
+      { "name": "weights" },
+      { "name": "biases" }
+    ]
   },
   {
-    "name": "prelu",
-    "schema": {
-      "category": "Activation",
-      "inputs": [
-        { "name": "input" },
-        { "name": "slope" }
-      ]
-    }
+    "name": "depthdeconv",
+    "category": "Layer",
+    "inputs": [
+      { "name": "input" },
+      { "name": "weights" },
+      { "name": "biases" }
+    ]
   },
   {
-    "name": "softmax",
-    "schema": {
-      "category": "Activation",
-      "inputs": [
-        { "name": "input" }
-      ]
-    }
+    "name": "eltwise",
+    "inputs": [
+      { "name": "input", "option": "variadic" }
+    ]
   },
   {
-    "name": "sigmoid",
-    "schema": {
-      "category": "Activation",
-      "inputs": [
-        { "name": "input" }
-      ]
-    }
+    "name": "linear",
+    "category": "Activation",
+    "inputs": [
+      { "name": "input" }
+    ]
   },
   {
-    "name": "linear",
-    "schema": {
-      "category": "Activation",
-      "inputs": [
-        { "name": "input" }
-      ]
-    }
+    "name": "pad",
+    "category": "Shape"
   },
   {
     "name": "pool",
-    "schema": {
-      "category": "Pool",
-      "inputs": [
-        { "name": "input" }
-      ]
-    }
+    "category": "Pool",
+    "inputs": [
+      { "name": "input" }
+    ]
   },
   {
-    "name": "batchnorm",
-    "schema": {
-      "category": "Normalization",
-      "inputs": [
-        { "name": "input" },
-        { "name": "scale" },
-        { "name": "bias" }
-      ]
-    }
+    "name": "prelu",
+    "category": "Activation",
+    "inputs": [
+      { "name": "input" },
+      { "name": "slope" }
+    ]
   },
   {
-    "name": "pad",
-    "schema": {
-      "category": "Shape"
-    }
+    "name": "relu",
+    "category": "Activation",
+    "inputs": [
+      { "name": "input" }
+    ]
   },
   {
-    "name": "concat",
-    "schema": {
-      "category": "Tensor",
-      "inputs": [
-        { "name": "input", "option": "variadic" }
-      ]
-    }
+    "name": "relu6",
+    "category": "Activation",
+    "inputs": [
+      { "name": "input" }
+    ]
   },
   {
-    "name": "eltwise",
-    "schema": {
-      "inputs": [
-        { "name": "input", "option": "variadic" }
-      ]
-    }
+    "name": "sigmoid",
+    "category": "Activation",
+    "inputs": [
+      { "name": "input" }
+    ]
   },
   {
-    "name": "const_v2",
-    "schema": {
-      "category": "Constant"
-    }
+    "name": "softmax",
+    "category": "Activation",
+    "inputs": [
+      { "name": "input" }
+    ]
   }
 ]

source/dnn.js

@@ -473,15 +473,8 @@ dnn.Metadata = class {
         this._map = new Map();
         this._attributeCache = new Map();
         if (data) {
-            const items = JSON.parse(data);
-            if (items) {
-                for (const item of items) {
-                    if (item.name && item.schema) {
-                        item.schema.name = item.name;
-                        this._map.set(item.name, item.schema);
-                    }
-                }
-            }
+            const metadata = JSON.parse(data);
+            this._map = new Map(metadata.map((item) => [ item.name, item ]));
         }
     }