From d00f0a1ccd2a9b1c332bbf7754f291dd61dee14f Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Tue, 21 Jul 2015 23:09:33 +0000
Subject: [PATCH] Changes to make routing work better
---
src/network.c | 22 ++++++++++++++++++++++
1 files changed, 22 insertions(+), 0 deletions(-)
diff --git a/src/network.c b/src/network.c
index c691600..5b52da9 100644
--- a/src/network.c
+++ b/src/network.c
@@ -10,7 +10,9 @@
#include "convolutional_layer.h"
#include "deconvolutional_layer.h"
#include "detection_layer.h"
+#include "normalization_layer.h"
#include "maxpool_layer.h"
+#include "avgpool_layer.h"
#include "cost_layer.h"
#include "softmax_layer.h"
#include "dropout_layer.h"
@@ -27,6 +29,8 @@
return "connected";
case MAXPOOL:
return "maxpool";
+ case AVGPOOL:
+ return "avgpool";
case SOFTMAX:
return "softmax";
case DETECTION:
@@ -39,6 +43,8 @@
return "cost";
case ROUTE:
return "route";
+ case NORMALIZATION:
+ return "normalization";
default:
break;
}
@@ -62,10 +68,15 @@
int i;
for(i = 0; i < net.n; ++i){
layer l = net.layers[i];
+ if(l.delta){
+ scal_cpu(l.outputs * l.batch, 0, l.delta, 1);
+ }
if(l.type == CONVOLUTIONAL){
forward_convolutional_layer(l, state);
} else if(l.type == DECONVOLUTIONAL){
forward_deconvolutional_layer(l, state);
+ } else if(l.type == NORMALIZATION){
+ forward_normalization_layer(l, state);
} else if(l.type == DETECTION){
forward_detection_layer(l, state);
} else if(l.type == CONNECTED){
@@ -78,6 +89,8 @@
forward_softmax_layer(l, state);
} else if(l.type == MAXPOOL){
forward_maxpool_layer(l, state);
+ } else if(l.type == AVGPOOL){
+ forward_avgpool_layer(l, state);
} else if(l.type == DROPOUT){
forward_dropout_layer(l, state);
} else if(l.type == ROUTE){
@@ -147,8 +160,12 @@
backward_convolutional_layer(l, state);
} else if(l.type == DECONVOLUTIONAL){
backward_deconvolutional_layer(l, state);
+ } else if(l.type == NORMALIZATION){
+ backward_normalization_layer(l, state);
} else if(l.type == MAXPOOL){
if(i != 0) backward_maxpool_layer(l, state);
+ } else if(l.type == AVGPOOL){
+ backward_avgpool_layer(l, state);
} else if(l.type == DROPOUT){
backward_dropout_layer(l, state);
} else if(l.type == DETECTION){
@@ -266,6 +283,11 @@
resize_convolutional_layer(&l, w, h);
}else if(l.type == MAXPOOL){
resize_maxpool_layer(&l, w, h);
+ }else if(l.type == AVGPOOL){
+ resize_avgpool_layer(&l, w, h);
+ break;
+ }else if(l.type == NORMALIZATION){
+ resize_normalization_layer(&l, w, h);
}else{
error("Cannot resize this type of layer");
}
--
Gitblit v1.10.0