From cd8a3dcb4ca42f22ad8f46a95e00977c92be6bbd Mon Sep 17 00:00:00 2001
From: AlexeyAB <alexeyab84@gmail.com>
Date: Thu, 08 Feb 2018 23:22:42 +0000
Subject: [PATCH] Compile fixes
---
src/activations.c | 140 +++++++++++++++++++++++++---------------------
1 files changed, 76 insertions(+), 64 deletions(-)
diff --git a/src/activations.c b/src/activations.c
index 4674a02..0cbb2f5 100644
--- a/src/activations.c
+++ b/src/activations.c
@@ -8,16 +8,32 @@
char *get_activation_string(ACTIVATION a)
{
switch(a){
- case SIGMOID:
- return "sigmoid";
+ case LOGISTIC:
+ return "logistic";
+ case LOGGY:
+ return "loggy";
case RELU:
return "relu";
+ case ELU:
+ return "elu";
+ case RELIE:
+ return "relie";
case RAMP:
return "ramp";
case LINEAR:
return "linear";
case TANH:
return "tanh";
+ case PLSE:
+ return "plse";
+ case LEAKY:
+ return "leaky";
+ case STAIR:
+ return "stair";
+ case HARDTAN:
+ return "hardtan";
+ case LHTAN:
+ return "lhtan";
default:
break;
}
@@ -26,60 +42,93 @@
ACTIVATION get_activation(char *s)
{
- if (strcmp(s, "sigmoid")==0) return SIGMOID;
+ if (strcmp(s, "logistic")==0) return LOGISTIC;
+ if (strcmp(s, "loggy")==0) return LOGGY;
if (strcmp(s, "relu")==0) return RELU;
+ if (strcmp(s, "elu")==0) return ELU;
+ if (strcmp(s, "relie")==0) return RELIE;
+ if (strcmp(s, "plse")==0) return PLSE;
+ if (strcmp(s, "hardtan")==0) return HARDTAN;
+ if (strcmp(s, "lhtan")==0) return LHTAN;
if (strcmp(s, "linear")==0) return LINEAR;
if (strcmp(s, "ramp")==0) return RAMP;
+ if (strcmp(s, "leaky")==0) return LEAKY;
if (strcmp(s, "tanh")==0) return TANH;
+ if (strcmp(s, "stair")==0) return STAIR;
fprintf(stderr, "Couldn't find activation function %s, going with ReLU\n", s);
return RELU;
}
-float linear_activate(float x){return x;}
-float sigmoid_activate(float x){return 1./(1. + exp(-x));}
-float relu_activate(float x){return x*(x>0);}
-float ramp_activate(float x){return x*(x>0)+.1*x;}
-float tanh_activate(float x){return (exp(2*x)-1)/(exp(2*x)+1);}
-
-float activate(float x, ACTIVATION a, float dropout)
+float activate(float x, ACTIVATION a)
{
- if((float)rand()/RAND_MAX < dropout) return 0;
switch(a){
case LINEAR:
- return linear_activate(x)/(1-dropout);
- case SIGMOID:
- return sigmoid_activate(x)/(1-dropout);
+ return linear_activate(x);
+ case LOGISTIC:
+ return logistic_activate(x);
+ case LOGGY:
+ return loggy_activate(x);
case RELU:
- return relu_activate(x)/(1-dropout);
+ return relu_activate(x);
+ case ELU:
+ return elu_activate(x);
+ case RELIE:
+ return relie_activate(x);
case RAMP:
- return ramp_activate(x)/(1-dropout);
+ return ramp_activate(x);
+ case LEAKY:
+ return leaky_activate(x);
case TANH:
- return tanh_activate(x)/(1-dropout);
+ return tanh_activate(x);
+ case PLSE:
+ return plse_activate(x);
+ case STAIR:
+ return stair_activate(x);
+ case HARDTAN:
+ return hardtan_activate(x);
+ case LHTAN:
+ return lhtan_activate(x);
}
return 0;
}
-void activate_array(float *x, const int n, const ACTIVATION a, float dropout)
+void activate_array(float *x, const int n, const ACTIVATION a)
{
int i;
for(i = 0; i < n; ++i){
- x[i] = activate(x[i], a, dropout);
+ x[i] = activate(x[i], a);
}
}
-
-float gradient(float x, ACTIVATION a){
+float gradient(float x, ACTIVATION a)
+{
switch(a){
case LINEAR:
- return 1;
- case SIGMOID:
- return (1.-x)*x;
+ return linear_gradient(x);
+ case LOGISTIC:
+ return logistic_gradient(x);
+ case LOGGY:
+ return loggy_gradient(x);
case RELU:
- return (x>0);
+ return relu_gradient(x);
+ case ELU:
+ return elu_gradient(x);
+ case RELIE:
+ return relie_gradient(x);
case RAMP:
- return (x>0) + .1;
+ return ramp_gradient(x);
+ case LEAKY:
+ return leaky_gradient(x);
case TANH:
- return 1-x*x;
+ return tanh_gradient(x);
+ case PLSE:
+ return plse_gradient(x);
+ case STAIR:
+ return stair_gradient(x);
+ case HARDTAN:
+ return hardtan_gradient(x);
+ case LHTAN:
+ return lhtan_gradient(x);
}
return 0;
}
@@ -92,40 +141,3 @@
}
}
-#ifdef GPU
-
-#include "opencl.h"
-#include <math.h>
-
-cl_kernel get_activation_kernel()
-{
- static int init = 0;
- static cl_kernel kernel;
- if(!init){
- kernel = get_kernel("src/activations.cl", "activate_array", 0);
- init = 1;
- }
- return kernel;
-}
-
-
-void activate_array_ongpu(cl_mem x, int n, ACTIVATION a, float dropout)
-{
- cl_setup();
- cl_kernel kernel = get_activation_kernel();
- cl_command_queue queue = cl.queue;
-
- cl_uint i = 0;
- cl.error = clSetKernelArg(kernel, i++, sizeof(x), (void*) &x);
- cl.error = clSetKernelArg(kernel, i++, sizeof(n), (void*) &n);
- cl.error = clSetKernelArg(kernel, i++, sizeof(a), (void*) &a);
- cl.error = clSetKernelArg(kernel, i++, sizeof(dropout),
- (void*) &dropout);
- check_error(cl);
-
- size_t gsize = n;
-
- clEnqueueNDRangeKernel(queue, kernel, 1, 0, &gsize, 0, 0, 0, 0);
- check_error(cl);
-}
-#endif
--
Gitblit v1.10.0