Lutz Roeder пре 10 месеци
родитељ
комит
e8d9bfe906
3 измењених фајлова са 9 додато и 36 уклоњено
  1. 0 1
      source/darknet-metadata.json
  2. 1 1
      source/darknet.js
  3. 8 34
      test/models.json

+ 0 - 1
source/darknet-metadata.json

@@ -60,7 +60,6 @@
   },
   {
     "name": "cost",
-    "category": "Activation",
     "attributes": [
       { "name": "type", "type": "string", "default": "sse" },
       { "name": "scale", "type": "float32", "default": 1 },

+ 1 - 1
source/darknet.js

@@ -51,7 +51,7 @@ darknet.ModelFactory = class {
                 try {
                     const name = `${basename}.weights`;
                     const content = await context.fetch(name);
-                    const weights = darknet.Weights.open(content);
+                    const weights = await darknet.Weights.open(content);
                     const reader = await context.read('text');
                     const configuration = new darknet.Configuration(reader, context.identifier);
                     return new darknet.Model(metadata, configuration, weights);

+ 8 - 34
test/models.json

@@ -1708,13 +1708,6 @@
     "error":    "Invalid cfg 'xxxx' at line 4.",
     "link":     "https://github.com/lutzroeder/netron/issues/277"
   },
-  {
-    "type":     "darknet",
-    "target":   "darknet53_448.weights,darknet53_448.cfg",
-    "source":   "https://pjreddie.com/media/files/darknet53_448.weights,https://raw.githubusercontent.com/pjreddie/darknet/master/cfg/darknet53_448.cfg",
-    "format":   "Darknet",
-    "link":     "https://pjreddie.com/darknet/imagenet"
-  },
   {
     "type":     "darknet",
     "target":   "enet-coco.model",
@@ -1736,20 +1729,6 @@
     "format":   "Darknet",
     "link":     "https://github.com/AlexeyAB/darknet"
   },
-  {
-    "type":     "darknet",
-    "target":   "go.cfg,go.weights",
-    "source":   "https://raw.githubusercontent.com/pjreddie/darknet/master/cfg/go.cfg,https://pjreddie.com/media/files/go.weights",
-    "format":   "Darknet",
-    "link":     "https://pjreddie.com/darknet/darkgo-go-in-darknet"
-  },
-  {
-    "type":     "darknet",
-    "target":   "grrm.cfg,grrm.weights",
-    "source":   "https://raw.githubusercontent.com/pjreddie/darknet/master/cfg/rnn.cfg,https://pjreddie.com/media/files/grrm.weights",
-    "format":   "Darknet",
-    "link":     "https://pjreddie.com/darknet/rnns-in-darknet"
-  },
   {
     "type":     "darknet",
     "target":   "gru.cfg",
@@ -1757,13 +1736,6 @@
     "format":   "Darknet",
     "link":     "https://pjreddie.com/darknet"
   },
-  {
-    "type":     "darknet",
-    "target":   "jnet-conv.cfg,jnet-conv.weights",
-    "source":   "https://raw.githubusercontent.com/pjreddie/darknet/master/cfg/jnet-conv.cfg,https://pjreddie.com/media/files/jnet-conv.weights",
-    "format":   "Darknet",
-    "link":     "https://pjreddie.com/darknet/nightmare"
-  },
   {
     "type":     "darknet",
     "target":   "lstm.train.cfg",
@@ -1815,16 +1787,17 @@
   },
   {
     "type":     "darknet",
-    "target":   "resnet18.cfg,resnet18.weights",
-    "source":   "https://raw.githubusercontent.com/pjreddie/darknet/master/cfg/resnet18.cfg,https://pjreddie.com/media/files/resnet18.weights",
+    "target":   "resnet18.cfg",
+    "source":   "https://raw.githubusercontent.com/pjreddie/darknet/master/cfg/resnet18.cfg",
     "format":   "Darknet",
     "link":     "https://pjreddie.com/darknet/imagenet"
   },
   {
     "type":     "darknet",
-    "target":   "tiny.cfg,tiny.weights",
-    "source":   "https://raw.githubusercontent.com/pjreddie/darknet/master/cfg/tiny.cfg,https://pjreddie.com/media/files/tiny.weights",
+    "target":   "tiny.weights,tiny.cfg",
+    "source":   "https://github.com/user-attachments/files/19821790/tiny.zip[tiny.weights,tiny.cfg]",
     "format":   "Darknet",
+    "assert":   "model.graphs[0].nodes[0].inputs[1].value[0].initializer.values.length == 64",
     "link":     "https://pjreddie.com/darknet/tiny-darknet"
   },
   {
@@ -1878,8 +1851,8 @@
   },
   {
     "type":     "darknet",
-    "target":   "yolov3-tiny.cfg,yolov3-tiny.weights",
-    "source":   "https://raw.githubusercontent.com/pjreddie/darknet/master/cfg/yolov3-tiny.cfg,https://pjreddie.com/media/files/yolov3-tiny.weights",
+    "target":   "yolov3-tiny.cfg",
+    "source":   "https://raw.githubusercontent.com/pjreddie/darknet/master/cfg/yolov3-tiny.cfg",
     "format":   "Darknet",
     "link":     "https://github.com/AlexeyAB/darknet"
   },
@@ -1909,6 +1882,7 @@
     "target":   "yolov4-tiny.cfg,yolov4-tiny.weights",
     "source":   "https://raw.githubusercontent.com/AlexeyAB/darknet/master/cfg/yolov4-tiny.cfg,https://github.com/AlexeyAB/darknet/releases/download/darknet_yolo_v4_pre/yolov4-tiny.weights",
     "format":   "Darknet",
+    "assert":   "model.graphs[0].nodes[0].inputs[1].value[0].initializer.values.length == 128",
     "link":     "https://github.com/lutzroeder/netron/issues/531"
   },
   {