From afb8b4f98bab53e85f2e5a3e7b3d11f0c9207ec7 Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Thu, 23 Jun 2016 04:46:32 +0000
Subject: [PATCH] CVPR prep
---
src/convolutional_layer.h | 67 +++++++++++----------------------
1 files changed, 22 insertions(+), 45 deletions(-)
diff --git a/src/convolutional_layer.h b/src/convolutional_layer.h
index 72f3f72..972b765 100644
--- a/src/convolutional_layer.h
+++ b/src/convolutional_layer.h
@@ -4,64 +4,39 @@
#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;
- int pad;
- 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;
-} convolutional_layer;
+typedef layer convolutional_layer;
#ifdef GPU
-void forward_convolutional_layer_gpu(convolutional_layer layer, float * in);
-void backward_convolutional_layer_gpu(convolutional_layer layer, float * in, float * delta_gpu);
-void update_convolutional_layer_gpu(convolutional_layer layer);
+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 push_convolutional_layer(convolutional_layer layer);
void pull_convolutional_layer(convolutional_layer layer);
-void bias_output_gpu(float *output, float *biases, int batch, int n, int size);
+void add_bias_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);
+#ifdef CUDNN
+void cudnn_convolutional_setup(layer *l);
+#endif
#endif
-convolutional_layer *make_convolutional_layer(int batch, int h, int w, int c, int n, int size, int stride, int pad, ACTIVATION activation, float learning_rate, float momentum, float decay);
-void resize_convolutional_layer(convolutional_layer *layer, int h, int w);
-void forward_convolutional_layer(const convolutional_layer layer, float *in);
-void update_convolutional_layer(convolutional_layer layer);
+convolutional_layer make_convolutional_layer(int batch, int h, int w, int c, int n, int size, int stride, int pad, ACTIVATION activation, int batch_normalization, int binary, int xnor);
+void denormalize_convolutional_layer(convolutional_layer l);
+void resize_convolutional_layer(convolutional_layer *layer, int w, int h);
+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 binarize_filters(float *filters, int n, int size, float *binary);
+void swap_binary(convolutional_layer *l);
+void binarize_filters2(float *filters, int n, int size, char *binary, float *scales);
-void backward_convolutional_layer(convolutional_layer layer, float *in, float *delta);
+void backward_convolutional_layer(convolutional_layer layer, network_state state);
-void bias_output(float *output, float *biases, int batch, int n, int size);
+void add_bias(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);
@@ -70,6 +45,8 @@
int convolutional_out_height(convolutional_layer layer);
int convolutional_out_width(convolutional_layer layer);
+void rescale_filters(convolutional_layer l, float scale, float trans);
+void rgbgr_filters(convolutional_layer l);
#endif
--
Gitblit v1.10.0