From cd8a3dcb4ca42f22ad8f46a95e00977c92be6bbd Mon Sep 17 00:00:00 2001
From: AlexeyAB <alexeyab84@gmail.com>
Date: Thu, 08 Feb 2018 23:22:42 +0000
Subject: [PATCH] Compile fixes
---
src/detector.c | 45 ++++++++++++++++++++++++++++++++++++---------
1 files changed, 36 insertions(+), 9 deletions(-)
diff --git a/src/detector.c b/src/detector.c
index 2aaa828..4e22055 100644
--- a/src/detector.c
+++ b/src/detector.c
@@ -9,7 +9,22 @@
#ifdef OPENCV
#include "opencv2/highgui/highgui_c.h"
+#include "opencv2/core/core_c.h"
+#include "opencv2/core/version.hpp"
+
+#ifndef CV_VERSION_EPOCH
+#include "opencv2/videoio/videoio_c.h"
+#define OPENCV_VERSION CVAUX_STR(CV_VERSION_MAJOR)""CVAUX_STR(CV_VERSION_MINOR)""CVAUX_STR(CV_VERSION_REVISION)
+#pragma comment(lib, "opencv_world" OPENCV_VERSION ".lib")
+#else
+#define OPENCV_VERSION CVAUX_STR(CV_VERSION_EPOCH)""CVAUX_STR(CV_VERSION_MAJOR)""CVAUX_STR(CV_VERSION_MINOR)
+#pragma comment(lib, "opencv_core" OPENCV_VERSION ".lib")
+#pragma comment(lib, "opencv_imgproc" OPENCV_VERSION ".lib")
+#pragma comment(lib, "opencv_highgui" OPENCV_VERSION ".lib")
#endif
+
+#endif
+
static int coco_ids[] = {1,2,3,4,5,6,7,8,9,10,11,13,14,15,16,17,18,19,20,21,22,23,24,25,27,28,31,32,33,34,35,36,37,38,39,40,41,42,43,44,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,67,70,72,73,74,75,76,77,78,79,80,81,82,84,85,86,87,88,89,90};
void train_detector(char *datacfg, char *cfgfile, char *weightfile, int *gpus, int ngpus, int clear)
@@ -55,6 +70,9 @@
//int N = plist->size;
char **paths = (char **)list_to_array(plist);
+ int init_w = net.w;
+ int init_h = net.h;
+
load_args args = {0};
args.w = net.w;
args.h = net.h;
@@ -64,9 +82,10 @@
args.classes = classes;
args.jitter = jitter;
args.num_boxes = l.max_boxes;
+ args.small_object = l.small_object;
args.d = &buffer;
args.type = DETECTION_DATA;
- args.threads = 8;
+ args.threads = 4;// 8;
args.angle = net.angle;
args.exposure = net.exposure;
@@ -80,8 +99,9 @@
while(get_current_batch(net) < net.max_batches){
if(l.random && count++%10 == 0){
printf("Resizing\n");
- int dim = (rand() % 10 + 10) * 32;
- if (get_current_batch(net)+100 > net.max_batches) dim = 544;
+ int dim = (rand() % 12 + (init_w/32 - 5)) * 32; // +-160
+ //int dim = (rand() % 10 + 10) * 32;
+ //if (get_current_batch(net)+100 > net.max_batches) dim = 544;
//int dim = (rand() % 4 + 16) * 32;
printf("%d\n", dim);
args.w = dim;
@@ -137,7 +157,8 @@
i = get_current_batch(net);
printf("%d: %f, %f avg, %f rate, %lf seconds, %d images\n", get_current_batch(net), loss, avg_loss, get_current_rate(net), sec(clock()-time), i*imgs);
- if (i % 1000 == 0 || (i < 1000 && i % 100 == 0)) {
+ //if (i % 1000 == 0 || (i < 1000 && i % 100 == 0)) {
+ if (i % 100 == 0) {
#ifdef GPU
if (ngpus != 1) sync_nets(nets, ngpus, 0);
#endif
@@ -243,7 +264,7 @@
int *map = 0;
if (mapf) map = read_map(mapf);
- network net = parse_network_cfg(cfgfile);
+ network net = parse_network_cfg_custom(cfgfile, 1);
if(weightfile){
load_weights(&net, weightfile);
}
@@ -360,7 +381,7 @@
void validate_detector_recall(char *datacfg, char *cfgfile, char *weightfile)
{
- network net = parse_network_cfg(cfgfile);
+ network net = parse_network_cfg_custom(cfgfile, 1);
if(weightfile){
load_weights(&net, weightfile);
}
@@ -384,7 +405,7 @@
int m = plist->size;
int i=0;
- float thresh = .2;// .001;
+ float thresh = .001;// .001; // .2;
float iou_thresh = .5;
float nms = .4;
@@ -446,7 +467,7 @@
char **names = get_labels(name_list);
image **alphabet = load_alphabet();
- network net = parse_network_cfg(cfgfile);
+ network net = parse_network_cfg_custom(cfgfile, 1);
if(weightfile){
load_weights(&net, weightfile);
}
@@ -460,6 +481,7 @@
while(1){
if(filename){
strncpy(input, filename, 256);
+ if (input[strlen(input) - 1] == 0x0d) input[strlen(input) - 1] = 0;
} else {
printf("Enter Image Path: ");
fflush(stdout);
@@ -499,6 +521,7 @@
void run_detector(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", .24);
int cam_index = find_int_arg(argc, argv, "-c", 0);
@@ -535,6 +558,8 @@
char *datacfg = argv[3];
char *cfg = argv[4];
char *weights = (argc > 5) ? argv[5] : 0;
+ if(weights)
+ if (weights[strlen(weights) - 1] == 0x0d) weights[strlen(weights) - 1] = 0;
char *filename = (argc > 6) ? argv[6]: 0;
if(0==strcmp(argv[2], "test")) test_detector(datacfg, cfg, weights, filename, thresh);
else if(0==strcmp(argv[2], "train")) train_detector(datacfg, cfg, weights, gpus, ngpus, clear);
@@ -545,6 +570,8 @@
int classes = option_find_int(options, "classes", 20);
char *name_list = option_find_str(options, "names", "data/names.list");
char **names = get_labels(name_list);
- demo(cfg, weights, thresh, cam_index, filename, names, classes, frame_skip, prefix);
+ if(filename)
+ if (filename[strlen(filename) - 1] == 0x0d) filename[strlen(filename) - 1] = 0;
+ demo(cfg, weights, thresh, cam_index, filename, names, classes, frame_skip, prefix, out_filename);
}
}
--
Gitblit v1.10.0