Skip to content

Commit 4b073c9

Browse files
committed
fix compiler
test=develop
1 parent ac0e0f5 commit 4b073c9

File tree

3 files changed

+4
-5
lines changed

3 files changed

+4
-5
lines changed

paddle/fluid/API.spec

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -526,7 +526,6 @@ paddle.reader.buffered (ArgSpec(args=['reader', 'size'], varargs=None, keywords=
526526
paddle.reader.compose (ArgSpec(args=[], varargs='readers', keywords='kwargs', defaults=None), ('document', '884291104e1c3f37f33aae44b7deeb0d'))
527527
paddle.reader.chain (ArgSpec(args=[], varargs='readers', keywords=None, defaults=None), ('document', 'd22c34e379a53901ae67a6bca7f4def4'))
528528
paddle.reader.shuffle (ArgSpec(args=['reader', 'buf_size'], varargs=None, keywords=None, defaults=None), ('document', 'e42ea6fee23ce26b23cb142cd1d6522d'))
529-
paddle.reader.ComposeNotAligned.__init__
530529
paddle.reader.firstn (ArgSpec(args=['reader', 'n'], varargs=None, keywords=None, defaults=None), ('document', 'c5bb8f7dd4f917f1569a368aab5b8aad'))
531530
paddle.reader.xmap_readers (ArgSpec(args=['mapper', 'reader', 'process_num', 'buffer_size', 'order'], varargs=None, keywords=None, defaults=(False,)), ('document', '283bc0b8a0e26ae186b8b9bee4aec560'))
532531
paddle.reader.PipeReader.__init__ (ArgSpec(args=['self', 'command', 'bufsize', 'file_type'], varargs=None, keywords=None, defaults=(8192, 'plain')), ('document', '6adf97f83acf6453d4a6a4b1070f3754'))

python/paddle/fluid/compiler.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -149,8 +149,7 @@ def with_data_parallel(self,
149149
self._places = [_place_obj(p) for p in places]
150150
else:
151151
self._places = None
152-
self._build_strategy.is_distribution = framework.is_pserver_mode(
153-
self._program)
152+
self._build_strategy.is_distribution = _is_pserver_mode(self._program)
154153
return self
155154

156155
def with_inference_optimize(self, config):
@@ -191,7 +190,7 @@ def _compile_data_parallel(self, use_cuda=False, scope=None):
191190
assert scope is not None, ""
192191
self._local_scopes = []
193192

194-
self._exec_strategy.use_cuda = isinstance(self._place, core.CUDAPlace)
193+
self._exec_strategy.use_cuda = use_cuda
195194
has_set_place = (self._places is not None)
196195
if has_set_place:
197196
desire_place = _place_obj(self._place)

python/paddle/fluid/parallel_executor.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,8 @@ def __init__(self,
9999
build_strategy.num_trainers = num_trainers
100100
build_strategy.trainer_id = trainer_id
101101

102-
self._places = compiler.get_available_places(use_cuda)
102+
self._places = framework.cuda_places(
103+
) if use_cuda else framework.cpu_places()
103104
self._scope = scope if scope is not None else executor.global_scope()
104105

105106
main_program = main_program if main_program is not None \

0 commit comments

Comments
 (0)