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 | 44 ++++++++++++++++++++++++++++++--------------
1 files changed, 30 insertions(+), 14 deletions(-)
diff --git a/src/maxpool_layer.c b/src/maxpool_layer.c
index 01eed45..76402fa 100644
--- a/src/maxpool_layer.c
+++ b/src/maxpool_layer.c
@@ -1,4 +1,5 @@
#include "maxpool_layer.h"
+#include "cuda.h"
#include <stdio.h>
image get_maxpool_image(maxpool_layer layer)
@@ -6,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)
@@ -14,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)
@@ -27,22 +28,37 @@
layer->c = c;
layer->size = size;
layer->stride = stride;
- layer->indexes = calloc(((h-1)/stride+1) * ((w-1)/stride+1) * c*batch, sizeof(int));
- layer->output = calloc(((h-1)/stride+1) * ((w-1)/stride+1) * c*batch, sizeof(float));
- layer->delta = calloc(((h-1)/stride+1) * ((w-1)/stride+1) * c*batch, sizeof(float));
+ int output_size = ((h-1)/stride+1) * ((w-1)/stride+1) * c * batch;
+ layer->indexes = calloc(output_size, sizeof(int));
+ layer->output = calloc(output_size, sizeof(float));
+ layer->delta = calloc(output_size, sizeof(float));
+ #ifdef GPU
+ layer->indexes_gpu = cuda_make_int_array(output_size);
+ layer->output_gpu = cuda_make_array(layer->output, output_size);
+ layer->delta_gpu = cuda_make_array(layer->delta, output_size);
+ #endif
return layer;
}
-void resize_maxpool_layer(maxpool_layer *layer, int h, int w, int c)
+void resize_maxpool_layer(maxpool_layer *layer, int h, int w)
{
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 * layer->batch* sizeof(float));
- layer->delta = realloc(layer->delta, ((h-1)/layer->stride+1) * ((w-1)/layer->stride+1) * c * layer->batch*sizeof(float));
+ int output_size = ((h-1)/layer->stride+1) * ((w-1)/layer->stride+1) * layer->c * layer->batch;
+ layer->output = realloc(layer->output, output_size * sizeof(float));
+ layer->delta = realloc(layer->delta, output_size * sizeof(float));
+
+ #ifdef GPU
+ cuda_free((float *)layer->indexes_gpu);
+ cuda_free(layer->output_gpu);
+ cuda_free(layer->delta_gpu);
+ layer->indexes_gpu = cuda_make_int_array(output_size);
+ layer->output_gpu = cuda_make_array(layer->output, output_size);
+ layer->delta_gpu = cuda_make_array(layer->delta, output_size);
+ #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;
@@ -66,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] : -INFINITY;
+ float val = (valid != 0) ? state.input[index] : -FLT_MAX;
max_i = (val > max) ? index : max_i;
max = (val > max) ? val : max;
}
@@ -79,16 +95,16 @@
}
}
-void backward_maxpool_layer(const maxpool_layer layer, float *input, 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