From a8612adb04cbf2383c1c7a9a23ab1e8b7997130f Mon Sep 17 00:00:00 2001
From: Yancey1989 <yanxu05@baidu.com>
Date: Wed, 26 Dec 2018 17:49:02 +0800
Subject: [PATCH] fix lr scale test=develop

---
 .../test_parallel_executor_seresnext.py       | 30 ++++++++-----------
 1 file changed, 13 insertions(+), 17 deletions(-)

diff --git a/python/paddle/fluid/tests/unittests/test_parallel_executor_seresnext.py b/python/paddle/fluid/tests/unittests/test_parallel_executor_seresnext.py
index 5515ff0bb..9bdaab162 100644
--- a/python/paddle/fluid/tests/unittests/test_parallel_executor_seresnext.py
+++ b/python/paddle/fluid/tests/unittests/test_parallel_executor_seresnext.py
@@ -167,17 +167,13 @@ def cosine_decay(learning_rate, step_each_epoch, epochs=120):
     return decayed_lr
 
 
-def optimizer(learning_rate=0.01, lr_scale=1.0):
-    def _opt():
-        return fluid.optimizer.Momentum(
-            learning_rate=cosine_decay(
-                learning_rate=learning_rate / lr_scale,
-                step_each_epoch=2,
-                epochs=1),
-            momentum=0.9,
-            regularization=fluid.regularizer.L2Decay(1e-4))
-
-    return _opt
+def optimizer(learning_rate=0.01):
+    optimizer = fluid.optimizer.Momentum(
+        learning_rate=cosine_decay(
+            learning_rate=learning_rate, step_each_epoch=2, epochs=1),
+        momentum=0.9,
+        regularization=fluid.regularizer.L2Decay(1e-4))
+    return optimizer
 
 
 class TestResnet(TestParallelExecutorBase):
@@ -220,7 +216,7 @@ class TestResnet(TestParallelExecutorBase):
             batch_size=batch_size,
             use_cuda=use_cuda,
             use_reduce=False,
-            optimizer=optimizer())
+            optimizer=optimizer)
         reduce_first_loss, reduce_last_loss = self.check_network_convergence(
             model,
             feed_dict={"image": img,
@@ -229,7 +225,7 @@ class TestResnet(TestParallelExecutorBase):
             batch_size=batch_size,
             use_cuda=use_cuda,
             use_reduce=True,
-            optimizer=optimizer())
+            optimizer=optimizer)
 
         for loss in zip(all_reduce_first_loss, reduce_first_loss):
             self.assertAlmostEquals(loss[0], loss[1], delta=1e-6)
@@ -247,7 +243,7 @@ class TestResnet(TestParallelExecutorBase):
             batch_size=batch_size,
             use_cuda=use_cuda,
             use_reduce=False,
-            optimizer=optimizer(),
+            optimizer=optimizer,
             enable_sequential_execution=True)
 
         reduce_first_loss_seq, reduce_last_loss_seq = self.check_network_convergence(
@@ -258,7 +254,7 @@ class TestResnet(TestParallelExecutorBase):
             batch_size=batch_size,
             use_cuda=use_cuda,
             use_reduce=True,
-            optimizer=optimizer(),
+            optimizer=optimizer,
             enable_sequential_execution=True)
 
         for loss in zip(all_reduce_first_loss, all_reduce_first_loss_seq):
@@ -301,7 +297,7 @@ class TestResnet(TestParallelExecutorBase):
             batch_size=batch_size,
             use_cuda=use_cuda,
             use_reduce=use_reduce,
-            optimizer=optimizer(),
+            optimizer=optimizer,
             use_parallel_executor=False,
             use_parallel_graph=use_parallel_graph)
         parallel_first_loss, parallel_last_loss = self.check_network_convergence(
@@ -312,7 +308,7 @@ class TestResnet(TestParallelExecutorBase):
             batch_size=batch_size,
             use_cuda=use_cuda,
             use_reduce=use_reduce,
-            optimizer=optimizer(),
+            optimizer=optimizer,
             use_parallel_graph=use_parallel_graph)
 
         self.assertAlmostEquals(
-- 
GitLab