From 6ccb41808caf753feea58ca9df79d6367dedc434 Mon Sep 17 00:00:00 2001 From: AlexeyAB Date: Sun, 29 Oct 2017 18:58:07 +0300 Subject: [PATCH] Additional fixes --- build/darknet/x64/darknet_voc.cmd | 4 +++- image_voc.sh | 2 +- src/yolo_console_dll.cpp | 2 +- src/yolo_v2_class.cpp | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/build/darknet/x64/darknet_voc.cmd b/build/darknet/x64/darknet_voc.cmd index 93b91614..864bb641 100644 --- a/build/darknet/x64/darknet_voc.cmd +++ b/build/darknet/x64/darknet_voc.cmd @@ -1,6 +1,8 @@ +darknet.exe detector test data/voc.data yolo-voc.cfg yolo-voc.weights 009460.jpg -darknet.exe detector test data/voc.data yolo-voc.cfg yolo-voc.weights -i 0 -thresh 0.2 + +darknet.exe detector test data/voc.data yolo-voc.cfg yolo-voc.weights -i 0 -thresh 0.1 dogr.jpg pause \ No newline at end of file diff --git a/image_voc.sh b/image_voc.sh index f8491d4f..1ef017d6 100644 --- a/image_voc.sh +++ b/image_voc.sh @@ -1,6 +1,6 @@ -./darknet detector test ./cfg/voc.data ./cfg/yolo-voc.cfg ./yolo-voc.weights dog.jpg -i 0 -thresh 0.2 +./darknet detector test ./cfg/voc.data ./cfg/yolo-voc.cfg ./yolo-voc.weights data/dog.jpg -i 0 -thresh 0.2 diff --git a/src/yolo_console_dll.cpp b/src/yolo_console_dll.cpp index 88813ccf..25497ce2 100644 --- a/src/yolo_console_dll.cpp +++ b/src/yolo_console_dll.cpp @@ -85,7 +85,7 @@ int main(int argc, char *argv[]) std::string filename; if (argc > 1) filename = argv[1]; - Detector detector("yolo-voc.cfg", "yolo-voc.weights"); + Detector detector("cfg/yolo-voc.cfg", "yolo-voc.weights"); auto obj_names = objects_names_from_file("data/voc.names"); std::string out_videofile = "result.avi"; diff --git a/src/yolo_v2_class.cpp b/src/yolo_v2_class.cpp index bd141056..1777aa22 100644 --- a/src/yolo_v2_class.cpp +++ b/src/yolo_v2_class.cpp @@ -54,7 +54,7 @@ YOLODLL_API Detector::Detector(std::string cfg_filename, std::string weight_file char *cfgfile = const_cast(cfg_filename.data()); char *weightfile = const_cast(weight_filename.data()); - net = parse_network_cfg(cfgfile); + net = parse_network_cfg_custom(cfgfile, 1); if (weightfile) { load_weights(&net, weightfile); }