Browse Source

Add Darknet test file (#765)

Lutz Roeder 4 years ago
parent
commit
0c70ef2cc7
3 changed files with 17 additions and 2 deletions
  1. 4 0
      source/darknet-metadata.json
  2. 6 2
      source/darknet.js
  3. 7 0
      test/models.json

+ 4 - 0
source/darknet-metadata.json

@@ -410,6 +410,10 @@
     "name": "selu",
     "category": "Activation"
   },
+  {
+    "name": "silu",
+    "category": "Activation"
+  },
   {
     "name": "shortcut",
     "category": "Tensor",

+ 6 - 2
source/darknet.js

@@ -675,20 +675,24 @@ darknet.Graph = class {
                             layer.out_w = params.w * stride;
                             layer.out_h = params.h * stride;
                             layer.out_c = Math.floor(params.c / (stride * stride));
+                            layer.out = layer.out_h * layer.out_w * layer.out_c;
                         }
                         else {
                             layer.out_w = Math.floor(params.w / stride);
                             layer.out_h = Math.floor(params.h / stride);
                             layer.out_c = params.c * (stride * stride);
+                            layer.out = layer.out_h * layer.out_w * layer.out_c;
                         }
-                        layer.out = layer.out_h * layer.out_w * layer.out_c;
                         if (extra) {
                             layer.out_w = 0;
                             layer.out_h = 0;
                             layer.out_c = 0;
                             layer.out = (params.h * params.w * params.c) + extra;
+                            layer.outputs[0].type = new darknet.TensorType('float32', make_shape([ layer.out ], 'reorg'));
+                        }
+                        else {
+                            layer.outputs[0].type = new darknet.TensorType('float32', make_shape([ layer.out_w, layer.out_h, layer.out_c ], 'reorg'));
                         }
-                        layer.outputs[0].type = new darknet.TensorType('float32', make_shape([ layer.out ], 'reorg'));
                         break;
                     }
                     case 'route': {

+ 7 - 0
test/models.json

@@ -1885,6 +1885,13 @@
     "format": "Darknet",
     "link":   "https://github.com/AlexeyAB/darknet"
   },
+  {
+    "type":   "darknet",
+    "target": "yolor_p6.cfg",
+    "source": "https://github.com/lutzroeder/netron/files/6767257/yolor_p6.cfg.zip[yolor_p6.cfg]",
+    "format": "Darknet",
+    "link":   "https://github.com/lutzroeder/netron/issues/765"
+  },
   {
     "type":   "dl4j",
     "target": "lenet_dl4j_mnist_inference.zip",