From cf32e7e9b843560eb7ec3ed16e5b19f0f7156724 Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@burninator.cs.washington.edu>
Date: Sat, 25 Jun 2016 23:12:00 +0000
Subject: [PATCH] colors
---
src/classifier.c | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/classifier.c b/src/classifier.c
index 5104608..2d0d0e0 100644
--- a/src/classifier.c
+++ b/src/classifier.c
@@ -51,7 +51,7 @@
}
if(clear) *net.seen = 0;
printf("Learning Rate: %g, Momentum: %g, Decay: %g\n", net.learning_rate, net.momentum, net.decay);
- int imgs = net.batch;
+ int imgs = net.batch*net.subdivisions;
list *options = read_data_cfg(datacfg);
@@ -338,10 +338,10 @@
{
int i, j;
network net = parse_network_cfg(filename);
- set_batch_network(&net, 1);
if(weightfile){
load_weights(&net, weightfile);
}
+ set_batch_network(&net, 1);
srand(time(0));
list *options = read_data_cfg(datacfg);
@@ -477,6 +477,7 @@
int *indexes = calloc(top, sizeof(int));
char buff[256];
char *input = buff;
+ int size = net.w;
while(1){
if(filename){
strncpy(input, filename, 256);
@@ -487,8 +488,12 @@
if(!input) return;
strtok(input, "\n");
}
- image im = load_image_color(input, net.w, net.h);
- float *X = im.data;
+ image im = load_image_color(input, 0, 0);
+ image r = resize_min(im, size);
+ resize_network(&net, r.w, r.h);
+ printf("%d %d\n", r.w, r.h);
+
+ float *X = r.data;
time=clock();
float *predictions = network_predict(net, X);
top_predictions(net, top, indexes);
@@ -497,6 +502,7 @@
int index = indexes[i];
printf("%s: %f\n", names[index], predictions[index]);
}
+ if(r.data != im.data) free_image(r);
free_image(im);
if (filename) break;
}
--
Gitblit v1.10.0