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 1afc0cb9ed330d95de68e29743980e9920922beb..eb644c2c6670f5beedbb3ad0b1868bc8a0f9434e 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 b50ed7bdbab52fd7d49b1bd202406930da109ced..ee9cd875cf29884da58dc7f0488e7f9bfc50d4e5 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 6b549b306f0d379d46ed3597c116fbcbfabccbb4..9b485d7794db2cbb538317b0d664d6ece9799a83 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 d135e5a586e7dffd667adc88179a8df830deb245..aa6c05dc59a87f844c19912be484a4b007f0adfc 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 f8ab3f81e9d3d63c2fe460dd359e3a2a54e02b7d..0a331d804545d49eeaffdf0c8054db89041f2c29 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 00fc0dd6633aed5b3dbc08a5170f476ba6d160ef..e1ed7603ed6272ba91cf485d91f512f07b72a258 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 741ca8784bb602c5d8ab855b11d2478b3606c130..afeec9ee1b6fa75961aa76bd2f2c2f6701e200b5 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 043bc8ad36296228624c4b8c1e9f34b8e872f962..196f94b68f94a08f1b08871c805a9d7ceee14ffa 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 6f85c4f381e5d74a0e09acb00587fe8c275f09c5..dc3cab6ac5e114f7083937687c1dfedf0ebd1c44 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 2443541c79991d23f20f93b91eb6773b7e9419df..31b0c99603c3f707328eef5a3713bcd9b882b948 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 0aac2344b3cf2811c990ae90288c966158e53673..38b91785aeec8c061a5d4f6203363645569c2824 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 7133a76c607cbfaa34882106b459e71b9df48edd..c6702b92ab969ec7b1b97c44bc9245c6df41d83a 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 87c67fb72c3df8a1b5f171465f30146f1f8fbab8..f04d712755deadd44158431569430909f19a093e 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 678276eba317862b3e9385badddf04c9e57c2e61..78a2589d9aca59ec72d22aa6fa35f9f934f94caf 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 cb9967831feee363b75a3a1fccc7ec37754dffdd..e81591ad68368033bc9b5223753203ae3126c005 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)