From bf2f1599f9e227263d74a8e1060b5395d8d9ea64 Mon Sep 17 00:00:00 2001 From: tangwei12 Date: Mon, 20 Aug 2018 10:32:49 +0800 Subject: [PATCH] code clean --- .../paddle/fluid/tests/unittests/test_dist_transpiler.py | 9 --------- python/paddle/fluid/transpiler/distribute_transpiler.py | 3 +-- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/python/paddle/fluid/tests/unittests/test_dist_transpiler.py b/python/paddle/fluid/tests/unittests/test_dist_transpiler.py index 8af6574434f..1889ddad1fa 100644 --- a/python/paddle/fluid/tests/unittests/test_dist_transpiler.py +++ b/python/paddle/fluid/tests/unittests/test_dist_transpiler.py @@ -47,7 +47,6 @@ class TranspilerTest(unittest.TestCase): avg_cost = fluid.layers.mean(cost) sgd_optimizer = fluid.optimizer.SGD(learning_rate=0.1) sgd_optimizer.minimize(avg_cost) - return def get_main_program(self): main = fluid.Program() @@ -250,7 +249,6 @@ class TestLRDecay(TranspilerTest): decay_rate=0.1, staircase=True)) sgd_optimizer.minimize(avg_cost) - return def transpiler_test_impl(self): pserver, startup = self.get_pserver(self.pserver1_ep) @@ -280,7 +278,6 @@ class TestLRDecayConditional(TranspilerTest): learning_rate=fluid.layers.piecewise_decay([10000, 20000], [1.0, 0.5, 1.0])) sgd_optimizer.minimize(avg_cost) - return def transpiler_test_impl(self): pserver, startup = self.get_pserver(self.pserver1_ep) @@ -329,7 +326,6 @@ class TestL2Decay(TranspilerTest): avg_cost = fluid.layers.mean(cost) sgd_optimizer = fluid.optimizer.SGD(learning_rate=0.1) sgd_optimizer.minimize(avg_cost) - return def transpiler_test_impl(self): pserver, startup = self.get_pserver(self.pserver1_ep) @@ -364,7 +360,6 @@ class TestL2DecayWithPiecewise(TranspilerTest): momentum=0.9, regularization=fluid.regularizer.L2Decay(1e-4)) sgd_optimizer.minimize(avg_cost) - return def transpiler_test_impl(self): pserver, startup = self.get_pserver(self.pserver1_ep) @@ -589,8 +584,6 @@ class TestDistArgsInProgram(TestDistLookupTableBase): self.network_with_table(is_sparse=True, is_distributed=True) def transpiler_test_impl(self): - config = fluid.DistributeTranspilerConfig() - trainer, _ = self.get_trainer() self.assertTrue(trainer._is_distributed) @@ -614,7 +607,6 @@ class TestRMSPropOptimizer(TranspilerTest): avg_cost = fluid.layers.mean(cost) optimizer = fluid.optimizer.RMSProp(learning_rate=0.1) optimizer.minimize(avg_cost) - return def transpiler_test_impl(self): pserver, startup = self.get_pserver(self.pserver1_ep) @@ -644,7 +636,6 @@ class TestLoadSliceVar(TranspilerTest): avg_cost = fluid.layers.mean(cost) optimizer = fluid.optimizer.RMSProp(learning_rate=0.1) optimizer.minimize(avg_cost) - return def transpiler_test_impl(self): pserver, _ = self.get_pserver(self.pserver1_ep) diff --git a/python/paddle/fluid/transpiler/distribute_transpiler.py b/python/paddle/fluid/transpiler/distribute_transpiler.py index 0836532e431..4856442ac76 100644 --- a/python/paddle/fluid/transpiler/distribute_transpiler.py +++ b/python/paddle/fluid/transpiler/distribute_transpiler.py @@ -704,8 +704,7 @@ class DistributeTranspiler(object): attrs=op.all_attrs()) # add slice vars - slice_vars_and_atts = self._get_slice_vars_and_atts(endpoint) - s_prog._slice_vars_and_atts = slice_vars_and_atts + s_prog._slice_vars_and_atts = self._get_slice_vars_and_atts(endpoint) return s_prog -- GitLab