From 73f7aacf35ec9b1d0f9de9ddf38af0889f213e99 Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Tue, 20 Sep 2016 18:34:49 +0000
Subject: [PATCH] better multigpu
---
src/yolo.c | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/yolo.c b/src/yolo.c
index 057abcf..2465a2c 100644
--- a/src/yolo.c
+++ b/src/yolo.c
@@ -18,7 +18,6 @@
char *train_images = "/data/voc/train.txt";
char *backup_directory = "/home/pjreddie/backup/";
srand(time(0));
- data_seed = time(0);
char *base = basecfg(cfgfile);
printf("%s\n", base);
float avg_loss = -1;
@@ -54,6 +53,11 @@
args.d = &buffer;
args.type = REGION_DATA;
+ args.angle = net.angle;
+ args.exposure = net.exposure;
+ args.saturation = net.saturation;
+ args.hue = net.hue;
+
pthread_t load_thread = load_data_in_thread(args);
clock_t time;
//while(i*imgs < N*120){
@@ -173,7 +177,7 @@
int nms = 1;
float iou_thresh = .5;
- int nthreads = 2;
+ int nthreads = 8;
image *val = calloc(nthreads, sizeof(image));
image *val_resized = calloc(nthreads, sizeof(image));
image *buf = calloc(nthreads, sizeof(image));
@@ -323,7 +327,7 @@
char buff[256];
char *input = buff;
int j;
- float nms=.5;
+ float nms=.4;
box *boxes = calloc(l.side*l.side*l.n, sizeof(box));
float **probs = calloc(l.side*l.side*l.n, sizeof(float *));
for(j = 0; j < l.side*l.side*l.n; ++j) probs[j] = calloc(l.classes, sizeof(float *));
@@ -350,7 +354,6 @@
save_image(im, "predictions");
show_image(im, "predictions");
- show_image(sized, "resized");
free_image(im);
free_image(sized);
#ifdef OPENCV
@@ -372,6 +375,7 @@
float thresh = find_float_arg(argc, argv, "-thresh", .2);
int cam_index = find_int_arg(argc, argv, "-c", 0);
+ int frame_skip = find_int_arg(argc, argv, "-s", 0);
if(argc < 4){
fprintf(stderr, "usage: %s %s [train/test/valid] [cfg] [weights (optional)]\n", argv[0], argv[1]);
return;
@@ -384,5 +388,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, voc_labels, 20);
+ else if(0==strcmp(argv[2], "demo")) demo(cfg, weights, thresh, cam_index, filename, voc_names, voc_labels, 20, frame_skip);
}
--
Gitblit v1.10.0