From e36182cd8c5dd5c6d0aa1f77cf5cdca87e8bb1f0 Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Fri, 21 Nov 2014 23:35:19 +0000
Subject: [PATCH] cleaned up data parsing a lot. probably nothing broken?
---
src/maxpool_layer.c | 142 ++++++++++++++++++++++++++++++++++++----------
1 files changed, 110 insertions(+), 32 deletions(-)
diff --git a/src/maxpool_layer.c b/src/maxpool_layer.c
index 070eaba..df19040 100644
--- a/src/maxpool_layer.c
+++ b/src/maxpool_layer.c
@@ -27,9 +27,15 @@
layer->c = c;
layer->size = size;
layer->stride = stride;
- layer->max_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_cl = cl_make_int_array(layer->indexes, output_size);
+ layer->output_cl = cl_make_array(layer->output, output_size);
+ layer->delta_cl = cl_make_array(layer->delta, output_size);
+ #endif
return layer;
}
@@ -44,43 +50,42 @@
void forward_maxpool_layer(const maxpool_layer layer, float *input)
{
- int b;
+ int b,i,j,k,l,m;
+ int w_offset = (-layer.size-1)/2 + 1;
+ int h_offset = (-layer.size-1)/2 + 1;
+
+ int h = (layer.h-1)/layer.stride + 1;
+ int w = (layer.w-1)/layer.stride + 1;
+ int c = layer.c;
+
for(b = 0; b < layer.batch; ++b){
- int h = (layer.h-1)/layer.stride + 1;
- int w = (layer.w-1)/layer.stride + 1;
- int c = layer.c;
-
- int i,j,k,l,m;
- for(k = 0; k < layer.c; ++k){
- for(i = 0; i < layer.h; i += layer.stride){
- for(j = 0; j < layer.w; j += layer.stride){
- int out_index = j/layer.stride + w*(i/layer.stride + h*(k + c*b));
- layer.output[out_index] = -FLT_MAX;
- int lower = (-layer.size-1)/2 + 1;
- int upper = layer.size/2 + 1;
-
- int lh = (i+lower < 0) ? 0 : i+lower;
- int uh = (i+upper > layer.h) ? layer.h : i+upper;
-
- int lw = (j+lower < 0) ? 0 : j+lower;
- int uw = (j+upper > layer.w) ? layer.w : j+upper;
- for(l = lh; l < uh; ++l){
- for(m = lw; m < uw; ++m){
- //printf("%d %d\n", l, m);
- int index = m + layer.w*(l + layer.h*(k + b*layer.c));
- if(input[index] > layer.output[out_index]){
- layer.output[out_index] = input[index];
- layer.max_indexes[out_index] = index;
- }
+ for(k = 0; k < c; ++k){
+ for(i = 0; i < h; ++i){
+ for(j = 0; j < w; ++j){
+ int out_index = j + w*(i + h*(k + c*b));
+ float max = -FLT_MAX;
+ int max_i = -1;
+ for(l = 0; l < layer.size; ++l){
+ for(m = 0; m < layer.size; ++m){
+ int cur_h = h_offset + i*layer.stride + l;
+ int cur_w = w_offset + j*layer.stride + m;
+ 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;
+ max_i = (val > max) ? index : max_i;
+ max = (val > max) ? val : max;
}
}
+ layer.output[out_index] = max;
+ layer.indexes[out_index] = max_i;
}
}
}
}
}
-void backward_maxpool_layer(const maxpool_layer layer, float *input, float *delta)
+void backward_maxpool_layer(const maxpool_layer layer, float *delta)
{
int i;
int h = (layer.h-1)/layer.stride + 1;
@@ -88,8 +93,81 @@
int c = layer.c;
memset(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.max_indexes[i];
+ int index = layer.indexes[i];
delta[index] += layer.delta[i];
}
}
+#ifdef GPU
+cl_kernel get_forward_kernel()
+{
+ static int init = 0;
+ static cl_kernel kernel;
+ if(!init){
+ kernel = get_kernel("src/maxpool_layer.cl", "forward", 0);
+ init = 1;
+ }
+ return kernel;
+}
+
+void forward_maxpool_layer_gpu(maxpool_layer layer, cl_mem input)
+{
+ int h = (layer.h-1)/layer.stride + 1;
+ int w = (layer.w-1)/layer.stride + 1;
+ int c = layer.c;
+ cl_setup();
+ cl_kernel kernel = get_forward_kernel();
+ cl_command_queue queue = cl.queue;
+
+ cl_uint i = 0;
+ cl.error = clSetKernelArg(kernel, i++, sizeof(layer.h), (void*) &layer.h);
+ cl.error = clSetKernelArg(kernel, i++, sizeof(layer.w), (void*) &layer.w);
+ cl.error = clSetKernelArg(kernel, i++, sizeof(layer.c), (void*) &layer.c);
+ cl.error = clSetKernelArg(kernel, i++, sizeof(layer.stride), (void*) &layer.stride);
+ cl.error = clSetKernelArg(kernel, i++, sizeof(layer.size), (void*) &layer.size);
+ cl.error = clSetKernelArg(kernel, i++, sizeof(input), (void*) &input);
+ cl.error = clSetKernelArg(kernel, i++, sizeof(layer.output_cl), (void*) &layer.output_cl);
+ cl.error = clSetKernelArg(kernel, i++, sizeof(layer.indexes_cl), (void*) &layer.indexes_cl);
+ check_error(cl);
+
+ const size_t global_size[] = {h*w*c*layer.batch};
+
+ cl.error = clEnqueueNDRangeKernel(queue, kernel, 1, 0, global_size, 0, 0, 0, 0);
+ check_error(cl);
+}
+
+cl_kernel get_backward_kernel()
+{
+ static int init = 0;
+ static cl_kernel kernel;
+ if(!init){
+ kernel = get_kernel("src/maxpool_layer.cl", "backward", 0);
+ init = 1;
+ }
+ return kernel;
+}
+
+void backward_maxpool_layer_gpu(maxpool_layer layer, cl_mem delta)
+{
+ cl_setup();
+ cl_kernel kernel = get_backward_kernel();
+ cl_command_queue queue = cl.queue;
+
+ cl_uint i = 0;
+ cl.error = clSetKernelArg(kernel, i++, sizeof(layer.h), (void*) &layer.h);
+ cl.error = clSetKernelArg(kernel, i++, sizeof(layer.w), (void*) &layer.w);
+ cl.error = clSetKernelArg(kernel, i++, sizeof(layer.c), (void*) &layer.c);
+ cl.error = clSetKernelArg(kernel, i++, sizeof(layer.stride), (void*) &layer.stride);
+ cl.error = clSetKernelArg(kernel, i++, sizeof(layer.size), (void*) &layer.size);
+ cl.error = clSetKernelArg(kernel, i++, sizeof(layer.delta_cl), (void*) &layer.delta_cl);
+ cl.error = clSetKernelArg(kernel, i++, sizeof(delta), (void*) &delta);
+ cl.error = clSetKernelArg(kernel, i++, sizeof(layer.indexes_cl), (void*) &layer.indexes_cl);
+ check_error(cl);
+
+ const size_t global_size[] = {layer.h*layer.w*layer.c*layer.batch};
+
+ cl.error = clEnqueueNDRangeKernel(queue, kernel, 1, 0, global_size, 0, 0, 0, 0);
+ check_error(cl);
+}
+
+#endif
--
Gitblit v1.10.0