From 0cbfa4646128206300b9a30586615c3698abfb76 Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Fri, 08 May 2015 17:33:47 +0000
Subject: [PATCH] stuff
---
src/network_kernels.cu | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/src/network_kernels.cu b/src/network_kernels.cu
index 4fc361d..7ff5d15 100644
--- a/src/network_kernels.cu
+++ b/src/network_kernels.cu
@@ -18,11 +18,12 @@
#include "normalization_layer.h"
#include "softmax_layer.h"
#include "dropout_layer.h"
+#include "route_layer.h"
}
-extern "C" float * get_network_output_gpu_layer(network net, int i);
-extern "C" float * get_network_delta_gpu_layer(network net, int i);
-float *get_network_output_gpu(network net);
+float * get_network_output_gpu_layer(network net, int i);
+float * get_network_delta_gpu_layer(network net, int i);
+float * get_network_output_gpu(network net);
void forward_network_gpu(network net, network_state state)
{
@@ -55,6 +56,9 @@
else if(net.types[i] == CROP){
forward_crop_layer_gpu(*(crop_layer *)net.layers[i], state);
}
+ else if(net.types[i] == ROUTE){
+ forward_route_layer_gpu(*(route_layer *)net.layers[i], net);
+ }
state.input = get_network_output_gpu_layer(net, i);
}
}
@@ -71,6 +75,7 @@
state.input = get_network_output_gpu_layer(net, i-1);
state.delta = get_network_delta_gpu_layer(net, i-1);
}
+
if(net.types[i] == CONVOLUTIONAL){
backward_convolutional_layer_gpu(*(convolutional_layer *)net.layers[i], state);
}
@@ -95,6 +100,9 @@
else if(net.types[i] == SOFTMAX){
backward_softmax_layer_gpu(*(softmax_layer *)net.layers[i], state);
}
+ else if(net.types[i] == ROUTE){
+ backward_route_layer_gpu(*(route_layer *)net.layers[i], net);
+ }
}
}
@@ -141,6 +149,9 @@
else if(net.types[i] == SOFTMAX){
return ((softmax_layer *)net.layers[i]) -> output_gpu;
}
+ else if(net.types[i] == ROUTE){
+ return ((route_layer *)net.layers[i]) -> output_gpu;
+ }
else if(net.types[i] == DROPOUT){
return get_network_output_gpu_layer(net, i-1);
}
@@ -169,6 +180,10 @@
maxpool_layer layer = *(maxpool_layer *)net.layers[i];
return layer.delta_gpu;
}
+ else if(net.types[i] == ROUTE){
+ route_layer layer = *(route_layer *)net.layers[i];
+ return layer.delta_gpu;
+ }
else if(net.types[i] == SOFTMAX){
softmax_layer layer = *(softmax_layer *)net.layers[i];
return layer.delta_gpu;
@@ -196,8 +211,8 @@
state.train = 1;
forward_network_gpu(net, state);
backward_network_gpu(net, state);
- if ((net.seen / net.batch) % net.subdivisions == 0) update_network_gpu(net);
float error = get_network_cost(net);
+ if ((net.seen / net.batch) % net.subdivisions == 0) update_network_gpu(net);
return error;
}
--
Gitblit v1.10.0