From 2db9fbef2bd7d35a547d0018a9850f6b249c524f Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Wed, 13 Nov 2013 18:50:38 +0000
Subject: [PATCH] Parsing, image loading, lots of stuff
---
src/maxpool_layer.c | 39 ++++++++++++++++++++++++++++-----------
1 files changed, 28 insertions(+), 11 deletions(-)
diff --git a/src/maxpool_layer.c b/src/maxpool_layer.c
index 38ac582..f58a22f 100644
--- a/src/maxpool_layer.c
+++ b/src/maxpool_layer.c
@@ -1,24 +1,41 @@
#include "maxpool_layer.h"
+#include <stdio.h>
-maxpool_layer make_maxpool_layer(int h, int w, int c, int stride)
+image get_maxpool_image(maxpool_layer layer)
{
- maxpool_layer layer;
- layer.stride = stride;
- layer.output = make_image((h-1)/stride+1, (w-1)/stride+1, c);
+ 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);
+}
+
+maxpool_layer *make_maxpool_layer(int h, int w, int c, int stride)
+{
+ printf("Maxpool Layer: %d x %d x %d image, %d stride\n", h,w,c,stride);
+ maxpool_layer *layer = calloc(1, sizeof(maxpool_layer));
+ 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));
return layer;
}
-void run_maxpool_layer(const image input, const maxpool_layer layer)
+void forward_maxpool_layer(const maxpool_layer layer, double *in)
{
+ image input = double_to_image(layer.h, layer.w, layer.c, in);
+ image output = get_maxpool_image(layer);
int i,j,k;
- for(i = 0; i < layer.output.h*layer.output.w*layer.output.c; ++i) layer.output.data[i] = -DBL_MAX;
- for(i = 0; i < input.h; ++i){
- for(j = 0; j < input.w; ++j){
- for(k = 0; k < input.c; ++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(layer.output, i/layer.stride, j/layer.stride, k);
- if(val > cur) set_pixel(layer.output, i/layer.stride, j/layer.stride, k, val);
+ double 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);
}
}
}
}
+
--
Gitblit v1.10.0