From 9f7d403a3cb7dc62c658231f4cf18e33d152806c Mon Sep 17 00:00:00 2001
From: AlexeyAB <alexeyab84@gmail.com>
Date: Wed, 28 Mar 2018 20:33:03 +0000
Subject: [PATCH] Added Yolo v2 bash files
---
src/detector.c | 43 +++++++++++++++++++++++++++----------------
1 files changed, 27 insertions(+), 16 deletions(-)
diff --git a/src/detector.c b/src/detector.c
index 59182c4..77175b4 100644
--- a/src/detector.c
+++ b/src/detector.c
@@ -76,6 +76,8 @@
int init_w = net.w;
int init_h = net.h;
+ int iter_save;
+ iter_save = get_current_batch(net);
load_args args = {0};
args.w = net.w;
@@ -89,7 +91,7 @@
args.small_object = l.small_object;
args.d = &buffer;
args.type = DETECTION_DATA;
- args.threads = 4;// 8;
+ args.threads = 64; // 8
args.angle = net.angle;
args.exposure = net.exposure;
@@ -113,7 +115,6 @@
if(l.random && count++%10 == 0){
printf("Resizing\n");
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);
@@ -177,7 +178,9 @@
#endif // OPENCV
//if (i % 1000 == 0 || (i < 1000 && i % 100 == 0)) {
- if (i % 100 == 0) {
+ //if (i % 100 == 0) {
+ if(i >= (iter_save + 100)) {
+ iter_save = i;
#ifdef GPU
if (ngpus != 1) sync_nets(nets, ngpus, 0);
#endif
@@ -997,7 +1000,7 @@
}
#endif // OPENCV
-void test_detector(char *datacfg, char *cfgfile, char *weightfile, char *filename, float thresh, int dont_show)
+void test_detector(char *datacfg, char *cfgfile, char *weightfile, char *filename, float thresh, float hier_thresh, int dont_show)
{
list *options = read_data_cfg(datacfg);
char *name_list = option_find_str(options, "names", "data/names.list");
@@ -1014,7 +1017,7 @@
char buff[256];
char *input = buff;
int j;
- float nms=.4;
+ float nms=.45; // 0.4F
while(1){
if(filename){
strncpy(input, filename, 256);
@@ -1027,20 +1030,27 @@
strtok(input, "\n");
}
image im = load_image_color(input,0,0);
+ int letter = 0;
image sized = resize_image(im, net.w, net.h);
+ //image sized = letterbox_image(im, net.w, net.h); letter = 1;
layer l = net.layers[net.n-1];
- box *boxes = calloc(l.w*l.h*l.n, sizeof(box));
- float **probs = calloc(l.w*l.h*l.n, sizeof(float *));
- for(j = 0; j < l.w*l.h*l.n; ++j) probs[j] = calloc(l.classes, sizeof(float *));
+ //box *boxes = calloc(l.w*l.h*l.n, sizeof(box));
+ //float **probs = calloc(l.w*l.h*l.n, sizeof(float *));
+ //for(j = 0; j < l.w*l.h*l.n; ++j) probs[j] = calloc(l.classes, sizeof(float *));
float *X = sized.data;
time=clock();
network_predict(net, X);
printf("%s: Predicted in %f seconds.\n", input, sec(clock()-time));
- get_region_boxes(l, 1, 1, thresh, probs, boxes, 0, 0);
- if (nms) do_nms_sort(boxes, probs, l.w*l.h*l.n, l.classes, nms);
- draw_detections(im, l.w*l.h*l.n, thresh, boxes, probs, names, alphabet, l.classes);
+ //get_region_boxes(l, 1, 1, thresh, probs, boxes, 0, 0);
+ // if (nms) do_nms_sort(boxes, probs, l.w*l.h*l.n, l.classes, nms);
+ //draw_detections(im, l.w*l.h*l.n, thresh, boxes, probs, names, alphabet, l.classes);
+ int nboxes = 0;
+ detection *dets = get_network_boxes(&net, im.w, im.h, thresh, hier_thresh, 0, 1, &nboxes, letter);
+ if (nms) do_nms_sort_v3(dets, nboxes, l.classes, nms);
+ draw_detections_v3(im, dets, nboxes, thresh, names, alphabet, l.classes);
+ free_detections(dets, nboxes);
save_image(im, "predictions");
if (!dont_show) {
show_image(im, "predictions");
@@ -1048,8 +1058,8 @@
free_image(im);
free_image(sized);
- free(boxes);
- free_ptrs((void **)probs, l.w*l.h*l.n);
+ //free(boxes);
+ //free_ptrs((void **)probs, l.w*l.h*l.n);
#ifdef OPENCV
if (!dont_show) {
cvWaitKey(0);
@@ -1067,7 +1077,8 @@
int http_stream_port = find_int_arg(argc, argv, "-http_port", -1);
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);
+ float thresh = find_float_arg(argc, argv, "-thresh", .25); // 0.24
+ float hier_thresh = find_float_arg(argc, argv, "-hier", .5);
int cam_index = find_int_arg(argc, argv, "-c", 0);
int frame_skip = find_int_arg(argc, argv, "-s", 0);
int num_of_clusters = find_int_arg(argc, argv, "-num_of_clusters", 5);
@@ -1108,7 +1119,7 @@
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, dont_show);
+ if(0==strcmp(argv[2], "test")) test_detector(datacfg, cfg, weights, filename, thresh, hier_thresh, dont_show);
else if(0==strcmp(argv[2], "train")) train_detector(datacfg, cfg, weights, gpus, ngpus, clear, dont_show);
else if(0==strcmp(argv[2], "valid")) validate_detector(datacfg, cfg, weights);
else if(0==strcmp(argv[2], "recall")) validate_detector_recall(datacfg, cfg, weights);
@@ -1121,7 +1132,7 @@
char **names = get_labels(name_list);
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,
+ demo(cfg, weights, thresh, hier_thresh, cam_index, filename, names, classes, frame_skip, prefix, out_filename,
http_stream_port, dont_show);
}
}
--
Gitblit v1.10.0