From 0f645836f193e75c4c3b718369e6fab15b5d19c5 Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Wed, 11 Feb 2015 03:41:03 +0000
Subject: [PATCH] Detection is back, baby\!
---
src/convolutional_layer.h | 32 +++++++++++++++++++++-----------
1 files changed, 21 insertions(+), 11 deletions(-)
diff --git a/src/convolutional_layer.h b/src/convolutional_layer.h
index c805aa2..72f3f72 100644
--- a/src/convolutional_layer.h
+++ b/src/convolutional_layer.h
@@ -1,7 +1,7 @@
#ifndef CONVOLUTIONAL_LAYER_H
#define CONVOLUTIONAL_LAYER_H
-#include "opencl.h"
+#include "cuda.h"
#include "image.h"
#include "activations.h"
@@ -27,39 +27,49 @@
float *output;
#ifdef GPU
- cl_mem filters_cl;
- cl_mem filter_updates_cl;
+ float * filters_gpu;
+ float * filter_updates_gpu;
- cl_mem biases_cl;
- cl_mem bias_updates_cl;
+ float * biases_gpu;
+ float * bias_updates_gpu;
- cl_mem col_image_cl;
- cl_mem delta_cl;
- cl_mem output_cl;
+ float * col_image_gpu;
+ float * delta_gpu;
+ float * output_gpu;
#endif
ACTIVATION activation;
} convolutional_layer;
#ifdef GPU
-void forward_convolutional_layer_gpu(convolutional_layer layer, cl_mem in);
-void backward_convolutional_layer_gpu(convolutional_layer layer, cl_mem in, cl_mem delta_cl);
+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 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 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, float learning_rate, float momentum, float decay);
-void resize_convolutional_layer(convolutional_layer *layer, int h, int w, int c);
+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);
image *visualize_convolutional_layer(convolutional_layer layer, char *window, image *prev_filters);
void backward_convolutional_layer(convolutional_layer layer, float *in, float *delta);
+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