From d97331b88ff3d50035b1e22c9d0eb671b61227e3 Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Wed, 15 Apr 2015 07:32:32 +0000
Subject: [PATCH] level adjustment for images
---
src/maxpool_layer.c | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/maxpool_layer.c b/src/maxpool_layer.c
index ef7176d..76402fa 100644
--- a/src/maxpool_layer.c
+++ b/src/maxpool_layer.c
@@ -7,7 +7,7 @@
int h = (layer.h-1)/layer.stride + 1;
int w = (layer.w-1)/layer.stride + 1;
int c = layer.c;
- return float_to_image(h,w,c,layer.output);
+ return float_to_image(w,h,c,layer.output);
}
image get_maxpool_delta(maxpool_layer layer)
@@ -15,7 +15,7 @@
int h = (layer.h-1)/layer.stride + 1;
int w = (layer.w-1)/layer.stride + 1;
int c = layer.c;
- return float_to_image(h,w,c,layer.delta);
+ return float_to_image(w,h,c,layer.delta);
}
maxpool_layer *make_maxpool_layer(int batch, int h, int w, int c, int size, int stride)
@@ -58,7 +58,7 @@
#endif
}
-void forward_maxpool_layer(const maxpool_layer layer, float *input)
+void forward_maxpool_layer(const maxpool_layer layer, network_state state)
{
int b,i,j,k,l,m;
int w_offset = (-layer.size-1)/2 + 1;
@@ -82,7 +82,7 @@
int index = cur_w + layer.w*(cur_h + layer.h*(k + b*layer.c));
int valid = (cur_h >= 0 && cur_h < layer.h &&
cur_w >= 0 && cur_w < layer.w);
- float val = (valid != 0) ? input[index] : -FLT_MAX;
+ float val = (valid != 0) ? state.input[index] : -FLT_MAX;
max_i = (val > max) ? index : max_i;
max = (val > max) ? val : max;
}
@@ -95,16 +95,16 @@
}
}
-void backward_maxpool_layer(const maxpool_layer layer, float *delta)
+void backward_maxpool_layer(const maxpool_layer layer, network_state state)
{
int i;
int h = (layer.h-1)/layer.stride + 1;
int w = (layer.w-1)/layer.stride + 1;
int c = layer.c;
- memset(delta, 0, layer.batch*layer.h*layer.w*layer.c*sizeof(float));
+ memset(state.delta, 0, layer.batch*layer.h*layer.w*layer.c*sizeof(float));
for(i = 0; i < h*w*c*layer.batch; ++i){
int index = layer.indexes[i];
- delta[index] += layer.delta[i];
+ state.delta[index] += layer.delta[i];
}
}
--
Gitblit v1.10.0