提交 7526ac14 编写于 作者: X Xin Pan

add comments

test=develop
上级 cb1891f9
...@@ -34,6 +34,10 @@ class CompiledProgram(object): ...@@ -34,6 +34,10 @@ class CompiledProgram(object):
""" """
Compiles a Program for execution. Compiles a Program for execution.
1. Users first create the program with layers.
2. Optionally, users use CompiledProgram to optimize the program before run.
3. The original program or CompiledProgram is run by executor.
The CompiledProgram is used to transform a program for various The CompiledProgram is used to transform a program for various
optimizations, for example. optimizations, for example.
* Pre-compute some logic once so that each run is faster. * Pre-compute some logic once so that each run is faster.
...@@ -42,11 +46,19 @@ class CompiledProgram(object): ...@@ -42,11 +46,19 @@ class CompiledProgram(object):
training. training.
Example: Example:
.. code-block:: python
place = fluid.CUDAPlace(0) if use_cuda else fluid.CPUPlace()
exe = fluid.Executor(place)
exe.run(startup)
compiled_prog = compiler.CompiledProgram(main).with_data_parallel(
loss_name=loss.name)
for i in range(5):
test_loss, = exe.run(compiled_prog,
feed=feed_dict,
fetch_list=[loss.name])
Args: Args:
program: Program instance that contains the model logic. program: Program instance that contains the model logic.
""" """
def __init__(self, program): def __init__(self, program):
...@@ -57,11 +69,32 @@ class CompiledProgram(object): ...@@ -57,11 +69,32 @@ class CompiledProgram(object):
self._compiled = False self._compiled = False
self._is_data_parallel = False self._is_data_parallel = False
def _with_data_parallel(self, def with_data_parallel(self,
loss_name=None, loss_name=None,
build_strategy=None, build_strategy=None,
exec_strategy=None, exec_strategy=None,
share_vars_from=None): share_vars_from=None):
"""Configs the program to run in data parallel way.
Args:
loss_name (str): The loss name must set in training. Default None.
build_strategy(BuildStrategy): build_strategy is used to
build the graph so it can run on multiple devices/cores with
optimized topology.
For more information, please refer to fluid.BuildStrategy.
Default None.
exec_strategy(ExecutionStrategy): exec_strategy is used to
to select the a way to execute the graph, for example how many
threads are used, how many iterations to clean up the temp
variables. For more information, please refer
to fluid.ExecutionStrategy. Default None.
share_vars_from(CompiledProgram): If provide, this CompiledProgram
will share variables from `share_vars_from`. `share_vars_from`
must be run by the executor before this CompiledProgram so that
vars are ready.
Returns:
self
"""
assert not self._is_data_parallel, "Already compiled with parallel." assert not self._is_data_parallel, "Already compiled with parallel."
self._is_data_parallel = True self._is_data_parallel = True
self._build_strategy = build_strategy self._build_strategy = build_strategy
...@@ -145,6 +178,16 @@ class CompiledProgram(object): ...@@ -145,6 +178,16 @@ class CompiledProgram(object):
self._exec_strategy, self._build_strategy) self._exec_strategy, self._build_strategy)
def _compile(self, scope, place): def _compile(self, scope, place):
"""Compile the program based on the configs.
Args:
scope: The variables (resources) that are associated with
this compiled program.
place: The location that the compiled program will be run on.
Returns:
self
"""
if self._compiled: if self._compiled:
if scope and self._scope != scope: if scope and self._scope != scope:
raise ValueError("Cannot compile with different scope") raise ValueError("Cannot compile with different scope")
......
...@@ -81,7 +81,7 @@ class TestParallelExecutorBase(unittest.TestCase): ...@@ -81,7 +81,7 @@ class TestParallelExecutorBase(unittest.TestCase):
if use_cuda and core.is_compiled_with_cuda(): if use_cuda and core.is_compiled_with_cuda():
build_strategy.remove_unnecessary_lock = True build_strategy.remove_unnecessary_lock = True
if use_parallel_executor: if use_parallel_executor:
binary = compiler.CompiledProgram(main)._with_data_parallel( binary = compiler.CompiledProgram(main).with_data_parallel(
loss_name=loss.name, loss_name=loss.name,
build_strategy=build_strategy, build_strategy=build_strategy,
exec_strategy=exec_strategy) exec_strategy=exec_strategy)
......
...@@ -132,7 +132,7 @@ class TestDistRunnerBase(object): ...@@ -132,7 +132,7 @@ class TestDistRunnerBase(object):
build_stra.num_trainers = 1 build_stra.num_trainers = 1
build_stra.trainer_id = 0 build_stra.trainer_id = 0
binary = compiler.CompiledProgram(trainer_prog)._with_data_parallel( binary = compiler.CompiledProgram(trainer_prog).with_data_parallel(
loss_name=avg_cost.name, loss_name=avg_cost.name,
build_strategy=build_stra, build_strategy=build_stra,
exec_strategy=strategy) exec_strategy=strategy)
......
...@@ -62,13 +62,12 @@ class ParallelExecutorTestingDuringTraining(unittest.TestCase): ...@@ -62,13 +62,12 @@ class ParallelExecutorTestingDuringTraining(unittest.TestCase):
exe.run(startup) exe.run(startup)
feed_dict = {'image': image, 'label': label} feed_dict = {'image': image, 'label': label}
train_cp = compiler.CompiledProgram(main)._with_data_parallel( train_cp = compiler.CompiledProgram(main).with_data_parallel(
loss_name=loss.name, build_strategy=build_strategy) loss_name=loss.name, build_strategy=build_strategy)
test_cp = compiler.CompiledProgram( test_cp = compiler.CompiledProgram(test_program).with_data_parallel(
test_program)._with_data_parallel( loss_name=loss.name,
loss_name=loss.name, build_strategy=build_strategy,
build_strategy=build_strategy, share_vars_from=train_cp)
share_vars_from=train_cp)
for i in range(5): for i in range(5):
exe.run(train_cp, feed=feed_dict, fetch_list=[loss.name]) exe.run(train_cp, feed=feed_dict, fetch_list=[loss.name])
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册