From 160eddddc4e265d5ee59a38797c30720bf46cd7c Mon Sep 17 00:00:00 2001 From: AlexeyAB Date: Sun, 27 May 2018 16:53:42 +0300 Subject: [PATCH] Minor fix --- build/darknet/x64/darknet_yolo_v3_video.cmd | 2 +- src/detector.c | 2 +- src/image.c | 4 ++-- src/network.c | 1 + 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/build/darknet/x64/darknet_yolo_v3_video.cmd b/build/darknet/x64/darknet_yolo_v3_video.cmd index 729ec08f..26efcfdc 100644 --- a/build/darknet/x64/darknet_yolo_v3_video.cmd +++ b/build/darknet/x64/darknet_yolo_v3_video.cmd @@ -1,5 +1,5 @@ -darknet.exe detector demo data/coco.data yolov3.cfg yolov3.weights -i 0 -thresh 0.25 test.mp4 +darknet.exe detector demo data/coco.data yolov3.cfg yolov3.weights -i 0 -thresh 0.25 -ext_output test.mp4 pause \ No newline at end of file diff --git a/src/detector.c b/src/detector.c index 536b9d7b..6fc6b677 100644 --- a/src/detector.c +++ b/src/detector.c @@ -189,7 +189,7 @@ void train_detector(char *datacfg, char *cfgfile, char *weightfile, int *gpus, i avg_loss = avg_loss*.9 + loss*.1; i = get_current_batch(net); - printf("\n %d: %f, %f avg, %f rate, %lf seconds, %d images\n", get_current_batch(net), loss, avg_loss, get_current_rate(net), (what_time_is_it_now()-time), i*imgs); + printf("\n %d: %f, %f avg loss, %f rate, %lf seconds, %d images\n", get_current_batch(net), loss, avg_loss, get_current_rate(net), (what_time_is_it_now()-time), i*imgs); #ifdef OPENCV if(!dont_show) diff --git a/src/image.c b/src/image.c index 9c297c40..eb8c6d56 100644 --- a/src/image.c +++ b/src/image.c @@ -287,7 +287,7 @@ void draw_detections_v3(image im, detection *dets, int num, float thresh, char * const int best_class = selected_detections[i].best_class; printf("%s: %.0f%%", names[best_class], selected_detections[i].det.prob[best_class] * 100); if (ext_output) - printf("\t(left: %4.0f top: %4.0f w: %4.0f h: %4.0f)\n", + printf("\t(left_x: %4.0f top_y: %4.0f width: %4.0f height: %4.0f)\n", (selected_detections[i].det.bbox.x - selected_detections[i].det.bbox.w / 2)*im.w, (selected_detections[i].det.bbox.y - selected_detections[i].det.bbox.h / 2)*im.h, selected_detections[i].det.bbox.w*im.w, selected_detections[i].det.bbox.h*im.h); @@ -535,7 +535,7 @@ void draw_detections_cv_v3(IplImage* show_img, detection *dets, int num, float t cvRectangle(show_img, pt1, pt2, color, width, 8, 0); if (ext_output) - printf(" (left: %4.0f top: %4.0f w: %4.0f h: %4.0f)\n", + printf("\t(left_x: %4.0f top_y: %4.0f width: %4.0f height: %4.0f)\n", (float)left, (float)right, b.w*show_img->width, b.h*show_img->height); else printf("\n"); diff --git a/src/network.c b/src/network.c index c0676bf7..6e50d54a 100644 --- a/src/network.c +++ b/src/network.c @@ -28,6 +28,7 @@ #include "route_layer.h" #include "shortcut_layer.h" #include "yolo_layer.h" +#include "upsample_layer.h" #include "parser.h" network *load_network_custom(char *cfg, char *weights, int clear, int batch)