Validate and recall always with batch=1

AlexeyAB

2017-10-31 accf3a59c8b17c70dcc39e8f7daede017190086d

 src/yolo.c

@@ -6,25 +6,13 @@
#include "box.h"
#include "demo.h"

#pragma comment(lib, "opencv_core249.lib")  
#pragma comment(lib, "opencv_imgproc249.lib")  
#pragma comment(lib, "opencv_objdetect249.lib")  
#pragma comment(lib, "opencv_gpu249.lib")  
#pragma comment(lib, "opencv_features2d249.lib")  
#pragma comment(lib, "opencv_highgui249.lib")  
//#pragma comment(lib, "opencv_ml249.lib")  
#pragma comment(lib, "opencv_stitching249.lib")  
#pragma comment(lib, "opencv_nonfree249.lib")  
//#pragma comment(lib, "opencv_superres249.lib")  
#pragma comment(lib, "opencv_calib3d249.lib")  
#pragma comment(lib, "opencv_flann249.lib")  
//#pragma comment(lib, "opencv_contrib249.lib")  
//#pragma comment(lib, "opencv_legacy249.lib")  
#pragma comment(lib, "opencv_photo249.lib")  
#pragma comment(lib, "opencv_video249.lib")  

#ifdef OPENCV
#include "opencv2/highgui/highgui_c.h"
#include "opencv2/imgproc/imgproc_c.h"
#include "opencv2/core/version.hpp"
#ifndef CV_VERSION_EPOCH
#include "opencv2/videoio/videoio_c.h"
#endif
#endif

char *voc_names[] = {"aeroplane", "bicycle", "bird", "boat", "bottle", "bus", "car", "cat", "chair", "cow", "diningtable", "dog", "horse", "motorbike", "person", "pottedplant", "sheep", "sofa", "train", "tvmonitor"};
@@ -352,6 +340,7 @@

void run_yolo(int argc, char **argv)
{
   char *out_filename = find_char_arg(argc, argv, "-out_filename", 0);
    char *prefix = find_char_arg(argc, argv, "-prefix", 0);
    float thresh = find_float_arg(argc, argv, "-thresh", .2);
    int cam_index = find_int_arg(argc, argv, "-c", 0);
@@ -368,5 +357,5 @@
    else if(0==strcmp(argv[2], "train")) train_yolo(cfg, weights);
    else if(0==strcmp(argv[2], "valid")) validate_yolo(cfg, weights);
    else if(0==strcmp(argv[2], "recall")) validate_yolo_recall(cfg, weights);
    else if(0==strcmp(argv[2], "demo")) demo(cfg, weights, thresh, cam_index, filename, voc_names, 20, frame_skip, prefix);
    else if(0==strcmp(argv[2], "demo")) demo(cfg, weights, thresh, cam_index, filename, voc_names, 20, frame_skip, prefix, out_filename);
}