From 0c2cf402aff1b6eef47e8bdfae77472589c42e0c Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Fri, 09 May 2014 22:35:58 +0000
Subject: [PATCH] Some small fixes for frame

---
 src/activations.h |   29 ++++++++++++++++++++---------
 1 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/src/activations.h b/src/activations.h
index 294cf28..e47914c 100644
--- a/src/activations.h
+++ b/src/activations.h
@@ -1,10 +1,21 @@
-typedef enum{
-    SIGMOID, RELU, IDENTITY
-}ACTIVATOR_TYPE;
+#include "opencl.h"
+#ifndef ACTIVATIONS_H
+#define ACTIVATIONS_H
 
-double relu_activation(double x);
-double relu_gradient(double x);
-double sigmoid_activation(double x);
-double sigmoid_gradient(double x);
-double identity_activation(double x);
-double identity_gradient(double x);
+typedef enum{
+    SIGMOID, RELU, LINEAR, RAMP, TANH
+}ACTIVATION;
+
+ACTIVATION get_activation(char *s);
+
+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