From a08ef29e085236f13fd04246c6774f9682a56208 Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Fri, 10 Jul 2015 23:38:14 +0000
Subject: [PATCH] NIGHTMARE!!!!
---
src/maxpool_layer.c | 27 +++++++++++++++++----------
1 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/src/maxpool_layer.c b/src/maxpool_layer.c
index 159bd0a..bc3aa68 100644
--- a/src/maxpool_layer.c
+++ b/src/maxpool_layer.c
@@ -4,16 +4,16 @@
image get_maxpool_image(maxpool_layer l)
{
- int h = (l.h-1)/l.stride + 1;
- int w = (l.w-1)/l.stride + 1;
+ int h = l.out_h;
+ int w = l.out_w;
int c = l.c;
return float_to_image(w,h,c,l.output);
}
image get_maxpool_delta(maxpool_layer l)
{
- int h = (l.h-1)/l.stride + 1;
- int w = (l.w-1)/l.stride + 1;
+ int h = l.out_h;
+ int w = l.out_w;
int c = l.c;
return float_to_image(w,h,c,l.delta);
}
@@ -27,11 +27,11 @@
l.h = h;
l.w = w;
l.c = c;
- l.out_h = (h-1)/stride + 1;
l.out_w = (w-1)/stride + 1;
+ l.out_h = (h-1)/stride + 1;
l.out_c = c;
l.outputs = l.out_h * l.out_w * l.out_c;
- l.inputs = l.outputs;
+ l.inputs = h*w*c;
l.size = size;
l.stride = stride;
int output_size = l.out_h * l.out_w * l.out_c * batch;
@@ -46,11 +46,18 @@
return l;
}
-void resize_maxpool_layer(maxpool_layer *l, int h, int w)
+void resize_maxpool_layer(maxpool_layer *l, int w, int h)
{
+ int stride = l->stride;
l->h = h;
l->w = w;
- int output_size = ((h-1)/l->stride+1) * ((w-1)/l->stride+1) * l->c * l->batch;
+
+ l->out_w = (w-1)/stride + 1;
+ l->out_h = (h-1)/stride + 1;
+ l->outputs = l->out_w * l->out_h * l->c;
+ int output_size = l->outputs * l->batch;
+
+ l->indexes = realloc(l->indexes, output_size * sizeof(int));
l->output = realloc(l->output, output_size * sizeof(float));
l->delta = realloc(l->delta, output_size * sizeof(float));
@@ -59,8 +66,8 @@
cuda_free(l->output_gpu);
cuda_free(l->delta_gpu);
l->indexes_gpu = cuda_make_int_array(output_size);
- l->output_gpu = cuda_make_array(l->output, output_size);
- l->delta_gpu = cuda_make_array(l->delta, output_size);
+ l->output_gpu = cuda_make_array(0, output_size);
+ l->delta_gpu = cuda_make_array(0, output_size);
#endif
}
--
Gitblit v1.10.0