From 0c2cf402aff1b6eef47e8bdfae77472589c42e0c Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Fri, 09 May 2014 22:35:58 +0000
Subject: [PATCH] Some small fixes for frame
---
src/maxpool_layer.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 50 insertions(+), 9 deletions(-)
diff --git a/src/maxpool_layer.c b/src/maxpool_layer.c
index f58a22f..413816a 100644
--- a/src/maxpool_layer.c
+++ b/src/maxpool_layer.c
@@ -6,36 +6,77 @@
int h = (layer.h-1)/layer.stride + 1;
int w = (layer.w-1)/layer.stride + 1;
int c = layer.c;
- return double_to_image(h,w,c,layer.output);
+ return float_to_image(h,w,c,layer.output);
}
-maxpool_layer *make_maxpool_layer(int h, int w, int c, int stride)
+image get_maxpool_delta(maxpool_layer layer)
{
- printf("Maxpool Layer: %d x %d x %d image, %d stride\n", h,w,c,stride);
+ 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);
+}
+
+maxpool_layer *make_maxpool_layer(int batch, int h, int w, int c, int stride)
+{
+ c = c*batch;
+ fprintf(stderr, "Maxpool Layer: %d x %d x %d image, %d stride\n", h,w,c,stride);
maxpool_layer *layer = calloc(1, sizeof(maxpool_layer));
+ layer->batch = batch;
layer->h = h;
layer->w = w;
layer->c = c;
layer->stride = stride;
- layer->output = calloc(((h-1)/stride+1) * ((w-1)/stride+1) * c, sizeof(double));
- layer->delta = calloc(((h-1)/stride+1) * ((w-1)/stride+1) * c, sizeof(double));
+ layer->output = calloc(((h-1)/stride+1) * ((w-1)/stride+1) * c, sizeof(float));
+ layer->delta = calloc(((h-1)/stride+1) * ((w-1)/stride+1) * c, sizeof(float));
return layer;
}
-void forward_maxpool_layer(const maxpool_layer layer, double *in)
+void resize_maxpool_layer(maxpool_layer *layer, int h, int w, int c)
{
- image input = double_to_image(layer.h, layer.w, layer.c, in);
+ layer->h = h;
+ layer->w = w;
+ layer->c = c;
+ layer->output = realloc(layer->output, ((h-1)/layer->stride+1) * ((w-1)/layer->stride+1) * c * sizeof(float));
+ layer->delta = realloc(layer->delta, ((h-1)/layer->stride+1) * ((w-1)/layer->stride+1) * c * sizeof(float));
+}
+
+void forward_maxpool_layer(const maxpool_layer layer, float *in)
+{
+ image input = float_to_image(layer.h, layer.w, layer.c, in);
image output = get_maxpool_image(layer);
int i,j,k;
for(i = 0; i < output.h*output.w*output.c; ++i) output.data[i] = -DBL_MAX;
for(k = 0; k < input.c; ++k){
for(i = 0; i < input.h; ++i){
for(j = 0; j < input.w; ++j){
- double val = get_pixel(input, i, j, k);
- double cur = get_pixel(output, i/layer.stride, j/layer.stride, k);
+ float val = get_pixel(input, i, j, k);
+ float cur = get_pixel(output, i/layer.stride, j/layer.stride, k);
if(val > cur) set_pixel(output, i/layer.stride, j/layer.stride, k, val);
}
}
}
}
+void backward_maxpool_layer(const maxpool_layer layer, float *in, float *delta)
+{
+ image input = float_to_image(layer.h, layer.w, layer.c, in);
+ image input_delta = float_to_image(layer.h, layer.w, layer.c, delta);
+ image output_delta = get_maxpool_delta(layer);
+ image output = get_maxpool_image(layer);
+ int i,j,k;
+ for(k = 0; k < input.c; ++k){
+ for(i = 0; i < input.h; ++i){
+ for(j = 0; j < input.w; ++j){
+ float val = get_pixel(input, i, j, k);
+ float cur = get_pixel(output, i/layer.stride, j/layer.stride, k);
+ float d = get_pixel(output_delta, i/layer.stride, j/layer.stride, k);
+ if(val == cur) {
+ set_pixel(input_delta, i, j, k, d);
+ }
+ else set_pixel(input_delta, i, j, k, 0);
+ }
+ }
+ }
+}
+
--
Gitblit v1.10.0