From 11c72b1132feca7c1252ea01d02da4cb497e723f Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Thu, 11 Jun 2015 22:38:58 +0000
Subject: [PATCH] testing on one image
---
src/convolutional_layer.h | 35 +++--------------------------------
1 files changed, 3 insertions(+), 32 deletions(-)
diff --git a/src/convolutional_layer.h b/src/convolutional_layer.h
index 5cf8adc..334759c 100644
--- a/src/convolutional_layer.h
+++ b/src/convolutional_layer.h
@@ -5,38 +5,9 @@
#include "params.h"
#include "image.h"
#include "activations.h"
+#include "layer.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);
@@ -50,7 +21,7 @@
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);
+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);
--
Gitblit v1.10.0