From 4f50e29365c8b8fd3aa9b67167701c1ada1e373f Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Thu, 09 Apr 2015 22:18:54 +0000
Subject: [PATCH] big change to images
---
src/convolutional_layer.h | 50 +++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 39 insertions(+), 11 deletions(-)
diff --git a/src/convolutional_layer.h b/src/convolutional_layer.h
index 8ca69b1..5cf8adc 100644
--- a/src/convolutional_layer.h
+++ b/src/convolutional_layer.h
@@ -1,44 +1,72 @@
#ifndef CONVOLUTIONAL_LAYER_H
#define CONVOLUTIONAL_LAYER_H
+#include "cuda.h"
+#include "params.h"
#include "image.h"
#include "activations.h"
typedef struct {
+ int batch;
int h,w,c;
int n;
int size;
int stride;
+ int pad;
float *filters;
float *filter_updates;
- float *filter_momentum;
float *biases;
float *bias_updates;
- float *bias_momentum;
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;
} convolutional_layer;
-convolutional_layer *make_convolutional_layer(int h, int w, int c, int n, int size, int stride, ACTIVATION activation);
-void forward_convolutional_layer(const convolutional_layer layer, float *in);
-void learn_convolutional_layer(convolutional_layer layer);
-void update_convolutional_layer(convolutional_layer layer, float step, float momentum, float decay);
-void visualize_convolutional_layer(convolutional_layer layer, char *window);
+#ifdef GPU
+void forward_convolutional_layer_gpu(convolutional_layer layer, network_state state);
+void backward_convolutional_layer_gpu(convolutional_layer layer, network_state state);
+void update_convolutional_layer_gpu(convolutional_layer layer, int batch, float learning_rate, float momentum, float decay);
-void backward_convolutional_layer(convolutional_layer layer, float *delta);
+void push_convolutional_layer(convolutional_layer layer);
+void pull_convolutional_layer(convolutional_layer layer);
-//void backpropagate_convolutional_layer_convolve(image input, convolutional_layer layer);
-//void visualize_convolutional_filters(convolutional_layer layer, char *window);
-//void visualize_convolutional_layer(convolutional_layer layer);
+void bias_output_gpu(float *output, float *biases, int batch, int n, int size);
+void backward_bias_gpu(float *bias_updates, float *delta, int batch, int n, int size);
+#endif
+
+convolutional_layer *make_convolutional_layer(int batch, int h, int w, int c, int n, int size, int stride, int pad, ACTIVATION activation);
+void resize_convolutional_layer(convolutional_layer *layer, int h, int w);
+void forward_convolutional_layer(const convolutional_layer layer, network_state state);
+void update_convolutional_layer(convolutional_layer layer, int batch, float learning_rate, float momentum, float decay);
+image *visualize_convolutional_layer(convolutional_layer layer, char *window, image *prev_filters);
+
+void backward_convolutional_layer(convolutional_layer layer, network_state state);
+
+void bias_output(float *output, float *biases, int batch, int n, int size);
+void backward_bias(float *bias_updates, float *delta, int batch, int n, int size);
image get_convolutional_image(convolutional_layer layer);
image get_convolutional_delta(convolutional_layer layer);
image get_convolutional_filter(convolutional_layer layer, int i);
+int convolutional_out_height(convolutional_layer layer);
+int convolutional_out_width(convolutional_layer layer);
+
#endif
--
Gitblit v1.10.0