From 5ba91c38708b5af6e227c0742426b805d39bfafe Mon Sep 17 00:00:00 2001
From: Edmond Yoo <hj3yoo@uwaterloo.ca>
Date: Sat, 15 Sep 2018 00:29:08 +0000
Subject: [PATCH] temp
---
src/activations.c | 42 +++++++++++++++++++++++++++++++++++++++---
1 files changed, 39 insertions(+), 3 deletions(-)
diff --git a/src/activations.c b/src/activations.c
index 5a62ef5..eab4e23 100644
--- a/src/activations.c
+++ b/src/activations.c
@@ -10,6 +10,8 @@
switch(a){
case LOGISTIC:
return "logistic";
+ case LOGGY:
+ return "loggy";
case RELU:
return "relu";
case ELU:
@@ -26,6 +28,12 @@
return "plse";
case LEAKY:
return "leaky";
+ case STAIR:
+ return "stair";
+ case HARDTAN:
+ return "hardtan";
+ case LHTAN:
+ return "lhtan";
default:
break;
}
@@ -35,14 +43,18 @@
ACTIVATION get_activation(char *s)
{
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;
}
@@ -54,6 +66,8 @@
return linear_activate(x);
case LOGISTIC:
return logistic_activate(x);
+ case LOGGY:
+ return loggy_activate(x);
case RELU:
return relu_activate(x);
case ELU:
@@ -68,6 +82,12 @@
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;
}
@@ -75,8 +95,16 @@
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);
+ if (a == LINEAR) {}
+ else if (a == LEAKY) {
+ for (i = 0; i < n; ++i) {
+ x[i] = leaky_activate(x[i]);
+ }
+ }
+ else {
+ for (i = 0; i < n; ++i) {
+ x[i] = activate(x[i], a);
+ }
}
}
@@ -87,6 +115,8 @@
return linear_gradient(x);
case LOGISTIC:
return logistic_gradient(x);
+ case LOGGY:
+ return loggy_gradient(x);
case RELU:
return relu_gradient(x);
case ELU:
@@ -101,6 +131,12 @@
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;
}
@@ -111,5 +147,5 @@
for(i = 0; i < n; ++i){
delta[i] *= gradient(x[i], a);
}
-}
+}
--
Gitblit v1.10.0