Fix unit test bug in test_profiler.py.

python/paddle/v2/fluid/tests/test_profiler.py

@@ -41,7 +41,13 @@ class TestProfiler(unittest.TestCase):
                 exe.run(fluid.default_main_program(), feed={'data': input})
         os.remove(output_file)
 
-    def test_profiler(self):
+    def profiler(self, state):
+        if state == 'GPU' and core.is_compile_gpu():
+            return
+        startup_program = fluid.Program()
+        main_program = fluid.Program()
+
+        with fluid.program_guard(main_program, startup_program):
             image = fluid.layers.data(name='x', shape=[784], dtype='float32')
             hidden1 = fluid.layers.fc(input=image, size=128, act='relu')
             hidden2 = fluid.layers.fc(input=hidden1, size=64, act='relu')
@@ -49,18 +55,16 @@ class TestProfiler(unittest.TestCase):
             label = fluid.layers.data(name='y', shape=[1], dtype='int64')
             cost = fluid.layers.cross_entropy(input=predict, label=label)
             avg_cost = fluid.layers.mean(x=cost)
-        optimizer = fluid.optimizer.Momentum(learning_rate=0.001, momentum=0.9)
-        opts = optimizer.minimize(avg_cost)
             accuracy = fluid.evaluator.Accuracy(input=predict, label=label)
 
-        states = ['CPU', 'GPU'] if core.is_compile_gpu() else ['CPU']
-        for state in states:
+        optimizer = fluid.optimizer.Momentum(learning_rate=0.001, momentum=0.9)
+        opts = optimizer.minimize(avg_cost, startup_program=startup_program)
+
         place = fluid.CPUPlace() if state == 'CPU' else fluid.CUDAPlace(0)
         exe = fluid.Executor(place)
-            exe.run(fluid.default_startup_program())
+        exe.run(startup_program)
 
         accuracy.reset(exe)
-
         with profiler.profiler(state, 'total') as prof:
             for iter in range(10):
                 if iter == 2:
@@ -68,13 +72,19 @@ class TestProfiler(unittest.TestCase):
                 x = np.random.random((32, 784)).astype("float32")
                 y = np.random.randint(0, 10, (32, 1)).astype("int64")
 
-                    outs = exe.run(fluid.default_main_program(),
+                outs = exe.run(main_program,
                                feed={'x': x,
                                      'y': y},
                                fetch_list=[avg_cost] + accuracy.metrics)
                 acc = np.array(outs[1])
                 pass_acc = accuracy.eval(exe)
 
+    def not_test_cpu_profiler(self):
+        self.profiler('CPU')
+
+    def not_test_cuda_profiler(self):
+        self.profiler('GPU')
+
 
 if __name__ == '__main__':
     unittest.main()