From 913d355ec1cf34aad71fdd75202fc3b0309e63a0 Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Thu, 28 Jan 2016 20:30:38 +0000
Subject: [PATCH] lots of stuff
---
src/deconvolutional_layer.h | 51 ++++++++++-----------------------------------------
1 files changed, 10 insertions(+), 41 deletions(-)
diff --git a/src/deconvolutional_layer.h b/src/deconvolutional_layer.h
index 1da43dc..2d36e02 100644
--- a/src/deconvolutional_layer.h
+++ b/src/deconvolutional_layer.h
@@ -4,55 +4,24 @@
#include "cuda.h"
#include "image.h"
#include "activations.h"
+#include "layer.h"
+#include "network.h"
-typedef struct {
- float learning_rate;
- float momentum;
- float decay;
-
- int batch;
- int h,w,c;
- int n;
- int size;
- int stride;
- float *filters;
- float *filter_updates;
-
- float *biases;
- float *bias_updates;
-
- float *col_image;
- float *delta;
- float *output;
-
- #ifdef GPU
- float * filters_gpu;
- float * filter_updates_gpu;
-
- float * biases_gpu;
- float * bias_updates_gpu;
-
- float * col_image_gpu;
- float * delta_gpu;
- float * output_gpu;
- #endif
-
- ACTIVATION activation;
-} deconvolutional_layer;
+typedef layer deconvolutional_layer;
#ifdef GPU
-void forward_deconvolutional_layer_gpu(deconvolutional_layer layer, float * in);
-void backward_deconvolutional_layer_gpu(deconvolutional_layer layer, float * in, float * delta_gpu);
-void update_deconvolutional_layer_gpu(deconvolutional_layer layer);
+void forward_deconvolutional_layer_gpu(deconvolutional_layer layer, network_state state);
+void backward_deconvolutional_layer_gpu(deconvolutional_layer layer, network_state state);
+void update_deconvolutional_layer_gpu(deconvolutional_layer layer, float learning_rate, float momentum, float decay);
void push_deconvolutional_layer(deconvolutional_layer layer);
void pull_deconvolutional_layer(deconvolutional_layer layer);
#endif
-deconvolutional_layer *make_deconvolutional_layer(int batch, int h, int w, int c, int n, int size, int stride, ACTIVATION activation, float learning_rate, float momentum, float decay);
+deconvolutional_layer make_deconvolutional_layer(int batch, int h, int w, int c, int n, int size, int stride, ACTIVATION activation);
void resize_deconvolutional_layer(deconvolutional_layer *layer, int h, int w);
-void forward_deconvolutional_layer(const deconvolutional_layer layer, float *in);
-void update_deconvolutional_layer(deconvolutional_layer layer);
-void backward_deconvolutional_layer(deconvolutional_layer layer, float *in, float *delta);
+void forward_deconvolutional_layer(const deconvolutional_layer layer, network_state state);
+void update_deconvolutional_layer(deconvolutional_layer layer, float learning_rate, float momentum, float decay);
+void backward_deconvolutional_layer(deconvolutional_layer layer, network_state state);
image get_deconvolutional_image(deconvolutional_layer layer);
image get_deconvolutional_delta(deconvolutional_layer layer);
--
Gitblit v1.10.0