From 6d56c38e8bcb9041335b03f27c192c24dfaedb1c Mon Sep 17 00:00:00 2001
From: AlexeyAB <alexeyab84@gmail.com>
Date: Wed, 28 Mar 2018 23:39:28 +0000
Subject: [PATCH] Merge branch 'master' of github.com:AlexeyAB/darknet
---
src/darknet.c | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/src/darknet.c b/src/darknet.c
index 989bf6f..627b6db 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);
extern void run_voxel(int argc, char **argv);
extern void run_yolo(int argc, char **argv);
extern void run_detector(int argc, char **argv);
@@ -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){
@@ -378,6 +380,10 @@
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);
+ char *filename = (argc > 4) ? argv[4]: 0;
+ test_detector("cfg/coco.data", argv[2], argv[3], filename, thresh);
} else if (0 == strcmp(argv[1], "cifar")){
run_cifar(argc, argv);
} else if (0 == strcmp(argv[1], "go")){
@@ -388,6 +394,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