From 7add11150954879dae4daad4e4da549b4b13bca6 Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Sat, 09 Aug 2014 15:16:37 +0000
Subject: [PATCH] maxpool fixed, good on mnist
---
src/activations.h | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/src/activations.h b/src/activations.h
index 09584cc..8c4287e 100644
--- a/src/activations.h
+++ b/src/activations.h
@@ -1,17 +1,21 @@
+#include "opencl.h"
#ifndef ACTIVATIONS_H
#define ACTIVATIONS_H
typedef enum{
- SIGMOID, RELU, IDENTITY
+ SIGMOID, RELU, LINEAR, RAMP, TANH
}ACTIVATION;
ACTIVATION get_activation(char *s);
-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);
+
+char *get_activation_string(ACTIVATION a);
+float activate(float x, ACTIVATION a);
+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);
+#ifdef GPU
+void activate_array_ongpu(cl_mem x, int n, ACTIVATION a);
+#endif
#endif
--
Gitblit v1.10.0