From 132251d72325e1005ef6c47f83d6a4e9b9355d12 Mon Sep 17 00:00:00 2001
From: AlexeyAB <alexeyab84@gmail.com>
Date: Sun, 03 Jun 2018 21:37:08 +0000
Subject: [PATCH] You can do: fuse_conv_batchnorm(network net) from DLL/SO-library
---
src/detector.c | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/detector.c b/src/detector.c
index 6fc6b67..fc78102 100644
--- a/src/detector.c
+++ b/src/detector.c
@@ -87,7 +87,8 @@
load_args args = {0};
args.w = net.w;
args.h = net.h;
- args.paths = paths;
+ args.c = net.c;
+ args.paths = paths;
args.n = imgs;
args.m = plist->size;
args.classes = classes;
@@ -105,7 +106,7 @@
args.hue = net.hue;
#ifdef OPENCV
- args.threads = 3;
+ args.threads = 3 * ngpus;
IplImage* img = NULL;
float max_img_loss = 5;
int number_of_lines = 100;
@@ -388,6 +389,7 @@
load_args args = { 0 };
args.w = net.w;
args.h = net.h;
+ args.c = net.c;
args.type = IMAGE_DATA;
//args.type = LETTERBOX_DATA;
@@ -482,7 +484,7 @@
for (i = 0; i < m; ++i) {
char *path = paths[i];
- image orig = load_image_color(path, 0, 0);
+ image orig = load_image(path, 0, 0, net.c);
image sized = resize_image(orig, net.w, net.h);
char *id = basecfg(path);
network_predict(net, sized.data);
@@ -595,6 +597,7 @@
load_args args = { 0 };
args.w = net.w;
args.h = net.h;
+ args.c = net.c;
args.type = IMAGE_DATA;
//args.type = LETTERBOX_DATA;
@@ -1093,7 +1096,7 @@
if(!input) return;
strtok(input, "\n");
}
- image im = load_image_color(input,0,0);
+ image im = load_image(input,0,0,net.c);
int letterbox = 0;
//image sized = resize_image(im, net.w, net.h);
image sized = letterbox_image(im, net.w, net.h); letterbox = 1;
--
Gitblit v1.10.0