From f0abcfa02b2094396f955c743f7f11fcdb2e3d13 Mon Sep 17 00:00:00 2001
From: IlyaOvodov <b@ovdv.ru>
Date: Mon, 04 Jun 2018 15:57:15 +0000
Subject: [PATCH] Merge branch 'master' of https://github.com/AlexeyAB/darknet into Fix_get_color_depth
---
src/darknet.c | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/src/darknet.c b/src/darknet.c
index 9657882..ece518c 100644
--- a/src/darknet.c
+++ b/src/darknet.c
@@ -13,6 +13,7 @@
#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);
@@ -349,6 +350,10 @@
int main(int argc, char **argv)
{
+#ifdef _DEBUG
+ _CrtSetDbgFlag(_CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF);
+#endif
+
//test_resize("data/bad.jpg");
//test_box();
//test_convolutional_layer();
@@ -379,6 +384,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")){
@@ -390,7 +400,7 @@
} else if (0 == strcmp(argv[1], "coco")){
run_coco(argc, argv);
} else if (0 == strcmp(argv[1], "classify")){
- predict_classifier("cfg/imagenet1k.dataset", argv[2], argv[3], argv[4], 10);
+ 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