From f047cfff99e00e28c02eb59b6d32386c122f9af6 Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Sun, 08 Mar 2015 18:31:12 +0000
Subject: [PATCH] renamed sigmoid to logistic
---
src/network.c | 144 ++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 121 insertions(+), 23 deletions(-)
diff --git a/src/network.c b/src/network.c
index 5c5ce9d..b60f059 100644
--- a/src/network.c
+++ b/src/network.c
@@ -8,6 +8,8 @@
#include "crop_layer.h"
#include "connected_layer.h"
#include "convolutional_layer.h"
+#include "deconvolutional_layer.h"
+#include "detection_layer.h"
#include "maxpool_layer.h"
#include "cost_layer.h"
#include "normalization_layer.h"
@@ -15,6 +17,37 @@
#include "softmax_layer.h"
#include "dropout_layer.h"
+char *get_layer_string(LAYER_TYPE a)
+{
+ switch(a){
+ case CONVOLUTIONAL:
+ return "convolutional";
+ case DECONVOLUTIONAL:
+ return "deconvolutional";
+ case CONNECTED:
+ return "connected";
+ case MAXPOOL:
+ return "maxpool";
+ case SOFTMAX:
+ return "softmax";
+ case DETECTION:
+ return "detection";
+ case NORMALIZATION:
+ return "normalization";
+ case DROPOUT:
+ return "dropout";
+ case FREEWEIGHT:
+ return "freeweight";
+ case CROP:
+ return "crop";
+ case COST:
+ return "cost";
+ default:
+ break;
+ }
+ return "none";
+}
+
network make_network(int n, int batch)
{
network net;
@@ -24,14 +57,14 @@
net.types = calloc(net.n, sizeof(LAYER_TYPE));
net.outputs = 0;
net.output = 0;
+ net.seen = 0;
#ifdef GPU
- net.input_cl = calloc(1, sizeof(cl_mem));
- net.truth_cl = calloc(1, sizeof(cl_mem));
+ net.input_gpu = calloc(1, sizeof(float *));
+ net.truth_gpu = calloc(1, sizeof(float *));
#endif
return net;
}
-
void forward_network(network net, float *input, float *truth, int train)
{
int i;
@@ -41,6 +74,16 @@
forward_convolutional_layer(layer, input);
input = layer.output;
}
+ else if(net.types[i] == DECONVOLUTIONAL){
+ deconvolutional_layer layer = *(deconvolutional_layer *)net.layers[i];
+ forward_deconvolutional_layer(layer, input);
+ input = layer.output;
+ }
+ else if(net.types[i] == DETECTION){
+ detection_layer layer = *(detection_layer *)net.layers[i];
+ forward_detection_layer(layer, input, truth);
+ input = layer.output;
+ }
else if(net.types[i] == CONNECTED){
connected_layer layer = *(connected_layer *)net.layers[i];
forward_connected_layer(layer, input);
@@ -48,7 +91,7 @@
}
else if(net.types[i] == CROP){
crop_layer layer = *(crop_layer *)net.layers[i];
- forward_crop_layer(layer, input);
+ forward_crop_layer(layer, train, input);
input = layer.output;
}
else if(net.types[i] == COST){
@@ -78,9 +121,12 @@
}
else if(net.types[i] == FREEWEIGHT){
if(!train) continue;
- freeweight_layer layer = *(freeweight_layer *)net.layers[i];
- forward_freeweight_layer(layer, input);
+ //freeweight_layer layer = *(freeweight_layer *)net.layers[i];
+ //forward_freeweight_layer(layer, input);
}
+ //char buff[256];
+ //sprintf(buff, "layer %d", i);
+ //cuda_compare(get_network_output_gpu_layer(net, i), input, get_network_output_size_layer(net, i)*net.batch, buff);
}
}
@@ -92,18 +138,12 @@
convolutional_layer layer = *(convolutional_layer *)net.layers[i];
update_convolutional_layer(layer);
}
- else if(net.types[i] == MAXPOOL){
- //maxpool_layer layer = *(maxpool_layer *)net.layers[i];
- }
- else if(net.types[i] == SOFTMAX){
- //maxpool_layer layer = *(maxpool_layer *)net.layers[i];
- }
- else if(net.types[i] == NORMALIZATION){
- //maxpool_layer layer = *(maxpool_layer *)net.layers[i];
+ else if(net.types[i] == DECONVOLUTIONAL){
+ deconvolutional_layer layer = *(deconvolutional_layer *)net.layers[i];
+ update_deconvolutional_layer(layer);
}
else if(net.types[i] == CONNECTED){
connected_layer layer = *(connected_layer *)net.layers[i];
- //secret_update_connected_layer((connected_layer *)net.layers[i]);
update_connected_layer(layer);
}
}
@@ -114,9 +154,15 @@
if(net.types[i] == CONVOLUTIONAL){
convolutional_layer layer = *(convolutional_layer *)net.layers[i];
return layer.output;
+ } else if(net.types[i] == DECONVOLUTIONAL){
+ deconvolutional_layer layer = *(deconvolutional_layer *)net.layers[i];
+ return layer.output;
} else if(net.types[i] == MAXPOOL){
maxpool_layer layer = *(maxpool_layer *)net.layers[i];
return layer.output;
+ } else if(net.types[i] == DETECTION){
+ detection_layer layer = *(detection_layer *)net.layers[i];
+ return layer.output;
} else if(net.types[i] == SOFTMAX){
softmax_layer layer = *(softmax_layer *)net.layers[i];
return layer.output;
@@ -149,12 +195,18 @@
if(net.types[i] == CONVOLUTIONAL){
convolutional_layer layer = *(convolutional_layer *)net.layers[i];
return layer.delta;
+ } else if(net.types[i] == DECONVOLUTIONAL){
+ deconvolutional_layer layer = *(deconvolutional_layer *)net.layers[i];
+ return layer.delta;
} else if(net.types[i] == MAXPOOL){
maxpool_layer layer = *(maxpool_layer *)net.layers[i];
return layer.delta;
} else if(net.types[i] == SOFTMAX){
softmax_layer layer = *(softmax_layer *)net.layers[i];
return layer.delta;
+ } else if(net.types[i] == DETECTION){
+ detection_layer layer = *(detection_layer *)net.layers[i];
+ return layer.delta;
} else if(net.types[i] == DROPOUT){
if(i == 0) return 0;
return get_network_delta_layer(net, i-1);
@@ -205,7 +257,7 @@
return max_index(out, k);
}
-void backward_network(network net, float *input)
+void backward_network(network net, float *input, float *truth)
{
int i;
float *prev_input;
@@ -218,9 +270,13 @@
prev_input = get_network_output_layer(net, i-1);
prev_delta = get_network_delta_layer(net, i-1);
}
+
if(net.types[i] == CONVOLUTIONAL){
convolutional_layer layer = *(convolutional_layer *)net.layers[i];
backward_convolutional_layer(layer, prev_input, prev_delta);
+ } else if(net.types[i] == DECONVOLUTIONAL){
+ deconvolutional_layer layer = *(deconvolutional_layer *)net.layers[i];
+ backward_deconvolutional_layer(layer, prev_input, prev_delta);
}
else if(net.types[i] == MAXPOOL){
maxpool_layer layer = *(maxpool_layer *)net.layers[i];
@@ -230,6 +286,10 @@
dropout_layer layer = *(dropout_layer *)net.layers[i];
backward_dropout_layer(layer, prev_delta);
}
+ else if(net.types[i] == DETECTION){
+ detection_layer layer = *(detection_layer *)net.layers[i];
+ backward_detection_layer(layer, prev_input, prev_delta);
+ }
else if(net.types[i] == NORMALIZATION){
normalization_layer layer = *(normalization_layer *)net.layers[i];
if(i != 0) backward_normalization_layer(layer, prev_input, prev_delta);
@@ -255,7 +315,7 @@
if(gpu_index >= 0) return train_network_datum_gpu(net, x, y);
#endif
forward_network(net, x, y, 1);
- backward_network(net, x);
+ backward_network(net, x, y);
float error = get_network_cost(net);
update_network(net);
return error;
@@ -309,7 +369,7 @@
float *x = d.X.vals[index];
float *y = d.y.vals[index];
forward_network(net, x, y, 1);
- backward_network(net, x);
+ backward_network(net, x, y);
sum += get_network_cost(net);
}
update_network(net);
@@ -339,7 +399,6 @@
}
}
-
void set_batch_network(network *net, int b)
{
net->batch = b;
@@ -348,6 +407,9 @@
if(net->types[i] == CONVOLUTIONAL){
convolutional_layer *layer = (convolutional_layer *)net->layers[i];
layer->batch = b;
+ }else if(net->types[i] == DECONVOLUTIONAL){
+ deconvolutional_layer *layer = (deconvolutional_layer *)net->layers[i];
+ layer->batch = b;
}
else if(net->types[i] == MAXPOOL){
maxpool_layer *layer = (maxpool_layer *)net->layers[i];
@@ -359,6 +421,9 @@
} else if(net->types[i] == DROPOUT){
dropout_layer *layer = (dropout_layer *) net->layers[i];
layer->batch = b;
+ } else if(net->types[i] == DETECTION){
+ detection_layer *layer = (detection_layer *) net->layers[i];
+ layer->batch = b;
}
else if(net->types[i] == FREEWEIGHT){
freeweight_layer *layer = (freeweight_layer *) net->layers[i];
@@ -386,6 +451,10 @@
convolutional_layer layer = *(convolutional_layer *)net.layers[i];
return layer.h*layer.w*layer.c;
}
+ if(net.types[i] == DECONVOLUTIONAL){
+ deconvolutional_layer layer = *(deconvolutional_layer *)net.layers[i];
+ return layer.h*layer.w*layer.c;
+ }
else if(net.types[i] == MAXPOOL){
maxpool_layer layer = *(maxpool_layer *)net.layers[i];
return layer.h*layer.w*layer.c;
@@ -396,6 +465,9 @@
} else if(net.types[i] == DROPOUT){
dropout_layer layer = *(dropout_layer *) net.layers[i];
return layer.inputs;
+ } else if(net.types[i] == DETECTION){
+ detection_layer layer = *(detection_layer *) net.layers[i];
+ return layer.inputs;
} else if(net.types[i] == CROP){
crop_layer layer = *(crop_layer *) net.layers[i];
return layer.c*layer.h*layer.w;
@@ -419,6 +491,15 @@
image output = get_convolutional_image(layer);
return output.h*output.w*output.c;
}
+ else if(net.types[i] == DECONVOLUTIONAL){
+ deconvolutional_layer layer = *(deconvolutional_layer *)net.layers[i];
+ image output = get_deconvolutional_image(layer);
+ return output.h*output.w*output.c;
+ }
+ else if(net.types[i] == DETECTION){
+ detection_layer layer = *(detection_layer *)net.layers[i];
+ return get_detection_layer_output_size(layer);
+ }
else if(net.types[i] == MAXPOOL){
maxpool_layer layer = *(maxpool_layer *)net.layers[i];
image output = get_maxpool_image(layer);
@@ -454,21 +535,31 @@
for (i = 0; i < net.n; ++i){
if(net.types[i] == CONVOLUTIONAL){
convolutional_layer *layer = (convolutional_layer *)net.layers[i];
- resize_convolutional_layer(layer, h, w, c);
+ resize_convolutional_layer(layer, h, w);
image output = get_convolutional_image(*layer);
h = output.h;
w = output.w;
c = output.c;
+ } else if(net.types[i] == DECONVOLUTIONAL){
+ deconvolutional_layer *layer = (deconvolutional_layer *)net.layers[i];
+ resize_deconvolutional_layer(layer, h, w);
+ image output = get_deconvolutional_image(*layer);
+ h = output.h;
+ w = output.w;
+ c = output.c;
}else if(net.types[i] == MAXPOOL){
maxpool_layer *layer = (maxpool_layer *)net.layers[i];
- resize_maxpool_layer(layer, h, w, c);
+ resize_maxpool_layer(layer, h, w);
image output = get_maxpool_image(*layer);
h = output.h;
w = output.w;
c = output.c;
+ }else if(net.types[i] == DROPOUT){
+ dropout_layer *layer = (dropout_layer *)net.layers[i];
+ resize_dropout_layer(layer, h*w*c);
}else if(net.types[i] == NORMALIZATION){
normalization_layer *layer = (normalization_layer *)net.layers[i];
- resize_normalization_layer(layer, h, w, c);
+ resize_normalization_layer(layer, h, w);
image output = get_normalization_image(*layer);
h = output.h;
w = output.w;
@@ -498,6 +589,10 @@
convolutional_layer layer = *(convolutional_layer *)net.layers[i];
return get_convolutional_image(layer);
}
+ else if(net.types[i] == DECONVOLUTIONAL){
+ deconvolutional_layer layer = *(deconvolutional_layer *)net.layers[i];
+ return get_deconvolutional_image(layer);
+ }
else if(net.types[i] == MAXPOOL){
maxpool_layer layer = *(maxpool_layer *)net.layers[i];
return get_maxpool_image(layer);
@@ -506,6 +601,9 @@
normalization_layer layer = *(normalization_layer *)net.layers[i];
return get_normalization_image(layer);
}
+ else if(net.types[i] == DROPOUT){
+ return get_network_image_layer(net, i-1);
+ }
else if(net.types[i] == CROP){
crop_layer layer = *(crop_layer *)net.layers[i];
return get_crop_image(layer);
@@ -553,7 +651,7 @@
float *network_predict(network net, float *input)
{
#ifdef GPU
- if(gpu_index >= 0) return network_predict_gpu(net, input);
+ if(gpu_index >= 0) return network_predict_gpu(net, input);
#endif
forward_network(net, input, 0, 0);
--
Gitblit v1.10.0