From 1d31a0e10c1ba59e17857b7360cc71bdcd9842d1 Mon Sep 17 00:00:00 2001 From: Xin Pan Date: Mon, 21 Jan 2019 22:07:48 +0800 Subject: [PATCH] resolve conflicts test=develop --- python/paddle/fluid/executor.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/python/paddle/fluid/executor.py b/python/paddle/fluid/executor.py index f6bee559eaf..d3ff14a1795 100644 --- a/python/paddle/fluid/executor.py +++ b/python/paddle/fluid/executor.py @@ -534,7 +534,7 @@ class Executor(object): fetch_var_name=fetch_var_name, return_numpy=return_numpy) elif program._is_inference: - return self._run_inference(program, feed) + return self._run_inference(program._executor, feed) else: # TODO(panyx0718): Can compile program to optimize executor # performance. @@ -594,5 +594,5 @@ class Executor(object): outs = as_numpy(outs) return outs - def _run_inference(self, program, feed): - return self.executor.run(feed) + def _run_inference(self, exe, feed): + return exe.run(feed) -- GitLab