From a392bbd0c957a00e3782c96e7ced84a29ff9dd88 Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Tue, 15 Mar 2016 05:33:02 +0000
Subject: [PATCH] Play along w/ alphago
---
src/convolutional_layer.h | 46 ++++++++++------------------------------------
1 files changed, 10 insertions(+), 36 deletions(-)
diff --git a/src/convolutional_layer.h b/src/convolutional_layer.h
index 5cf8adc..7c39181 100644
--- a/src/convolutional_layer.h
+++ b/src/convolutional_layer.h
@@ -2,41 +2,12 @@
#define CONVOLUTIONAL_LAYER_H
#include "cuda.h"
-#include "params.h"
#include "image.h"
#include "activations.h"
+#include "layer.h"
+#include "network.h"
-typedef struct {
- 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, network_state state);
@@ -46,19 +17,20 @@
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);
#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);
+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);
+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 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);
@@ -67,6 +39,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