From edbccdfcaf46f11e631afe98796f3e6e170da5d0 Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Sun, 26 Oct 2014 05:04:34 +0000
Subject: [PATCH] Maybe something changed?
---
src/network.c | 34 +++++++++++++++++++++++++++++++++-
1 files changed, 33 insertions(+), 1 deletions(-)
diff --git a/src/network.c b/src/network.c
index 6696769..8167d85 100644
--- a/src/network.c
+++ b/src/network.c
@@ -38,6 +38,7 @@
//printf("start\n");
int i;
for(i = 0; i < net.n; ++i){
+ //clock_t time = clock();
if(net.types[i] == CONVOLUTIONAL){
convolutional_layer layer = *(convolutional_layer *)net.layers[i];
forward_convolutional_layer_gpu(layer, input);
@@ -62,6 +63,7 @@
forward_softmax_layer_gpu(layer, input);
input = layer.output_cl;
}
+ //printf("%d %f\n", i, sec(clock()-time));
/*
else if(net.types[i] == CROP){
crop_layer layer = *(crop_layer *)net.layers[i];
@@ -384,6 +386,7 @@
{
int x_size = get_network_input_size(net)*net.batch;
int y_size = get_network_output_size(net)*net.batch;
+ clock_t time = clock();
if(!*net.input_cl){
*net.input_cl = cl_make_array(x, x_size);
*net.truth_cl = cl_make_array(y, y_size);
@@ -391,10 +394,18 @@
cl_write_array(*net.input_cl, x, x_size);
cl_write_array(*net.truth_cl, y, y_size);
}
+ //printf("trans %f\n", sec(clock()-time));
+ time = clock();
forward_network_gpu(net, *net.input_cl, *net.truth_cl, 1);
+ //printf("forw %f\n", sec(clock()-time));
+ time = clock();
backward_network_gpu(net, *net.input_cl);
+ //printf("back %f\n", sec(clock()-time));
+ time = clock();
float error = get_network_cost(net);
update_network_gpu(net);
+ //printf("updt %f\n", sec(clock()-time));
+ time = clock();
return error;
}
@@ -621,7 +632,7 @@
image *prev = 0;
int i;
char buff[256];
- show_image(get_network_image_layer(net, 0), "Crop");
+ //show_image(get_network_image_layer(net, 0), "Crop");
for(i = 0; i < net.n; ++i){
sprintf(buff, "Layer %d", i);
if(net.types[i] == CONVOLUTIONAL){
@@ -635,6 +646,27 @@
}
}
+void top_predictions(network net, int n, int *index)
+{
+ int i,j;
+ int k = get_network_output_size(net);
+ float *out = get_network_output(net);
+ float thresh = FLT_MAX;
+ for(i = 0; i < n; ++i){
+ float max = -FLT_MAX;
+ int max_i = -1;
+ for(j = 0; j < k; ++j){
+ float val = out[j];
+ if(val > max && val < thresh){
+ max = val;
+ max_i = j;
+ }
+ }
+ index[i] = max_i;
+ thresh = max;
+ }
+}
+
float *network_predict(network net, float *input)
{
forward_network(net, input, 0, 0);
--
Gitblit v1.10.0