Skip to content
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

Jump to bottom

Fix attribute naming for momentum_op #5453

Merged
merged 7 commits into from
Nov 9, 2017
Merged

Fix attribute naming for momentum_op #5453

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1fe5fb3
Fix attribute naming for momentum_op
sidgoyal78 Nov 8, 2017
d6fa568
Fix minor typo in comment
sidgoyal78 Nov 8, 2017
4b9cf9b
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…
sidgoyal78 Nov 8, 2017
25da8cc
Fix attribute name
sidgoyal78 Nov 8, 2017
927eca4
Fix names in test_optimizer
sidgoyal78 Nov 9, 2017
1d245ca
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…
sidgoyal78 Nov 9, 2017
1882660
Fix python wrapper
sidgoyal78 Nov 9, 2017
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
2 changes: 1 addition & 1 deletion paddle/operators/momentum_op.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ class MomentumOpMaker : public framework::OpProtoAndCheckerMaker {
AddOutput("VelocityOut", "(Tensor) Output updated velocity");

AddAttr<float>("mu", "(float) Momentum coefficient");
AddAttr<bool>("useNesterov",
AddAttr<bool>("use_nesterov",
"(bool, default false) "
"Use Nesterov Momentum")
.SetDefault(false);
Expand Down
2 changes: 1 addition & 1 deletion paddle/operators/momentum_op.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ class MomentumOpKernel : public framework::OpKernel<T> {
velocity_out->mutable_data<T>(ctx.GetPlace());

float mu = ctx.Attr<float>("mu");
bool use_nesterov = ctx.Attr<bool>("useNesterov");
bool use_nesterov = ctx.Attr<bool>("use_nesterov");

auto p_out = framework::EigenVector<T>::Flatten(*param_out);
auto v_out = framework::EigenVector<T>::Flatten(*velocity_out);
Expand Down
2 changes: 1 addition & 1 deletion python/paddle/v2/framework/optimizer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,7 @@ def _append_optimize_op(self, block, param_and_grad):
"VelocityOut": velocity_acc
},
attrs={"mu": self._momentum,
"useNesterov": self._use_nesterov})
"use_nesterov": self._use_nesterov})

return momentum_op

Expand Down
4 changes: 2 additions & 2 deletions python/paddle/v2/framework/tests/test_momentum_op.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ def test_check_output(self):


class TestMomentumOp2(OpTest):
'''Test Momentum with defaukt values for attributes
'''Test Momentum with default values for attributes
'''

def setUp(self):
Expand All @@ -57,7 +57,7 @@ def setUp(self):
'LearningRate': learning_rate
}

self.attrs = {'mu': mu, 'useNesterov': use_nesterov}
self.attrs = {'mu': mu, 'use_nesterov': use_nesterov}

velocity_out = mu * velocity + grad
if use_nesterov:
Expand Down
4 changes: 2 additions & 2 deletions python/paddle/v2/framework/tests/test_optimizer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ def test_vanilla_momentum_optimizer(self):
self.assertEqual(len(opts), 1)
sgd_op = opts[0]
self.assertEqual(sgd_op.type, "momentum")
self.assertFalse(sgd_op.attr('useNesterov'))
self.assertFalse(sgd_op.attr('use_nesterov'))

# Check accumulators
accumulators = momentum_optimizer.get_accumulators()
Expand Down Expand Up @@ -143,7 +143,7 @@ def test_nesterov_momentum_optimizer(self):
self.assertEqual(len(opts), 1)
sgd_op = opts[0]
self.assertEqual(sgd_op.type, "momentum")
self.assertTrue(sgd_op.attr('useNesterov'))
self.assertTrue(sgd_op.attr('use_nesterov'))

# Check accumulators
accumulators = momentum_optimizer.get_accumulators()
Expand Down