Skip to content

added support for ELU activation units with Caffe #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
beniz merged 1 commit into from
Jan 3, 2016
Merged

added support for ELU activation units with Caffe #34

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 26 additions & 0 deletions src/caffelib.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,7 @@ namespace dd
{
std::vector<int> layers = {50};
std::string activation = "ReLU";
double elu_alpha = 1.0;
double dropout = 0.5;
if (ad.has("layers"))
layers = ad.get("layers").get<std::vector<int>>();
Expand All @@ -170,6 +171,12 @@ namespace dd
activation = "ReLU";
else if (dd_utils::iequals(activation,"prelu"))
activation = "PReLU";
else if (dd_utils::iequals(activation,"elu"))
{
activation = "ELU";
if (ad.has("elu_alpha"))
elu_alpha = ad.get("elu_alpha").get<double>();
}
else if (dd_utils::iequals(activation,"sigmoid"))
activation = "Sigmoid";
else if (dd_utils::iequals(activation,"tanh"))
Expand Down Expand Up @@ -308,6 +315,8 @@ namespace dd
else lparam = net_param.add_layer();
lparam->set_name("act"+std::to_string(l));
lparam->set_type(activation);
if (activation == "ELU" && elu_alpha != 1.0)
lparam->mutable_elu_param()->set_alpha(elu_alpha);
lparam->add_bottom(last_ip);
lparam->add_top(last_ip);
++rl;
Expand All @@ -325,6 +334,8 @@ namespace dd
else dlparam = deploy_net_param.add_layer();
dlparam->set_name("act"+std::to_string(l));
dlparam->set_type(activation);
if (activation == "ELU" && elu_alpha != 1.0)
lparam->mutable_elu_param()->set_alpha(elu_alpha);
dlparam->add_bottom(last_ip);
dlparam->add_top(last_ip);
++drl;
Expand Down Expand Up @@ -478,6 +489,7 @@ namespace dd
//- get relevant configuration elements
std::vector<std::string> layers;
std::string activation = "ReLU";
double elu_alpha = 1.0;
double dropout = 0.5;
if (ad.has("layers"))
try
Expand All @@ -495,6 +507,12 @@ namespace dd
activation = "ReLU";
else if (dd_utils::iequals(activation,"prelu"))
activation = "PReLU";
else if (dd_utils::iequals(activation,"elu"))
{
activation = "ELU";
if (ad.has("elu_alpha"))
elu_alpha = ad.get("elu_alpha").get<double>();
}
else if (dd_utils::iequals(activation,"sigmoid"))
activation = "Sigmoid";
else if (dd_utils::iequals(activation,"tanh"))
Expand Down Expand Up @@ -680,6 +698,8 @@ namespace dd
else lparam = net_param.add_layer();
lparam->set_name("act"+std::to_string(ccount));
lparam->set_type(activation);
if (activation == "ELU" && elu_alpha != 1.0)
lparam->mutable_elu_param()->set_alpha(elu_alpha);
lparam->add_bottom("conv"+std::to_string(ccount));
lparam->add_top("conv"+std::to_string(ccount));
++rl;
Expand All @@ -697,6 +717,8 @@ namespace dd
else dlparam = deploy_net_param.add_layer();
dlparam->set_name("act"+std::to_string(ccount));
dlparam->set_type(activation);
if (activation == "ELU" && elu_alpha != 1.0)
lparam->mutable_elu_param()->set_alpha(elu_alpha);
dlparam->add_bottom("conv"+std::to_string(ccount));
dlparam->add_top("conv"+std::to_string(ccount));
++drl;
Expand Down Expand Up @@ -817,6 +839,8 @@ namespace dd
else lparam = net_param.add_layer();
lparam->set_name("act"+std::to_string(cact));
lparam->set_type(activation);
if (activation == "ELU" && elu_alpha != 1.0)
lparam->mutable_elu_param()->set_alpha(elu_alpha);
lparam->add_bottom(last_ip);
lparam->add_top(last_ip);
++rl;
Expand All @@ -833,6 +857,8 @@ namespace dd
else dlparam = deploy_net_param.add_layer();
dlparam->set_name("act"+std::to_string(cact));
dlparam->set_type(activation);
if (activation == "ELU" && elu_alpha != 1.0)
lparam->mutable_elu_param()->set_alpha(elu_alpha);
dlparam->add_bottom(last_ip);
dlparam->add_top(last_ip);
++drl;
Expand Down