From 38bd6ae6ba24fc8c14fd61d1238ae94a983434b3 Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Mon, 20 Jul 2015 23:16:26 +0000
Subject: [PATCH] Better partial function
---
src/convolutional_layer.c | 22 +++++++++++++++-------
1 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/src/convolutional_layer.c b/src/convolutional_layer.c
index e29d995..c266934 100644
--- a/src/convolutional_layer.c
+++ b/src/convolutional_layer.c
@@ -97,12 +97,18 @@
return l;
}
-void resize_convolutional_layer(convolutional_layer *l, int h, int w)
+void resize_convolutional_layer(convolutional_layer *l, int w, int h)
{
- l->h = h;
l->w = w;
- int out_h = convolutional_out_height(*l);
+ l->h = h;
int out_w = convolutional_out_width(*l);
+ int out_h = convolutional_out_height(*l);
+
+ l->out_w = out_w;
+ l->out_h = out_h;
+
+ l->outputs = l->out_h * l->out_w * l->out_c;
+ l->inputs = l->w * l->h * l->c;
l->col_image = realloc(l->col_image,
out_h*out_w*l->size*l->size*l->c*sizeof(float));
@@ -116,9 +122,9 @@
cuda_free(l->delta_gpu);
cuda_free(l->output_gpu);
- l->col_image_gpu = cuda_make_array(l->col_image, out_h*out_w*l->size*l->size*l->c);
- l->delta_gpu = cuda_make_array(l->delta, l->batch*out_h*out_w*l->n);
- l->output_gpu = cuda_make_array(l->output, l->batch*out_h*out_w*l->n);
+ l->col_image_gpu = cuda_make_array(0, out_h*out_w*l->size*l->size*l->c);
+ l->delta_gpu = cuda_make_array(0, l->batch*out_h*out_w*l->n);
+ l->output_gpu = cuda_make_array(0, l->batch*out_h*out_w*l->n);
#endif
}
@@ -232,7 +238,9 @@
int i;
for(i = 0; i < l.n; ++i){
image im = get_convolutional_filter(l, i);
- if (im.c == 3) rgbgr_image(im);
+ if (im.c == 3) {
+ rgbgr_image(im);
+ }
}
}
--
Gitblit v1.10.0