From 055fb215a1f6f4f260b27e947bb81672bbd5c34f Mon Sep 17 00:00:00 2001
From: fengjiayi <fengjiayi@baidu.com>
Date: Wed, 28 Mar 2018 15:32:40 +0800
Subject: [PATCH] remove unnecessary 'force_cpu'

---
 python/paddle/fluid/layers/control_flow.py                 | 6 ++----
 python/paddle/fluid/layers/nn.py                           | 3 +--
 python/paddle/fluid/tests/book/test_machine_translation.py | 2 +-
 python/paddle/fluid/tests/unittests/test_profiler.py       | 3 +--
 4 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/python/paddle/fluid/layers/control_flow.py b/python/paddle/fluid/layers/control_flow.py
index 1bb1aa30ee..af55ef49be 100644
--- a/python/paddle/fluid/layers/control_flow.py
+++ b/python/paddle/fluid/layers/control_flow.py
@@ -1357,8 +1357,7 @@ class DynamicRNN(object):
         self.lod_rank_table = None
         self.max_seq_len = None
         self.step_idx = None
-        self.zero_idx = fill_constant(
-            shape=[1], value=0, dtype='int64', force_cpu=True)
+        self.zero_idx = fill_constant(shape=[1], value=0, dtype='int64')
         self.mem_dict = dict()
         self.output_array = []
         self.outputs = []
@@ -1434,8 +1433,7 @@ class DynamicRNN(object):
     def block(self):
         if self.status != DynamicRNN.BEFORE_RNN:
             raise ValueError("rnn.block() can only be invoke once")
-        self.step_idx = fill_constant(
-            shape=[1], dtype='int64', value=0, force_cpu=True)
+        self.step_idx = fill_constant(shape=[1], dtype='int64', value=0)
         self.step_idx.stop_gradient = False
         self.status = DynamicRNN.IN_RNN
         with self.while_op.block():
diff --git a/python/paddle/fluid/layers/nn.py b/python/paddle/fluid/layers/nn.py
index 2db4e5d27d..e7b0ddf1e3 100644
--- a/python/paddle/fluid/layers/nn.py
+++ b/python/paddle/fluid/layers/nn.py
@@ -3306,8 +3306,7 @@ def autoincreased_step_counter(counter_name=None, begin=1, step=1):
         name=counter_name, dtype='int64', shape=[1], persistable=True)
     if is_new_var:
         helper.set_variable_initializer(
-            counter, initializer=Constant(
-                value=begin - 1, force_cpu=True))
+            counter, initializer=Constant(value=begin - 1))
         helper.main_program.global_block().prepend_op(
             type='increment',
             inputs={'X': [counter]},
diff --git a/python/paddle/fluid/tests/book/test_machine_translation.py b/python/paddle/fluid/tests/book/test_machine_translation.py
index 3a1a0859ec..de72a7c3ff 100644
--- a/python/paddle/fluid/tests/book/test_machine_translation.py
+++ b/python/paddle/fluid/tests/book/test_machine_translation.py
@@ -83,7 +83,7 @@ def decoder_train(context, is_sparse):
 def decoder_decode(context, is_sparse):
     init_state = context
     array_len = pd.fill_constant(shape=[1], dtype='int64', value=max_length)
-    counter = pd.zeros(shape=[1], dtype='int64', force_cpu=True)
+    counter = pd.zeros(shape=[1], dtype='int64')
 
     # fill the first element with init_state
     state_array = pd.create_array('float32')
diff --git a/python/paddle/fluid/tests/unittests/test_profiler.py b/python/paddle/fluid/tests/unittests/test_profiler.py
index cf6fe14a86..49ec9c9020 100644
--- a/python/paddle/fluid/tests/unittests/test_profiler.py
+++ b/python/paddle/fluid/tests/unittests/test_profiler.py
@@ -33,8 +33,7 @@ class TestProfiler(unittest.TestCase):
             image = fluid.layers.data(name='x', shape=[784], dtype='float32')
             hidden1 = fluid.layers.fc(input=image, size=64, act='relu')
             i = layers.zeros(shape=[1], dtype='int64')
-            counter = fluid.layers.zeros(
-                shape=[1], dtype='int64', force_cpu=True)
+            counter = fluid.layers.zeros(shape=[1], dtype='int64')
             until = layers.fill_constant([1], dtype='int64', value=10)
             data_arr = layers.array_write(hidden1, i)
             cond = fluid.layers.less_than(x=counter, y=until)
-- 
GitLab