From 076009ebe308fde0156304e701f36e8bb04e4d6b Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Thu, 17 Jul 2014 17:14:59 +0000
Subject: [PATCH] Fixed batch stuff in conv layer
---
src/activations.h | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/src/activations.h b/src/activations.h
index 15d96d3..e47914c 100644
--- a/src/activations.h
+++ b/src/activations.h
@@ -1,14 +1,21 @@
+#include "opencl.h"
#ifndef ACTIVATIONS_H
#define ACTIVATIONS_H
typedef enum{
- SIGMOID, RELU, IDENTITY, RAMP
+ SIGMOID, RELU, LINEAR, RAMP, TANH
}ACTIVATION;
ACTIVATION get_activation(char *s);
-double activate(double x, ACTIVATION a);
-double gradient(double x, ACTIVATION a);
+char *get_activation_string(ACTIVATION a);
+float activate(float x, ACTIVATION a, float dropout);
+float gradient(float x, ACTIVATION a);
+void gradient_array(const float *x, const int n, const ACTIVATION a, float *delta);
+void activate_array(float *x, const int n, const ACTIVATION a, float dropout);
+#ifdef GPU
+void activate_array_ongpu(cl_mem x, int n, ACTIVATION a, float dropout);
+#endif
#endif
--
Gitblit v1.10.0