From 5a47c46b39475fc3581b9819f488b977ea1beca3 Mon Sep 17 00:00:00 2001
From: Edmond Yoo <hj3yoo@uwaterloo.ca>
Date: Sun, 16 Sep 2018 03:11:04 +0000
Subject: [PATCH] Moving files from MTGCardDetector
---
src/darknet.c | 23 ++++++++++++++++++++---
1 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/src/darknet.c b/src/darknet.c
index 1444756..1dc073b 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);
@@ -39,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];
@@ -349,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();
@@ -366,6 +377,7 @@
#else
if(gpu_index >= 0){
cuda_set_device(gpu_index);
+ check_error(cudaSetDeviceFlags(cudaDeviceScheduleBlockingSync));
}
#endif
@@ -379,6 +391,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 +407,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], 5);
+ 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