From d0b9326a352ed2fbc3ae66fdef40b4533a2f211d Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Tue, 11 Aug 2015 06:22:27 +0000
Subject: [PATCH] Hacks to get nightmare to not break gridsizing
---
src/activations.c | 35 ++++++++++++++++++++++++++++-------
1 files changed, 28 insertions(+), 7 deletions(-)
diff --git a/src/activations.c b/src/activations.c
index 4689046..d31b1e4 100644
--- a/src/activations.c
+++ b/src/activations.c
@@ -8,16 +8,22 @@
char *get_activation_string(ACTIVATION a)
{
switch(a){
- case SIGMOID:
- return "sigmoid";
+ case LOGISTIC:
+ return "logistic";
case RELU:
return "relu";
+ case RELIE:
+ return "relie";
case RAMP:
return "ramp";
case LINEAR:
return "linear";
case TANH:
return "tanh";
+ case PLSE:
+ return "plse";
+ case LEAKY:
+ return "leaky";
default:
break;
}
@@ -26,10 +32,13 @@
ACTIVATION get_activation(char *s)
{
- if (strcmp(s, "sigmoid")==0) return SIGMOID;
+ if (strcmp(s, "logistic")==0) return LOGISTIC;
if (strcmp(s, "relu")==0) return RELU;
+ if (strcmp(s, "relie")==0) return RELIE;
+ if (strcmp(s, "plse")==0) return PLSE;
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;
fprintf(stderr, "Couldn't find activation function %s, going with ReLU\n", s);
return RELU;
@@ -40,14 +49,20 @@
switch(a){
case LINEAR:
return linear_activate(x);
- case SIGMOID:
- return sigmoid_activate(x);
+ case LOGISTIC:
+ return logistic_activate(x);
case RELU:
return relu_activate(x);
+ case RELIE:
+ return relie_activate(x);
case RAMP:
return ramp_activate(x);
+ case LEAKY:
+ return leaky_activate(x);
case TANH:
return tanh_activate(x);
+ case PLSE:
+ return plse_activate(x);
}
return 0;
}
@@ -65,14 +80,20 @@
switch(a){
case LINEAR:
return linear_gradient(x);
- case SIGMOID:
- return sigmoid_gradient(x);
+ case LOGISTIC:
+ return logistic_gradient(x);
case RELU:
return relu_gradient(x);
+ case RELIE:
+ return relie_gradient(x);
case RAMP:
return ramp_gradient(x);
+ case LEAKY:
+ return leaky_gradient(x);
case TANH:
return tanh_gradient(x);
+ case PLSE:
+ return plse_gradient(x);
}
return 0;
}
--
Gitblit v1.10.0