From b8e6e80c6d411d05a9e09f1e3676eb9a7f3ea0e8 Mon Sep 17 00:00:00 2001
From: AlexeyAB <alexeyab84@gmail.com>
Date: Fri, 03 Aug 2018 11:35:03 +0000
Subject: [PATCH] Added spatial Yolo v3 yolov3-spp.cfg
---
src/darknet.c | 25 ++++++++++++++++++++++---
1 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/src/darknet.c b/src/darknet.c
index 989bf6f..068c9e0 100644
--- a/src/darknet.c
+++ b/src/darknet.c
@@ -12,6 +12,8 @@
#include "opencv2/highgui/highgui_c.h"
#endif
+extern void predict_classifier(char *datacfg, char *cfgfile, char *weightfile, char *filename, int top);
+extern void test_detector(char *datacfg, char *cfgfile, char *weightfile, char *filename, float thresh, int ext_output);
extern void run_voxel(int argc, char **argv);
extern void run_yolo(int argc, char **argv);
extern void run_detector(int argc, char **argv);
@@ -38,13 +40,13 @@
network net = parse_network_cfg(cfgfile);
network sum = parse_network_cfg(cfgfile);
- char *weightfile = argv[4];
+ char *weightfile = argv[4];
load_weights(&sum, weightfile);
int i, j;
int n = argc - 5;
for(i = 0; i < n; ++i){
- weightfile = argv[i+5];
+ weightfile = argv[i+5];
load_weights(&net, weightfile);
for(j = 0; j < net.n; ++j){
layer l = net.layers[j];
@@ -127,7 +129,7 @@
network net = parse_network_cfg(cfgfile);
int oldn = net.layers[net.n - 2].n;
int c = net.layers[net.n - 2].c;
- net.layers[net.n - 2].n = 7879;
+ net.layers[net.n - 2].n = 9372;
net.layers[net.n - 2].biases += 5;
net.layers[net.n - 2].weights += 5*c;
if(weightfile){
@@ -348,6 +350,16 @@
int main(int argc, char **argv)
{
+#ifdef _DEBUG
+ _CrtSetDbgFlag(_CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF);
+#endif
+
+ int i;
+ for (i = 0; i < argc; ++i) {
+ if (!argv[i]) continue;
+ strip_args(argv[i]);
+ }
+
//test_resize("data/bad.jpg");
//test_box();
//test_convolutional_layer();
@@ -378,6 +390,11 @@
run_super(argc, argv);
} else if (0 == strcmp(argv[1], "detector")){
run_detector(argc, argv);
+ } else if (0 == strcmp(argv[1], "detect")){
+ float thresh = find_float_arg(argc, argv, "-thresh", .24);
+ int ext_output = find_arg(argc, argv, "-ext_output");
+ char *filename = (argc > 4) ? argv[4]: 0;
+ test_detector("cfg/coco.data", argv[2], argv[3], filename, thresh, ext_output);
} else if (0 == strcmp(argv[1], "cifar")){
run_cifar(argc, argv);
} else if (0 == strcmp(argv[1], "go")){
@@ -388,6 +405,8 @@
run_vid_rnn(argc, argv);
} else if (0 == strcmp(argv[1], "coco")){
run_coco(argc, argv);
+ } else if (0 == strcmp(argv[1], "classify")){
+ predict_classifier("cfg/imagenet1k.data", argv[2], argv[3], argv[4], 5);
} else if (0 == strcmp(argv[1], "classifier")){
run_classifier(argc, argv);
} else if (0 == strcmp(argv[1], "art")){
--
Gitblit v1.10.0