From 38bd6ae6ba24fc8c14fd61d1238ae94a983434b3 Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Mon, 20 Jul 2015 23:16:26 +0000
Subject: [PATCH] Better partial function
---
src/network_kernels.cu | 25 +++++++++++--------------
1 files changed, 11 insertions(+), 14 deletions(-)
diff --git a/src/network_kernels.cu b/src/network_kernels.cu
index 36f5594..3a4f0bf 100644
--- a/src/network_kernels.cu
+++ b/src/network_kernels.cu
@@ -15,6 +15,8 @@
#include "convolutional_layer.h"
#include "deconvolutional_layer.h"
#include "maxpool_layer.h"
+#include "avgpool_layer.h"
+#include "normalization_layer.h"
#include "cost_layer.h"
#include "softmax_layer.h"
#include "dropout_layer.h"
@@ -44,8 +46,12 @@
forward_cost_layer_gpu(l, state);
} else if(l.type == SOFTMAX){
forward_softmax_layer_gpu(l, state);
+ } else if(l.type == NORMALIZATION){
+ forward_normalization_layer_gpu(l, state);
} else if(l.type == MAXPOOL){
forward_maxpool_layer_gpu(l, state);
+ } else if(l.type == AVGPOOL){
+ forward_avgpool_layer_gpu(l, state);
} else if(l.type == DROPOUT){
forward_dropout_layer_gpu(l, state);
} else if(l.type == ROUTE){
@@ -76,10 +82,14 @@
backward_deconvolutional_layer_gpu(l, state);
} else if(l.type == MAXPOOL){
if(i != 0) backward_maxpool_layer_gpu(l, state);
+ } else if(l.type == AVGPOOL){
+ if(i != 0) backward_avgpool_layer_gpu(l, state);
} else if(l.type == DROPOUT){
backward_dropout_layer_gpu(l, state);
} else if(l.type == DETECTION){
backward_detection_layer_gpu(l, state);
+ } else if(l.type == NORMALIZATION){
+ backward_normalization_layer_gpu(l, state);
} else if(l.type == SOFTMAX){
if(i != 0) backward_softmax_layer_gpu(l, state);
} else if(l.type == CONNECTED){
@@ -136,20 +146,7 @@
{
layer l = net.layers[i];
cuda_pull_array(l.output_gpu, l.output, l.outputs*l.batch);
- if(l.type == CONVOLUTIONAL){
- return l.output;
- } else if(l.type == DECONVOLUTIONAL){
- return l.output;
- } else if(l.type == CONNECTED){
- return l.output;
- } else if(l.type == DETECTION){
- return l.output;
- } else if(l.type == MAXPOOL){
- return l.output;
- } else if(l.type == SOFTMAX){
- return l.output;
- }
- return 0;
+ return l.output;
}
float *get_network_output_gpu(network net)
--
Gitblit v1.10.0