Skip to content

Commit

Permalink
update uts p1 (PaddlePaddle#39210)
Browse files Browse the repository at this point in the history
  • Loading branch information
@yaozhixin
yaozhixin authored Jan 26, 2022
1 parent fd44de5 commit 6efb9f5
Show file tree
Hide file tree
Showing 15 changed files with 43 additions and 42 deletions.
19 changes: 9 additions & 10 deletions python/paddle/fluid/tests/unittests/ipu/ernie_training.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -856,16 +856,15 @@ def get_task_output(self, task, task_labels):
paddle.static.load(main_prog, "model/ernie")

if args.run_on_ipu:
ipu_strategy = compiler.get_ipu_strategy()
ipu_strategy.num_ipus = args.num_ipus
ipu_strategy.enable_manual_shard = args.num_ipus > 1
ipu_strategy.enable_pipelining = args.enable_pipelining
if args.enable_pipelining:
if args.is_training:
ipu_strategy.batches_per_step = args.num_ipus + 1
else:
ipu_strategy.batches_per_step = args.num_ipus
ipu_strategy.is_training = args.is_training
ipu_strategy = paddle.static.IpuStrategy()
ipu_strategy.SetGraphConfig(
num_ipus=args.num_ipus,
is_training=args.is_training,
enable_manual_shard=args.num_ipus > 1)
ipu_strategy.SetPipeliningConfig(
enable_pipelining=args.enable_pipelining,
batches_per_step=args.num_ipus + 1)

ipu_compiler = compiler.IPUCompiledProgram(
main_prog, ipu_strategy=ipu_strategy)
program = ipu_compiler.compile(feed_list, fetch_list)
Expand Down
4 changes: 2 additions & 2 deletions python/paddle/fluid/tests/unittests/ipu/test_activation_x_op.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@ def _test_base(self, run_ipu=True):

if run_ipu:
feed_list = self.feed_list
ipu_strategy = compiler.get_ipu_strategy()
ipu_strategy.is_training = self.is_training
ipu_strategy = paddle.static.IpuStrategy()
ipu_strategy.SetGraphConfig(is_training=self.is_training)
program = compiler.IpuCompiler(
main_prog,
ipu_strategy=ipu_strategy).compile(feed_list, fetch_list)
Expand Down
10 changes: 6 additions & 4 deletions python/paddle/fluid/tests/unittests/ipu/test_avg_shard_ipu.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,10 +81,12 @@ def _test_base(self, run_ipu=True):

if run_ipu:
feed_list = self.feed_list
ipu_strategy = compiler.get_ipu_strategy()
ipu_strategy.is_training = self.is_training
# enable avg shard pass
ipu_strategy.need_avg_shard = True
ipu_strategy = paddle.static.IpuStrategy()
ipu_strategy.SetGraphConfig(
num_ipus=2,
is_training=self.is_training,
enable_manual_shard=True,
need_avg_shard=True)
program = compiler.IPUCompiledProgram(
main_prog,
ipu_strategy=ipu_strategy).compile(feed_list, fetch_list)
Expand Down
4 changes: 2 additions & 2 deletions python/paddle/fluid/tests/unittests/ipu/test_batch_norm_op_ipu.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,8 @@ def _test_base(self, run_ipu=True):

if run_ipu:
feed_list = self.feed_list
ipu_strategy = compiler.get_ipu_strategy()
ipu_strategy.is_training = self.is_training
ipu_strategy = paddle.static.IpuStrategy()
ipu_strategy.SetGraphConfig(is_training=self.is_training)
program = compiler.IPUCompiledProgram(
main_prog,
ipu_strategy=ipu_strategy).compile(feed_list, fetch_list)
Expand Down
4 changes: 2 additions & 2 deletions python/paddle/fluid/tests/unittests/ipu/test_cast_op_ipu.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,8 @@ def _test_base(self, run_ipu=True):

if run_ipu:
feed_list = self.feed_list
ipu_strategy = compiler.get_ipu_strategy()
ipu_strategy.is_training = self.is_training
ipu_strategy = paddle.static.IpuStrategy()
ipu_strategy.SetGraphConfig(is_training=self.is_training)
program = compiler.IPUCompiledProgram(
main_prog,
ipu_strategy=ipu_strategy).compile(feed_list, fetch_list)
Expand Down
4 changes: 2 additions & 2 deletions python/paddle/fluid/tests/unittests/ipu/test_concat_op_ipu.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,8 @@ def _test_base(self, run_ipu=True):

if run_ipu:
feed_list = self.feed_list
ipu_strategy = compiler.get_ipu_strategy()
ipu_strategy.is_training = self.is_training
ipu_strategy = paddle.static.IpuStrategy()
ipu_strategy.SetGraphConfig(is_training=self.is_training)
program = compiler.IPUCompiledProgram(
main_prog,
ipu_strategy=ipu_strategy).compile(feed_list, fetch_list)
Expand Down
4 changes: 2 additions & 2 deletions python/paddle/fluid/tests/unittests/ipu/test_conv_op_ipu.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,8 @@ def _test_base(self, run_ipu=True):

if run_ipu:
feed_list = self.feed_list
ipu_strategy = compiler.get_ipu_strategy()
ipu_strategy.is_training = self.is_training
ipu_strategy = paddle.static.IpuStrategy()
ipu_strategy.SetGraphConfig(is_training=self.is_training)
program = compiler.IPUCompiledProgram(
main_prog,
ipu_strategy=ipu_strategy).compile(feed_list, fetch_list)
Expand Down
4 changes: 2 additions & 2 deletions python/paddle/fluid/tests/unittests/ipu/test_cross_entropy2_op_ipu.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,8 @@ def _test_base(self, run_ipu=True):

if run_ipu:
feed_list = self.feed_list
ipu_strategy = compiler.get_ipu_strategy()
ipu_strategy.is_training = self.is_training
ipu_strategy = paddle.static.IpuStrategy()
ipu_strategy.SetGraphConfig(is_training=self.is_training)
program = compiler.IPUCompiledProgram(
main_prog,
ipu_strategy=ipu_strategy).compile(feed_list, fetch_list)
Expand Down
4 changes: 2 additions & 2 deletions python/paddle/fluid/tests/unittests/ipu/test_dropout_op_ipu.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,8 @@ def _test_base(self, run_ipu=True):

if run_ipu:
feed_list = self.feed_list
ipu_strategy = compiler.get_ipu_strategy()
ipu_strategy.is_training = self.is_training
ipu_strategy = paddle.static.IpuStrategy()
ipu_strategy.SetGraphConfig(is_training=self.is_training)
program = compiler.IPUCompiledProgram(
main_prog,
ipu_strategy=ipu_strategy).compile(feed_list, fetch_list)
Expand Down
4 changes: 2 additions & 2 deletions python/paddle/fluid/tests/unittests/ipu/test_elemetwise_x_op_ipu.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,8 @@ def _test_base(self, run_ipu=True):

if run_ipu:
feed_list = self.feed_list
ipu_strategy = compiler.get_ipu_strategy()
ipu_strategy.is_training = self.is_training
ipu_strategy = paddle.static.IpuStrategy()
ipu_strategy.SetGraphConfig(is_training=self.is_training)
program = compiler.IPUCompiledProgram(
main_prog,
ipu_strategy=ipu_strategy).compile(feed_list, fetch_list)
Expand Down
4 changes: 2 additions & 2 deletions python/paddle/fluid/tests/unittests/ipu/test_equal_op_ipu.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,8 @@ def _test_base(self, run_ipu=True):

if run_ipu:
feed_list = self.feed_list
ipu_strategy = compiler.get_ipu_strategy()
ipu_strategy.is_training = self.is_training
ipu_strategy = paddle.static.IpuStrategy()
ipu_strategy.SetGraphConfig(is_training=self.is_training)
program = compiler.IPUCompiledProgram(
main_prog,
ipu_strategy=ipu_strategy).compile(feed_list, fetch_list)
Expand Down
8 changes: 4 additions & 4 deletions python/paddle/fluid/tests/unittests/ipu/test_expand_op_ipu.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,8 @@ def _test_base(self, run_ipu=True):

if run_ipu:
feed_list = self.feed_list
ipu_strategy = compiler.get_ipu_strategy()
ipu_strategy.is_training = self.is_training
ipu_strategy = paddle.static.IpuStrategy()
ipu_strategy.SetGraphConfig(is_training=self.is_training)
program = compiler.IPUCompiledProgram(
main_prog,
ipu_strategy=ipu_strategy).compile(feed_list, fetch_list)
Expand Down Expand Up @@ -142,8 +142,8 @@ def _test_base(self, run_ipu=True):

if run_ipu:
feed_list = self.feed_list
ipu_strategy = compiler.get_ipu_strategy()
ipu_strategy.is_training = self.is_training
ipu_strategy = paddle.static.IpuStrategy()
ipu_strategy.SetGraphConfig(is_training=self.is_training)
program = compiler.IPUCompiledProgram(
main_prog,
ipu_strategy=ipu_strategy).compile(feed_list, fetch_list)
Expand Down
4 changes: 2 additions & 2 deletions python/paddle/fluid/tests/unittests/ipu/test_fill_constant_op_ipu.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,8 @@ def _test_base(self, run_ipu=True):

if run_ipu:
feed_list = self.feed_list
ipu_strategy = compiler.get_ipu_strategy()
ipu_strategy.is_training = self.is_training
ipu_strategy = paddle.static.IpuStrategy()
ipu_strategy.SetGraphConfig(is_training=self.is_training)
program = compiler.IPUCompiledProgram(
main_prog,
ipu_strategy=ipu_strategy).compile(feed_list, fetch_list)
Expand Down
4 changes: 2 additions & 2 deletions python/paddle/fluid/tests/unittests/ipu/test_gather_op_ipu.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,8 @@ def _test_base(self, run_ipu=True):

if run_ipu:
feed_list = self.feed_list
ipu_strategy = compiler.get_ipu_strategy()
ipu_strategy.is_training = self.is_training
ipu_strategy = paddle.static.IpuStrategy()
ipu_strategy.SetGraphConfig(is_training=self.is_training)
program = compiler.IPUCompiledProgram(
main_prog,
ipu_strategy=ipu_strategy).compile(feed_list, fetch_list)
Expand Down
4 changes: 2 additions & 2 deletions python/paddle/fluid/tests/unittests/ipu/test_gelu_op_ipu.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,8 @@ def _test_base(self, run_ipu=True):

if run_ipu:
feed_list = self.feed_list
ipu_strategy = compiler.get_ipu_strategy()
ipu_strategy.is_training = self.is_training
ipu_strategy = paddle.static.IpuStrategy()
ipu_strategy.SetGraphConfig(is_training=self.is_training)
program = compiler.IPUCompiledProgram(
main_prog,
ipu_strategy=ipu_strategy).compile(feed_list, fetch_list)
Expand Down

0 comments on commit 6efb9f5

Please sign in to comment.