From f762e6adb50d0a7eb72825b322e7d4192ae29ef3 Mon Sep 17 00:00:00 2001
From: Alexey <AlexeyAB@users.noreply.github.com>
Date: Sat, 03 Feb 2018 12:38:31 +0000
Subject: [PATCH] Merge pull request #357 from rajendraarora16/new-changes-darknet
---
src/detector.c | 21 ++++++++++++++-------
1 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/src/detector.c b/src/detector.c
index ac75524..d79fbcc 100644
--- a/src/detector.c
+++ b/src/detector.c
@@ -70,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;
@@ -81,7 +84,7 @@
args.num_boxes = l.max_boxes;
args.d = &buffer;
args.type = DETECTION_DATA;
- args.threads = 8;
+ args.threads = 4;// 8;
args.angle = net.angle;
args.exposure = net.exposure;
@@ -95,8 +98,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;
@@ -152,7 +156,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
@@ -399,7 +404,7 @@
int m = plist->size;
int i=0;
- float thresh = .2;// .001;
+ float thresh = .001;// .001; // .2;
float iou_thresh = .5;
float nms = .4;
@@ -552,7 +557,8 @@
char *datacfg = argv[3];
char *cfg = argv[4];
char *weights = (argc > 5) ? argv[5] : 0;
- if (weights[strlen(weights) - 1] == 0x0d) weights[strlen(weights) - 1] = 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);
@@ -563,7 +569,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);
- if (filename[strlen(filename) - 1] == 0x0d) filename[strlen(filename) - 1] = 0;
+ 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