Fix pbtxt map reader (lutzroeder#235)

luoyujun · Feb 28, 2019 · cd6db6f · cd6db6f
1 parent 42004ad
commit cd6db6f
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 0 deletions.
diff --git a/src/tf-proto.js b/src/tf-proto.js
@@ -4905,6 +4905,7 @@
                         reader.value();
                         key = reader.string();
                         reader.assert("value");
+                        reader.value();
                         message.ret[key] = reader.string();
                         reader.assert("}");
                         break;
@@ -4916,6 +4917,7 @@
                         reader.value();
                         key = reader.string();
                         reader.assert("value");
+                        reader.value();
                         message.control_ret[key] = reader.string();
                         reader.assert("}");
                         break;

diff --git a/test/models.json b/test/models.json
@@ -3641,6 +3641,14 @@
     "format": "TensorFlow Saved Model v1",
     "link":   "https://github.com/onnx/tensorflow-onnx/blob/master/tests/run_pretrained_models.yaml"
   },
+  {
+    "type":   "tf",
+    "target": "resnet18_model_baseline.pbtxt",
+    "source": "https://github.com/lutzroeder/netron/files/2913372/resnet18_model_baseline.pbtxt.zip[resnet18_model_baseline.pbtxt]",
+    "render": "skip",
+    "format": "TensorFlow Graph",
+    "link":   "https://github.com/lutzroeder/netron/issues/235"
+  },
   {
     "type":   "tf",
     "target": "speech_commands_v0.pb",

diff --git a/test/test.js b/test/test.js
@@ -534,6 +534,10 @@ function next() {
         return;
     }
     var item = models.shift();
+    if (!item.type) {
+        console.error("Property 'type' is required for item '" + JSON.stringify(item) + "'.");
+        return;
+    }
     if (type && item.type != type) {
         next();
         return;