Skip to content

Issue with the exp layer when the base is e #3937

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
jeffdonahue merged 1 commit into from
Apr 8, 2016
Merged

Issue with the exp layer when the base is e #3937

Show file tree
Hide file tree
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
3 changes: 2 additions & 1 deletion src/caffe/layers/exp_layer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ void ExpLayer<Dtype>::LayerSetUp(const vector<Blob<Dtype>*>& bottom,
const Dtype input_scale = this->layer_param_.exp_param().scale();
const Dtype input_shift = this->layer_param_.exp_param().shift();
inner_scale_ = log_base * input_scale;
outer_scale_ = (input_shift == Dtype(0)) ? Dtype(1) : pow(base, input_shift);
outer_scale_ = (input_shift == Dtype(0)) ? Dtype(1) :
( (base != Dtype(-1)) ? pow(base, input_shift) : exp(input_shift) );
}

template <typename Dtype>
Expand Down
20 changes: 20 additions & 0 deletions src/caffe/test/test_neuron_layer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,6 +394,26 @@ TYPED_TEST(NeuronLayerTest, TestExpGradient) {
this->TestExpGradient(kBase, kScale, kShift);
}

TYPED_TEST(NeuronLayerTest, TestExpLayerWithShift) {
typedef typename TypeParam::Dtype Dtype;
// Test default base of "-1" -- should actually set base := e,
// with a non-zero shift
const Dtype kBase = -1;
const Dtype kScale = 1;
const Dtype kShift = 1;
this->TestExpForward(kBase, kScale, kShift);
}

TYPED_TEST(NeuronLayerTest, TestExpGradientWithShift) {
typedef typename TypeParam::Dtype Dtype;
// Test default base of "-1" -- should actually set base := e,
// with a non-zero shift
const Dtype kBase = -1;
const Dtype kScale = 1;
const Dtype kShift = 1;
this->TestExpGradient(kBase, kScale, kShift);
}

TYPED_TEST(NeuronLayerTest, TestExpLayerBase2) {
typedef typename TypeParam::Dtype Dtype;
const Dtype kBase = 2;
Expand Down