From ea09a6e0b38e1ddf43ffcd81d27f0506411eb8e4 Mon Sep 17 00:00:00 2001
From: AlexeyAB <alexeyab84@gmail.com>
Date: Tue, 09 Jan 2018 19:26:54 +0000
Subject: [PATCH] Command line for example of usage DLL/SO
---
src/detector.c | 72 ++++++++++++++++++++++++------------
1 files changed, 48 insertions(+), 24 deletions(-)
diff --git a/src/detector.c b/src/detector.c
index 7535df8..5f2cec8 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)
@@ -137,14 +152,14 @@
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)) {
#ifdef GPU
- if(ngpus != 1) sync_nets(nets, ngpus, 0);
+ if (ngpus != 1) sync_nets(nets, ngpus, 0);
#endif
- char buff[256];
- sprintf(buff, "%s/%s_%d.weights", backup_directory, base, i);
- save_weights(net, buff);
- }
+ char buff[256];
+ sprintf(buff, "%s/%s_%d.weights", backup_directory, base, i);
+ save_weights(net, buff);
+ }
free_data(train);
}
#ifdef GPU
@@ -243,7 +258,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);
}
@@ -358,9 +373,9 @@
fprintf(stderr, "Total Detection Time: %f Seconds\n", (double)(time(0) - start));
}
-void validate_detector_recall(char *cfgfile, char *weightfile)
+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);
}
@@ -368,7 +383,9 @@
fprintf(stderr, "Learning Rate: %g, Momentum: %g, Decay: %g\n", net.learning_rate, net.momentum, net.decay);
srand(time(0));
- list *plist = get_paths("data/voc.2007.test");
+ list *options = read_data_cfg(datacfg);
+ char *valid_images = option_find_str(options, "valid", "data/train.txt");
+ list *plist = get_paths(valid_images);
char **paths = (char **)list_to_array(plist);
layer l = net.layers[net.n-1];
@@ -382,7 +399,7 @@
int m = plist->size;
int i=0;
- float thresh = .001;
+ float thresh = .001;// .001; // .2;
float iou_thresh = .5;
float nms = .4;
@@ -405,6 +422,7 @@
find_replace(labelpath, "JPEGImages", "labels", labelpath);
find_replace(labelpath, ".jpg", ".txt", labelpath);
find_replace(labelpath, ".JPEG", ".txt", labelpath);
+ find_replace(labelpath, ".png", ".txt", labelpath);
int num_labels = 0;
box_label *truth = read_boxes(labelpath, &num_labels);
@@ -413,16 +431,16 @@
++proposals;
}
}
- for (j = 0; j < num_labels; ++j) {
- ++total;
- box t = {truth[j].x, truth[j].y, truth[j].w, truth[j].h};
- float best_iou = 0;
- for(k = 0; k < l.w*l.h*l.n; ++k){
- float iou = box_iou(boxes[k], t);
- if(probs[k][0] > thresh && iou > best_iou){
- best_iou = iou;
- }
- }
+ for (j = 0; j < num_labels; ++j) {
+ ++total;
+ box t = { truth[j].x, truth[j].y, truth[j].w, truth[j].h };
+ float best_iou = 0;
+ for (k = 0; k < l.w*l.h*l.n; ++k) {
+ float iou = box_iou(boxes[k], t);
+ if (probs[k][0] > thresh && iou > best_iou) {
+ best_iou = iou;
+ }
+ }
avg_iou += best_iou;
if(best_iou > iou_thresh){
++correct;
@@ -443,7 +461,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);
}
@@ -457,6 +475,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);
@@ -496,6 +515,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);
@@ -532,16 +552,20 @@
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);
else if(0==strcmp(argv[2], "valid")) validate_detector(datacfg, cfg, weights);
- else if(0==strcmp(argv[2], "recall")) validate_detector_recall(cfg, weights);
+ else if(0==strcmp(argv[2], "recall")) validate_detector_recall(datacfg, cfg, weights);
else if(0==strcmp(argv[2], "demo")) {
list *options = read_data_cfg(datacfg);
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