Add Caffe test file

lutzroeder · Dec 20, 2020 · f3c676d · f3c676d
1 parent f11c219
commit f3c676d
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 3 deletions.
diff --git a/source/caffe.js b/source/caffe.js
@@ -59,7 +59,7 @@ caffe.ModelFactory = class {
                             file = file.split('/').pop();
                             return context.request(file, null).then((stream) => {
                                 const buffer = stream.peek();
-                                return this._openNetParameterText(metadata, buffer);
+                                return this._openNetParameterText(metadata, file, buffer);
                             }).catch((error) => {
                                 if (error) {
                                     const message = error && error.message ? error.message : error.toString();
@@ -73,7 +73,7 @@ caffe.ModelFactory = class {
                     }
                 }
                 else if (tags.has('layer') || tags.has('layers')) {
-                    return this._openNetParameterText(metadata, context.stream.peek());
+                    return this._openNetParameterText(metadata, context.identifier, context.stream.peek());
                 }
                 else {
                     let netParameter = null;
@@ -91,7 +91,7 @@ caffe.ModelFactory = class {
         });
     }
 
-    _openNetParameterText(metadata, buffer) {
+    _openNetParameterText(metadata, identifier, buffer) {
         let netParameter = null;
         try {
             const reader = protobuf.TextReader.create(buffer);
@@ -128,6 +128,18 @@ caffe.ModelFactory = class {
                 }
                 return type[token];
             };
+            if (/MobileNetSSD_train_template.prototxt/.exec(identifier)) {
+                reader.integer = function() {
+                    const token = this.token();
+                    const value = Number.parseInt(token, 10);
+                    this.next();
+                    this.semicolon();
+                    if (Number.isNaN(token - value)) {
+                        return token;
+                    }
+                    return value;
+                };
+            }
             netParameter = caffe.proto.NetParameter.decodeText(reader);
         }
         catch (error) {

diff --git a/test/models.json b/test/models.json
@@ -523,6 +523,13 @@
     "format": "Caffe v2",
     "link":   "https://github.com/lutzroeder/netron/issues/358"
   },
+  {
+    "type":   "caffe",
+    "target": "MobileNetSSD_train_template.prototxt",
+    "source": "https://raw.githubusercontent.com/chuanqi305/MobileNet-SSD/master/template/MobileNetSSD_train_template.prototxt",
+    "format": "Caffe v2",
+    "link":   "https://github.com/chuanqi305/MobileNet-SSD"
+  },
   {
     "type":   "caffe",
     "target": "mnist_siamese_solver.prototxt,mnist_siamese_train_test.prototxt",