From 83d0d8533328cf3797b3fa532b032608a9a2a4d5 Mon Sep 17 00:00:00 2001 From: yaozhixin <522190855@qq.com> Date: Wed, 26 Jan 2022 17:04:11 +0800 Subject: [PATCH] update uts p2 (#39232) --- .../tests/unittests/ipu/test_groupnorm_op_ipu.py | 4 ++-- .../tests/unittests/ipu/test_instancenorm_op_ipu.py | 4 ++-- .../unittests/ipu/test_ipu_batchs_per_step_simple.py | 11 ++++++++--- .../tests/unittests/ipu/test_ipu_fp16_support.py | 6 +++--- .../unittests/ipu/test_ipu_inference_model_io.py | 9 +++++---- .../tests/unittests/ipu/test_ipu_model_pipeline.py | 8 +++----- .../fluid/tests/unittests/ipu/test_ipu_strategy.py | 9 ++++----- .../tests/unittests/ipu/test_layernorm_op_ipu.py | 4 ++-- .../tests/unittests/ipu/test_log_softmax_op_ipu.py | 4 ++-- .../tests/unittests/ipu/test_lookuptable_op_ipu.py | 4 ++-- .../fluid/tests/unittests/ipu/test_lr_sheduelr.py | 4 ++-- .../fluid/tests/unittests/ipu/test_matmul_op_ipu.py | 4 ++-- .../fluid/tests/unittests/ipu/test_mean_op_ipu.py | 4 ++-- .../fluid/tests/unittests/ipu/test_mul_op_ipu.py | 4 ++-- .../fluid/tests/unittests/ipu/test_pool_avg_op_ipu.py | 4 ++-- 15 files changed, 43 insertions(+), 40 deletions(-) diff --git a/python/paddle/fluid/tests/unittests/ipu/test_groupnorm_op_ipu.py b/python/paddle/fluid/tests/unittests/ipu/test_groupnorm_op_ipu.py index 1afc0cb9ed3..eb644c2c667 100644 --- a/python/paddle/fluid/tests/unittests/ipu/test_groupnorm_op_ipu.py +++ b/python/paddle/fluid/tests/unittests/ipu/test_groupnorm_op_ipu.py @@ -101,8 +101,8 @@ class TestBase(IPUOpTest): 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) diff --git a/python/paddle/fluid/tests/unittests/ipu/test_instancenorm_op_ipu.py b/python/paddle/fluid/tests/unittests/ipu/test_instancenorm_op_ipu.py index b50ed7bdbab..ee9cd875cf2 100644 --- a/python/paddle/fluid/tests/unittests/ipu/test_instancenorm_op_ipu.py +++ b/python/paddle/fluid/tests/unittests/ipu/test_instancenorm_op_ipu.py @@ -97,8 +97,8 @@ class TestBase(IPUOpTest): 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) diff --git a/python/paddle/fluid/tests/unittests/ipu/test_ipu_batchs_per_step_simple.py b/python/paddle/fluid/tests/unittests/ipu/test_ipu_batchs_per_step_simple.py index 6b549b306f0..9b485d7794d 100644 --- a/python/paddle/fluid/tests/unittests/ipu/test_ipu_batchs_per_step_simple.py +++ b/python/paddle/fluid/tests/unittests/ipu/test_ipu_batchs_per_step_simple.py @@ -62,9 +62,14 @@ class TestFunc(unittest.TestCase): if run_ipu: feed_list = [image.name] fetch_list = [out.name] - ipu_strategy = compiler.get_ipu_strategy() - ipu_strategy.is_training = False - ipu_strategy.batches_per_step = bps + ipu_strategy = paddle.static.IpuStrategy() + ipu_strategy.SetGraphConfig( + num_ipus=2, + is_training=False, + enable_manual_shard=True, + need_avg_shard=True) + ipu_strategy.SetPipeliningConfig( + enable_pipelinin=True, batches_per_step=bps) program = compiler.IPUCompiledProgram( main_prog, ipu_strategy=ipu_strategy).compile(feed_list, fetch_list) diff --git a/python/paddle/fluid/tests/unittests/ipu/test_ipu_fp16_support.py b/python/paddle/fluid/tests/unittests/ipu/test_ipu_fp16_support.py index d135e5a586e..aa6c05dc59a 100644 --- a/python/paddle/fluid/tests/unittests/ipu/test_ipu_fp16_support.py +++ b/python/paddle/fluid/tests/unittests/ipu/test_ipu_fp16_support.py @@ -83,9 +83,9 @@ class TestBase(IPUOpTest): feed = self.feed_ipu if run_ipu else self.feed_cpu if run_ipu: feed_list = self.feed_list - ipu_strategy = compiler.get_ipu_strategy() - ipu_strategy.is_training = False - ipu_strategy.enable_fp16 = True + ipu_strategy = paddle.static.IpuStrategy() + ipu_strategy.SetGraphConfig(is_training=False) + ipu_strategy.SetHalfConfig(enable_fp16=True) program = compiler.IPUCompiledProgram( main_prog, ipu_strategy=ipu_strategy).compile(feed_list, fetch_list) diff --git a/python/paddle/fluid/tests/unittests/ipu/test_ipu_inference_model_io.py b/python/paddle/fluid/tests/unittests/ipu/test_ipu_inference_model_io.py index f8ab3f81e9d..0a331d80454 100644 --- a/python/paddle/fluid/tests/unittests/ipu/test_ipu_inference_model_io.py +++ b/python/paddle/fluid/tests/unittests/ipu/test_ipu_inference_model_io.py @@ -94,8 +94,9 @@ class TestBase(IPUOpTest): exe = paddle.static.Executor(place) exe.run(startup_prog) - ipu_strategy = compiler.get_ipu_strategy() - ipu_strategy.is_training = self.attrs['is_training'] + ipu_strategy = paddle.static.IpuStrategy() + ipu_strategy.SetGraphConfig( + is_training=self.attrs['is_training']) program = compiler.IPUCompiledProgram( main_prog, ipu_strategy=ipu_strategy).compile( self.feed_list, fetch_list) @@ -123,8 +124,8 @@ class TestBase(IPUOpTest): if run_ipu: feed_list = feed_target_names fetch_list = [fetch_targets[0].name] - ipu_strategy = compiler.get_ipu_strategy() - ipu_strategy.is_training = False + ipu_strategy = paddle.static.IpuStrategy() + ipu_strategy.SetGraphConfig(is_training=False) program = compiler.IPUCompiledProgram( inference_program, ipu_strategy=ipu_strategy).compile(feed_list, fetch_list) diff --git a/python/paddle/fluid/tests/unittests/ipu/test_ipu_model_pipeline.py b/python/paddle/fluid/tests/unittests/ipu/test_ipu_model_pipeline.py index 00fc0dd6633..e1ed7603ed6 100644 --- a/python/paddle/fluid/tests/unittests/ipu/test_ipu_model_pipeline.py +++ b/python/paddle/fluid/tests/unittests/ipu/test_ipu_model_pipeline.py @@ -59,11 +59,9 @@ class TestCastNet(unittest.TestCase): if run_ipu: feed_list = [image.name] fetch_list = [loss.name] - ipu_strategy = compiler.get_ipu_strategy() - ipu_strategy.num_ipus = 2 - ipu_strategy.is_training = False - ipu_strategy.enable_manual_shard = True - ipu_strategy.enable_pipelining = False + ipu_strategy = paddle.static.IpuStrategy() + ipu_strategy.SetGraphConfig( + num_ipus=2, is_training=False, enable_manual_shard=True) program = compiler.IPUCompiledProgram( main_prog, ipu_strategy=ipu_strategy).compile(feed_list, fetch_list) diff --git a/python/paddle/fluid/tests/unittests/ipu/test_ipu_strategy.py b/python/paddle/fluid/tests/unittests/ipu/test_ipu_strategy.py index 741ca8784bb..afeec9ee1b6 100644 --- a/python/paddle/fluid/tests/unittests/ipu/test_ipu_strategy.py +++ b/python/paddle/fluid/tests/unittests/ipu/test_ipu_strategy.py @@ -29,7 +29,7 @@ SEED = 2021 "core is not compiled with IPU") class TestConvNet(unittest.TestCase): def test_training(self): - ipu_strategy = compiler.get_ipu_strategy() + ipu_strategy = paddle.static.IpuStrategy() assert ipu_strategy.num_ipus == 1, "Default num_ipus must be 1" assert ipu_strategy.is_training == True, "Default is_training is True" @@ -38,17 +38,16 @@ class TestConvNet(unittest.TestCase): assert ipu_strategy.enable_manual_shard == False, \ "Default enable_manual_shard is False" - ipu_strategy.num_ipus = 2 + ipu_strategy.SetGraphConfig( + num_ipus=2, is_training=False, enable_manual_shard=True) + ipu_strategy.SetPipeliningConfig(enable_pipelining=True) assert ipu_strategy.num_ipus == 2, "Set num_ipus Failed" - ipu_strategy.is_training = False assert ipu_strategy.is_training == False, "Set is_training Failed" - ipu_strategy.enable_pipelining = True assert ipu_strategy.enable_pipelining == True, \ "Set enable_pipelining Failed" - ipu_strategy.enable_manual_shard = True assert ipu_strategy.enable_manual_shard == True, \ "Set enable_manual_shard Failed" diff --git a/python/paddle/fluid/tests/unittests/ipu/test_layernorm_op_ipu.py b/python/paddle/fluid/tests/unittests/ipu/test_layernorm_op_ipu.py index 043bc8ad362..196f94b68f9 100644 --- a/python/paddle/fluid/tests/unittests/ipu/test_layernorm_op_ipu.py +++ b/python/paddle/fluid/tests/unittests/ipu/test_layernorm_op_ipu.py @@ -104,8 +104,8 @@ class TestBase(IPUOpTest): 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) diff --git a/python/paddle/fluid/tests/unittests/ipu/test_log_softmax_op_ipu.py b/python/paddle/fluid/tests/unittests/ipu/test_log_softmax_op_ipu.py index 6f85c4f381e..dc3cab6ac5e 100644 --- a/python/paddle/fluid/tests/unittests/ipu/test_log_softmax_op_ipu.py +++ b/python/paddle/fluid/tests/unittests/ipu/test_log_softmax_op_ipu.py @@ -79,8 +79,8 @@ class TestBase(IPUOpTest): 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) diff --git a/python/paddle/fluid/tests/unittests/ipu/test_lookuptable_op_ipu.py b/python/paddle/fluid/tests/unittests/ipu/test_lookuptable_op_ipu.py index 2443541c799..31b0c99603c 100644 --- a/python/paddle/fluid/tests/unittests/ipu/test_lookuptable_op_ipu.py +++ b/python/paddle/fluid/tests/unittests/ipu/test_lookuptable_op_ipu.py @@ -96,8 +96,8 @@ class TestBase(IPUOpTest): 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) diff --git a/python/paddle/fluid/tests/unittests/ipu/test_lr_sheduelr.py b/python/paddle/fluid/tests/unittests/ipu/test_lr_sheduelr.py index 0aac2344b3c..38b91785aee 100644 --- a/python/paddle/fluid/tests/unittests/ipu/test_lr_sheduelr.py +++ b/python/paddle/fluid/tests/unittests/ipu/test_lr_sheduelr.py @@ -70,8 +70,8 @@ class TestConvNet(unittest.TestCase): if run_ipu: feed_list = [image.name] fetch_list = [loss.name] - ipu_strategy = compiler.get_ipu_strategy() - ipu_strategy.is_training = True + ipu_strategy = paddle.static.IpuStrategy() + ipu_strategy.SetGraphConfig(is_training=True) program = compiler.IPUCompiledProgram( main_prog, ipu_strategy=ipu_strategy).compile(feed_list, fetch_list) diff --git a/python/paddle/fluid/tests/unittests/ipu/test_matmul_op_ipu.py b/python/paddle/fluid/tests/unittests/ipu/test_matmul_op_ipu.py index 7133a76c607..c6702b92ab9 100644 --- a/python/paddle/fluid/tests/unittests/ipu/test_matmul_op_ipu.py +++ b/python/paddle/fluid/tests/unittests/ipu/test_matmul_op_ipu.py @@ -87,8 +87,8 @@ class TestBase(IPUOpTest): 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) diff --git a/python/paddle/fluid/tests/unittests/ipu/test_mean_op_ipu.py b/python/paddle/fluid/tests/unittests/ipu/test_mean_op_ipu.py index 87c67fb72c3..f04d712755d 100644 --- a/python/paddle/fluid/tests/unittests/ipu/test_mean_op_ipu.py +++ b/python/paddle/fluid/tests/unittests/ipu/test_mean_op_ipu.py @@ -76,8 +76,8 @@ class TestBase(IPUOpTest): 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) diff --git a/python/paddle/fluid/tests/unittests/ipu/test_mul_op_ipu.py b/python/paddle/fluid/tests/unittests/ipu/test_mul_op_ipu.py index 678276eba31..78a2589d9ac 100644 --- a/python/paddle/fluid/tests/unittests/ipu/test_mul_op_ipu.py +++ b/python/paddle/fluid/tests/unittests/ipu/test_mul_op_ipu.py @@ -86,8 +86,8 @@ class TestBase(IPUOpTest): 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) diff --git a/python/paddle/fluid/tests/unittests/ipu/test_pool_avg_op_ipu.py b/python/paddle/fluid/tests/unittests/ipu/test_pool_avg_op_ipu.py index cb9967831fe..e81591ad683 100644 --- a/python/paddle/fluid/tests/unittests/ipu/test_pool_avg_op_ipu.py +++ b/python/paddle/fluid/tests/unittests/ipu/test_pool_avg_op_ipu.py @@ -87,8 +87,8 @@ class TestBase(IPUOpTest): 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) -- GitLab