[Test Mv] ipu_test (#52143)

* [Test Mv] ipu_test

* [Test Mv] cmake add py_test_modules

* [Move Test] rm py_test_modules

* rm asp

python/paddle/fluid/tests/unittests/CMakeLists.txt

@@ -856,10 +856,6 @@ if(WITH_MKLDNN)
   add_subdirectory(mkldnn)
 endif()
 
-if(WITH_IPU)
-  add_subdirectory(ipu)
-endif()
-
 add_subdirectory(ir)
 
 add_subdirectory(standalone_executor)

test/CMakeLists.txt

@@ -70,7 +70,9 @@ if(WITH_TESTING)
   # add_subdirectory(dygraph_to_static)
   # add_subdirectory(fft)
   # add_subdirectory(fleet)
-  # add_subdirectory(ipu)
+  if(WITH_IPU)
+    add_subdirectory(ipu)
+  endif()
   # add_subdirectory(ir)
   add_subdirectory(legacy_test)
   # add_subdirectory(mkldnn)

python/paddle/fluid/tests/unittests/ipu/distributed/test_dist_data_parallel_ipu.py → test/ipu/distributed/test_dist_data_parallel_ipu.py

@@ -21,7 +21,8 @@ import numpy as np
 
 import paddle
 import paddle.static
-from paddle.fluid.tests.unittests.ipu.op_test_ipu import IPUOpTest
+
+from ..op_test_ipu import IPUOpTest
 
 mpi_comm = None
 

python/paddle/fluid/tests/unittests/ipu/distributed/test_dist_pod128_sample.py → test/ipu/distributed/test_dist_pod128_sample.py

@@ -20,7 +20,7 @@ ipu \
 --nproc_per_host=1 \
 --ipu_partition=pod128 \
 --vipu_server=lr17-1-ctrl \
-python/paddle/fluid/tests/unittests/ipu/disabled/test_dist_pod128_ipu.py
+test/ipu/disabled/test_dist_pod128_ipu.py
 Equal to:
 poprun \
 --host=localhost,host2 \
@@ -31,7 +31,7 @@ poprun \
 --vipu-partition=pod128_bert \
 --vipu-server-host=lr17-1-ctrl \
 --update-partition=yes \
-python3.7 python/paddle/fluid/tests/unittests/ipu/disabled/test_dist_pod128_ipu.py
+python3.7 test/ipu/disabled/test_dist_pod128_ipu.py
 '''
 
 import os

python/paddle/fluid/tests/unittests/ipu/distributed/test_dist_sample.py → test/ipu/distributed/test_dist_sample.py

@@ -21,7 +21,7 @@ ipu \
 --ipus_per_replica=1 \
 --ipu_partition=pod64 \
 --vipu_server=10.137.96.62 \
-python/paddle/fluid/tests/unittests/ipu/distributed/test_dist_sample.py
+test/ipu/distributed/test_dist_sample.py
 Equal to:
 poprun \
 --host=localhost \
@@ -29,7 +29,7 @@ poprun \
 --num-replicas=4 \
 --ipus-per-replica=1 \
 --print-topology=yes \
-python3.7 python/paddle/fluid/tests/unittests/ipu/distributed/test_dist_sample.py
+python3.7 test/ipu/distributed/test_dist_sample.py
 '''
 '''
 Multi hosts:
@@ -41,7 +41,7 @@ ipu \
 --ipus_per_replica=1 \
 --ipu_partition=pod64 \
 --vipu_server=10.137.96.62 \
-python/paddle/fluid/tests/unittests/ipu/distributed/test_dist_sample.py
+test/ipu/distributed/test_dist_sample.py
 Equal to:
 poprun \
 --host=host1,host2 \
@@ -49,7 +49,7 @@ poprun \
 --num-replicas=4 \
 --ipus-per-replica=1 \
 --print-topology=yes \
-python3.7 python/paddle/fluid/tests/unittests/ipu/distributed/test_dist_sample.py
+python3.7 test/ipu/distributed/test_dist_sample.py
 '''
 
 import os

python/paddle/fluid/tests/unittests/ipu/test_activation_ops_ipu.py → test/ipu/test_activation_ops_ipu.py

@@ -15,11 +15,11 @@
 import unittest
 
 import numpy as np
+from op_test_ipu import IPUOpTest
 
 import paddle
 import paddle.nn.functional as F
 import paddle.static
-from paddle.fluid.tests.unittests.ipu.op_test_ipu import IPUOpTest
 
 
 class TestBase(IPUOpTest):

python/paddle/fluid/tests/unittests/ipu/test_arg_max_op_ipu.py → test/ipu/test_arg_max_op_ipu.py

@@ -15,10 +15,10 @@
 import unittest
 
 import numpy as np
+from op_test_ipu import IPUOpTest
 
 import paddle
 import paddle.static
-from paddle.fluid.tests.unittests.ipu.op_test_ipu import IPUOpTest
 
 
 class TestBase(IPUOpTest):

python/paddle/fluid/tests/unittests/ipu/test_arg_min_op_ipu.py → test/ipu/test_arg_min_op_ipu.py

@@ -15,10 +15,10 @@
 import unittest
 
 import numpy as np
+from op_test_ipu import IPUOpTest
 
 import paddle
 import paddle.static
-from paddle.fluid.tests.unittests.ipu.op_test_ipu import IPUOpTest
 
 
 class TestBase(IPUOpTest):

python/paddle/fluid/tests/unittests/ipu/test_argsort_op_ipu.py → test/ipu/test_argsort_op_ipu.py

@@ -15,10 +15,10 @@
 import unittest
 
 import numpy as np
+from op_test_ipu import IPUOpTest
 
 import paddle
 import paddle.static
-from paddle.fluid.tests.unittests.ipu.op_test_ipu import IPUOpTest
 
 
 class TestBase(IPUOpTest):

python/paddle/fluid/tests/unittests/ipu/test_assign_op_ipu.py → test/ipu/test_assign_op_ipu.py

@@ -15,10 +15,10 @@
 import unittest
 
 import numpy as np
+from op_test_ipu import IPUOpTest
 
 import paddle
 import paddle.static
-from paddle.fluid.tests.unittests.ipu.op_test_ipu import IPUOpTest
 
 
 class TestBase(IPUOpTest):

python/paddle/fluid/tests/unittests/ipu/test_avg_shard_ipu.py → test/ipu/test_avg_shard_ipu.py

@@ -15,10 +15,10 @@
 import unittest
 
 import numpy as np
+from op_test_ipu import IPUOpTest
 
 import paddle
 import paddle.static
-from paddle.fluid.tests.unittests.ipu.op_test_ipu import IPUOpTest
 
 
 class TestBase(IPUOpTest):

python/paddle/fluid/tests/unittests/ipu/test_batch_norm_op_ipu.py → test/ipu/test_batch_norm_op_ipu.py

@@ -15,10 +15,10 @@
 import unittest
 
 import numpy as np
+from op_test_ipu import IPUOpTest
 
 import paddle
 import paddle.static
-from paddle.fluid.tests.unittests.ipu.op_test_ipu import IPUOpTest
 
 
 class TestBase(IPUOpTest):

python/paddle/fluid/tests/unittests/ipu/test_binary_cross_entropy_op_ipu.py → test/ipu/test_binary_cross_entropy_op_ipu.py

@@ -15,11 +15,11 @@
 import unittest
 
 import numpy as np
+from op_test_ipu import IPUOpTest
 
 import paddle
 import paddle.nn.functional as F
 import paddle.static
-from paddle.fluid.tests.unittests.ipu.op_test_ipu import IPUOpTest
 
 
 class TestBase(IPUOpTest):

python/paddle/fluid/tests/unittests/ipu/test_bmm_op_ipu.py → test/ipu/test_bmm_op_ipu.py

@@ -15,10 +15,10 @@
 import unittest
 
 import numpy as np
+from op_test_ipu import IPUOpTest
 
 import paddle
 import paddle.static
-from paddle.fluid.tests.unittests.ipu.op_test_ipu import IPUOpTest
 
 
 class TestBase(IPUOpTest):

python/paddle/fluid/tests/unittests/ipu/test_cast_op_ipu.py → test/ipu/test_cast_op_ipu.py

@@ -15,10 +15,10 @@
 import unittest
 
 import numpy as np
+from op_test_ipu import IPUOpTest
 
 import paddle
 import paddle.static
-from paddle.fluid.tests.unittests.ipu.op_test_ipu import IPUOpTest
 
 
 class TestBase(IPUOpTest):

python/paddle/fluid/tests/unittests/ipu/test_clip_op_ipu.py → test/ipu/test_clip_op_ipu.py

@@ -15,10 +15,10 @@
 import unittest
 
 import numpy as np
+from op_test_ipu import IPUOpTest
 
 import paddle
 import paddle.static
-from paddle.fluid.tests.unittests.ipu.op_test_ipu import IPUOpTest
 
 
 class TestBase(IPUOpTest):

python/paddle/fluid/tests/unittests/ipu/test_concat_op_ipu.py → test/ipu/test_concat_op_ipu.py

@@ -15,10 +15,10 @@
 import unittest
 
 import numpy as np
+from op_test_ipu import IPUOpTest
 
 import paddle
 import paddle.static
-from paddle.fluid.tests.unittests.ipu.op_test_ipu import IPUOpTest
 
 
 class TestBase(IPUOpTest):

python/paddle/fluid/tests/unittests/ipu/test_conv_op_ipu.py → test/ipu/test_conv_op_ipu.py

@@ -15,10 +15,10 @@
 import unittest
 
 import numpy as np
+from op_test_ipu import IPUOpTest
 
 import paddle
 import paddle.static
-from paddle.fluid.tests.unittests.ipu.op_test_ipu import IPUOpTest
 
 
 class TestBase(IPUOpTest):

python/paddle/fluid/tests/unittests/ipu/test_cross_entropy2_op_ipu.py → test/ipu/test_cross_entropy2_op_ipu.py

@@ -15,10 +15,10 @@
 import unittest
 
 import numpy as np
+from op_test_ipu import IPUOpTest
 
 import paddle
 import paddle.static
-from paddle.fluid.tests.unittests.ipu.op_test_ipu import IPUOpTest
 
 
 class TestBase(IPUOpTest):

python/paddle/fluid/tests/unittests/ipu/test_cumsum_op_ipu.py → test/ipu/test_cumsum_op_ipu.py

@@ -15,10 +15,10 @@
 import unittest
 
 import numpy as np
+from op_test_ipu import IPUOpTest
 
 import paddle
 import paddle.static
-from paddle.fluid.tests.unittests.ipu.op_test_ipu import IPUOpTest
 
 
 class TestBase(IPUOpTest):

python/paddle/fluid/tests/unittests/ipu/test_data_norm_op_ipu.py → test/ipu/test_data_norm_op_ipu.py

@@ -15,10 +15,10 @@
 import unittest
 
 import numpy as np
+from op_test_ipu import IPUOpTest
 
 import paddle
 import paddle.static
-from paddle.fluid.tests.unittests.ipu.op_test_ipu import IPUOpTest
 
 
 class TestBase(IPUOpTest):

python/paddle/fluid/tests/unittests/ipu/test_dot_op_ipu.py → test/ipu/test_dot_op_ipu.py

@@ -15,10 +15,10 @@
 import unittest
 
 import numpy as np
+from op_test_ipu import IPUOpTest
 
 import paddle
 import paddle.static
-from paddle.fluid.tests.unittests.ipu.op_test_ipu import IPUOpTest
 
 
 class TestBase(IPUOpTest):

python/paddle/fluid/tests/unittests/ipu/test_dropout_op_ipu.py → test/ipu/test_dropout_op_ipu.py

@@ -15,10 +15,10 @@
 import unittest
 
 import numpy as np
+from op_test_ipu import IPUOpTest
 
 import paddle
 import paddle.static
-from paddle.fluid.tests.unittests.ipu.op_test_ipu import IPUOpTest
 
 
 class TestBase(IPUOpTest):

python/paddle/fluid/tests/unittests/ipu/test_dy2static_fp16_ipu.py → test/ipu/test_dy2static_fp16_ipu.py

@@ -16,9 +16,9 @@ import tempfile
 import unittest
 
 import numpy as np
+from op_test_ipu import IPUD2STest
 
 import paddle
-from paddle.fluid.tests.unittests.ipu.op_test_ipu import IPUD2STest
 
 
 class SimpleLayer(paddle.nn.Layer):

python/paddle/fluid/tests/unittests/ipu/test_dy2static_ipu.py → test/ipu/test_dy2static_ipu.py

@@ -17,9 +17,9 @@ import unittest
 from functools import partial
 
 import numpy as np
+from op_test_ipu import IPUD2STest
 
 import paddle
-from paddle.fluid.tests.unittests.ipu.op_test_ipu import IPUD2STest
 from paddle.jit import to_static
 from paddle.jit.dy2static.program_translator import ProgramCache
 from paddle.optimizer.lr import LRScheduler

python/paddle/fluid/tests/unittests/ipu/test_elemetwise_x_op_ipu.py → test/ipu/test_elemetwise_x_op_ipu.py

@@ -15,10 +15,10 @@
 import unittest
 
 import numpy as np
+from op_test_ipu import IPUOpTest
 
 import paddle
 import paddle.static
-from paddle.fluid.tests.unittests.ipu.op_test_ipu import IPUOpTest
 
 
 class TestMul(IPUOpTest):

python/paddle/fluid/tests/unittests/ipu/test_equal_op_ipu.py → test/ipu/test_equal_op_ipu.py

@@ -15,10 +15,10 @@
 import unittest
 
 import numpy as np
+from op_test_ipu import IPUOpTest
 
 import paddle
 import paddle.static
-from paddle.fluid.tests.unittests.ipu.op_test_ipu import IPUOpTest
 
 
 class TestBase(IPUOpTest):

python/paddle/fluid/tests/unittests/ipu/test_eval_model_ipu.py → test/ipu/test_eval_model_ipu.py

@@ -15,10 +15,10 @@
 import unittest
 
 import numpy as np
+from op_test_ipu import IPUOpTest
 
 import paddle
 import paddle.static
-from paddle.fluid.tests.unittests.ipu.op_test_ipu import IPUOpTest
 
 
 class TestBase(IPUOpTest):

python/paddle/fluid/tests/unittests/ipu/test_expand_as_v2_op_ipu.py → test/ipu/test_expand_as_v2_op_ipu.py

@@ -15,10 +15,10 @@
 import unittest
 
 import numpy as np
+from op_test_ipu import IPUOpTest
 
 import paddle
 import paddle.static
-from paddle.fluid.tests.unittests.ipu.op_test_ipu import IPUOpTest
 
 
 class TestBase(IPUOpTest):

python/paddle/fluid/tests/unittests/ipu/test_expand_op_ipu.py → test/ipu/test_expand_op_ipu.py

@@ -15,10 +15,10 @@
 import unittest
 
 import numpy as np
+from op_test_ipu import IPUOpTest
 
 import paddle
 import paddle.static
-from paddle.fluid.tests.unittests.ipu.op_test_ipu import IPUOpTest
 
 
 class TestBase(IPUOpTest):

python/paddle/fluid/tests/unittests/ipu/test_expand_v2_op_ipu.py → test/ipu/test_expand_v2_op_ipu.py

@@ -15,10 +15,10 @@
 import unittest
 
 import numpy as np
+from op_test_ipu import IPUOpTest
 
 import paddle
 import paddle.static
-from paddle.fluid.tests.unittests.ipu.op_test_ipu import IPUOpTest
 
 
 class TestBase(IPUOpTest):

python/paddle/fluid/tests/unittests/ipu/test_fill_any_like_op_ipu.py → test/ipu/test_fill_any_like_op_ipu.py

@@ -15,10 +15,10 @@
 import unittest
 
 import numpy as np
+from op_test_ipu import IPUOpTest
 
 import paddle
 import paddle.static
-from paddle.fluid.tests.unittests.ipu.op_test_ipu import IPUOpTest
 
 
 class TestBase(IPUOpTest):

python/paddle/fluid/tests/unittests/ipu/test_fill_constant_op_ipu.py → test/ipu/test_fill_constant_op_ipu.py

@@ -14,9 +14,10 @@
 
 import unittest
 
+from op_test_ipu import IPUOpTest
+
 import paddle
 import paddle.static
-from paddle.fluid.tests.unittests.ipu.op_test_ipu import IPUOpTest
 
 
 class TestBase(IPUOpTest):

python/paddle/fluid/tests/unittests/ipu/test_flatten_contiguous_range_op_ipu.py → test/ipu/test_flatten_contiguous_range_op_ipu.py

@@ -15,10 +15,10 @@
 import unittest
 
 import numpy as np
+from op_test_ipu import IPUOpTest
 
 import paddle
 import paddle.static
-from paddle.fluid.tests.unittests.ipu.op_test_ipu import IPUOpTest
 
 
 class TestBase(IPUOpTest):

python/paddle/fluid/tests/unittests/ipu/test_flatten_op_ipu.py → test/ipu/test_flatten_op_ipu.py

@@ -15,10 +15,10 @@
 import unittest
 
 import numpy as np
+from op_test_ipu import IPUOpTest
 
 import paddle
 import paddle.static
-from paddle.fluid.tests.unittests.ipu.op_test_ipu import IPUOpTest
 
 
 class TestBase(IPUOpTest):

python/paddle/fluid/tests/unittests/ipu/test_flip_op_ipu.py → test/ipu/test_flip_op_ipu.py

@@ -15,10 +15,10 @@
 import unittest
 
 import numpy as np
+from op_test_ipu import IPUOpTest
 
 import paddle
 import paddle.static
-from paddle.fluid.tests.unittests.ipu.op_test_ipu import IPUOpTest
 
 
 class TestBase(IPUOpTest):

python/paddle/fluid/tests/unittests/ipu/test_fp16_support_ipu.py → test/ipu/test_fp16_support_ipu.py

@@ -15,11 +15,11 @@
 import unittest
 
 import numpy as np
+from op_test_ipu import IPUOpTest
 
 import paddle
 import paddle.nn.functional as F
 import paddle.static
-from paddle.fluid.tests.unittests.ipu.op_test_ipu import IPUOpTest
 
 
 class TestBase(IPUOpTest):

python/paddle/fluid/tests/unittests/ipu/test_gather_op_ipu.py → test/ipu/test_gather_op_ipu.py

@@ -15,10 +15,10 @@
 import unittest
 
 import numpy as np
+from op_test_ipu import IPUOpTest
 
 import paddle
 import paddle.static
-from paddle.fluid.tests.unittests.ipu.op_test_ipu import IPUOpTest
 
 
 class TestBase(IPUOpTest):

python/paddle/fluid/tests/unittests/ipu/test_gelu_op_ipu.py → test/ipu/test_gelu_op_ipu.py

@@ -15,10 +15,10 @@
 import unittest
 
 import numpy as np
+from op_test_ipu import IPUOpTest
 
 import paddle
 import paddle.static
-from paddle.fluid.tests.unittests.ipu.op_test_ipu import IPUOpTest
 
 
 class TestBase(IPUOpTest):

python/paddle/fluid/tests/unittests/ipu/test_gradient_clip_ipu.py → test/ipu/test_gradient_clip_ipu.py

@@ -15,10 +15,10 @@
 import unittest
 
 import numpy as np
+from op_test_ipu import IPUOpTest
 
 import paddle
 import paddle.static
-from paddle.fluid.tests.unittests.ipu.op_test_ipu import IPUOpTest
 
 
 class TestBase(IPUOpTest):

python/paddle/fluid/tests/unittests/ipu/test_greater_op_ipu.py → test/ipu/test_greater_op_ipu.py

@@ -15,10 +15,10 @@
 import unittest
 
 import numpy as np
+from op_test_ipu import IPUOpTest
 
 import paddle
 import paddle.static
-from paddle.fluid.tests.unittests.ipu.op_test_ipu import IPUOpTest
 
 
 class TestGreaterThan(IPUOpTest):

python/paddle/fluid/tests/unittests/ipu/test_groupnorm_op_ipu.py → test/ipu/test_groupnorm_op_ipu.py

@@ -15,10 +15,10 @@
 import unittest
 
 import numpy as np
+from op_test_ipu import IPUOpTest
 
 import paddle
 import paddle.static
-from paddle.fluid.tests.unittests.ipu.op_test_ipu import IPUOpTest
 
 
 class TestBase(IPUOpTest):

python/paddle/fluid/tests/unittests/ipu/test_identity_loss_ipu.py → test/ipu/test_identity_loss_ipu.py

@@ -15,16 +15,13 @@
 import unittest
 
 import numpy as np
+from op_test_ipu import IPUOpTest, np_dtype_to_fluid_str
 
 import paddle
 import paddle.optimizer
 import paddle.static
 from paddle import fluid
 from paddle.fluid import compiler
-from paddle.fluid.tests.unittests.ipu.op_test_ipu import (
-    IPUOpTest,
-    np_dtype_to_fluid_str,
-)
 
 paddle.enable_static()
 

python/paddle/fluid/tests/unittests/ipu/test_inference_model_io_ipu.py → test/ipu/test_inference_model_io_ipu.py

@@ -16,10 +16,10 @@ import tempfile
 import unittest
 
 import numpy as np
+from op_test_ipu import IPUOpTest
 
 import paddle
 import paddle.static
-from paddle.fluid.tests.unittests.ipu.op_test_ipu import IPUOpTest
 
 
 class TestBase(IPUOpTest):

python/paddle/fluid/tests/unittests/ipu/test_instancenorm_op_ipu.py → test/ipu/test_instancenorm_op_ipu.py

@@ -15,10 +15,10 @@
 import unittest
 
 import numpy as np
+from op_test_ipu import IPUOpTest
 
 import paddle
 import paddle.static
-from paddle.fluid.tests.unittests.ipu.op_test_ipu import IPUOpTest
 
 
 class TestBase(IPUOpTest):

python/paddle/fluid/tests/unittests/ipu/test_interpolate_ops_ipu.py → test/ipu/test_interpolate_ops_ipu.py

@@ -15,10 +15,10 @@
 import unittest
 
 import numpy as np
+from op_test_ipu import IPUOpTest
 
 import paddle
 import paddle.static
-from paddle.fluid.tests.unittests.ipu.op_test_ipu import IPUOpTest
 
 
 class TestBase(IPUOpTest):

python/paddle/fluid/tests/unittests/ipu/test_kldiv_loss_op_ipu.py → test/ipu/test_kldiv_loss_op_ipu.py

@@ -15,10 +15,10 @@
 import unittest
 
 import numpy as np
+from op_test_ipu import IPUOpTest
 
 import paddle
 import paddle.static
-from paddle.fluid.tests.unittests.ipu.op_test_ipu import IPUOpTest
 
 
 class TestBase(IPUOpTest):

python/paddle/fluid/tests/unittests/ipu/test_layernorm_op_ipu.py → test/ipu/test_layernorm_op_ipu.py

@@ -15,10 +15,10 @@
 import unittest
 
 import numpy as np
+from op_test_ipu import IPUOpTest
 
 import paddle
 import paddle.static
-from paddle.fluid.tests.unittests.ipu.op_test_ipu import IPUOpTest
 
 
 class TestBase(IPUOpTest):

python/paddle/fluid/tests/unittests/ipu/test_logical_not_op_ipu.py → test/ipu/test_logical_not_op_ipu.py

@@ -15,10 +15,10 @@
 import unittest
 
 import numpy as np
+from op_test_ipu import IPUOpTest
 
 import paddle
 import paddle.static
-from paddle.fluid.tests.unittests.ipu.op_test_ipu import IPUOpTest
 
 
 class TestBase(IPUOpTest):

python/paddle/fluid/tests/unittests/ipu/test_logical_x_op_ipu.py → test/ipu/test_logical_x_op_ipu.py

@@ -15,10 +15,10 @@
 import unittest
 
 import numpy as np
+from op_test_ipu import IPUOpTest
 
 import paddle
 import paddle.static
-from paddle.fluid.tests.unittests.ipu.op_test_ipu import IPUOpTest
 
 
 class TestLogicalAnd(IPUOpTest):

python/paddle/fluid/tests/unittests/ipu/test_lookuptable_op_ipu.py → test/ipu/test_lookuptable_op_ipu.py

@@ -15,10 +15,10 @@
 import unittest
 
 import numpy as np
+from op_test_ipu import IPUOpTest
 
 import paddle
 import paddle.static
-from paddle.fluid.tests.unittests.ipu.op_test_ipu import IPUOpTest
 
 
 class TestBase(IPUOpTest):

python/paddle/fluid/tests/unittests/ipu/test_lookuptable_v2_op_ipu.py → test/ipu/test_lookuptable_v2_op_ipu.py

@@ -15,10 +15,10 @@
 import unittest
 
 import numpy as np
+from op_test_ipu import IPUOpTest
 
 import paddle
 import paddle.static
-from paddle.fluid.tests.unittests.ipu.op_test_ipu import IPUOpTest
 
 
 class TestBase(IPUOpTest):

python/paddle/fluid/tests/unittests/ipu/test_lr_sheduler_ipu.py → test/ipu/test_lr_sheduler_ipu.py

@@ -15,10 +15,10 @@
 import unittest
 
 import numpy as np
+from op_test_ipu import IPUOpTest
 
 import paddle
 import paddle.static
-from paddle.fluid.tests.unittests.ipu.op_test_ipu import IPUOpTest
 from paddle.optimizer.lr import LRScheduler
 
 

python/paddle/fluid/tests/unittests/ipu/test_margin_rank_loss_op_ipu.py → test/ipu/test_margin_rank_loss_op_ipu.py

@@ -15,10 +15,10 @@
 import unittest
 
 import numpy as np
+from op_test_ipu import IPUOpTest
 
 import paddle
 import paddle.static
-from paddle.fluid.tests.unittests.ipu.op_test_ipu import IPUOpTest
 
 
 class TestBase(IPUOpTest):

python/paddle/fluid/tests/unittests/ipu/test_matmul_op_ipu.py → test/ipu/test_matmul_op_ipu.py

@@ -15,10 +15,10 @@
 import unittest
 
 import numpy as np
+from op_test_ipu import IPUOpTest
 
 import paddle
 import paddle.static
-from paddle.fluid.tests.unittests.ipu.op_test_ipu import IPUOpTest
 
 
 class TestBase(IPUOpTest):

python/paddle/fluid/tests/unittests/ipu/test_matmul_serilize_ipu.py → test/ipu/test_matmul_serilize_ipu.py

@@ -15,10 +15,10 @@
 import unittest
 
 import numpy as np
+from op_test_ipu import IPUOpTest
 
 import paddle
 import paddle.static
-from paddle.fluid.tests.unittests.ipu.op_test_ipu import IPUOpTest
 
 
 def set_serialize_factor(serialize_factor):

python/paddle/fluid/tests/unittests/ipu/test_matmul_v2_op_ipu.py → test/ipu/test_matmul_v2_op_ipu.py

@@ -15,10 +15,10 @@
 import unittest
 
 import numpy as np
+from op_test_ipu import IPUOpTest
 
 import paddle
 import paddle.static
-from paddle.fluid.tests.unittests.ipu.op_test_ipu import IPUOpTest
 
 
 class TestBase(IPUOpTest):

python/paddle/fluid/tests/unittests/ipu/test_mean_op_ipu.py → test/ipu/test_mean_op_ipu.py

@@ -15,10 +15,10 @@
 import unittest
 
 import numpy as np
+from op_test_ipu import IPUOpTest
 
 import paddle
 import paddle.static
-from paddle.fluid.tests.unittests.ipu.op_test_ipu import IPUOpTest
 
 
 class TestBase(IPUOpTest):

python/paddle/fluid/tests/unittests/ipu/test_meshgrid_op_ipu.py → test/ipu/test_meshgrid_op_ipu.py

@@ -15,10 +15,10 @@
 import unittest
 
 import numpy as np
+from op_test_ipu import IPUOpTest
 
 import paddle
 import paddle.static
-from paddle.fluid.tests.unittests.ipu.op_test_ipu import IPUOpTest
 
 
 class TestBase(IPUOpTest):

python/paddle/fluid/tests/unittests/ipu/test_mixed_precision_inference_ipu.py → test/ipu/test_mixed_precision_inference_ipu.py

@@ -15,11 +15,11 @@
 import unittest
 
 import numpy as np
+from op_test_ipu import IPUOpTest
 
 import paddle
 import paddle.nn.functional as F
 import paddle.static
-from paddle.fluid.tests.unittests.ipu.op_test_ipu import IPUOpTest
 
 
 class TestBase(IPUOpTest):

python/paddle/fluid/tests/unittests/ipu/test_mixed_precision_training_ipu.py → test/ipu/test_mixed_precision_training_ipu.py

@@ -15,11 +15,11 @@
 import unittest
 
 import numpy as np
+from op_test_ipu import IPUOpTest
 
 import paddle
 import paddle.nn.functional as F
 import paddle.static
-from paddle.fluid.tests.unittests.ipu.op_test_ipu import IPUOpTest
 
 
 class TestBase(IPUOpTest):

python/paddle/fluid/tests/unittests/ipu/test_model_parallel_ipu.py → test/ipu/test_model_parallel_ipu.py

@@ -15,10 +15,10 @@
 import unittest
 
 import numpy as np
+from op_test_ipu import IPUOpTest
 
 import paddle
 import paddle.static
-from paddle.fluid.tests.unittests.ipu.op_test_ipu import IPUOpTest
 
 
 class TestBase(IPUOpTest):

python/paddle/fluid/tests/unittests/ipu/test_model_pipeline_ipu.py → test/ipu/test_model_pipeline_ipu.py

@@ -15,10 +15,10 @@
 import unittest
 
 import numpy as np
+from op_test_ipu import IPUOpTest
 
 import paddle
 import paddle.static
-from paddle.fluid.tests.unittests.ipu.op_test_ipu import IPUOpTest
 
 
 class TestBase(IPUOpTest):

python/paddle/fluid/tests/unittests/ipu/test_not_equal_op_ipu.py → test/ipu/test_not_equal_op_ipu.py

@@ -15,10 +15,10 @@
 import unittest
 
 import numpy as np
+from op_test_ipu import IPUOpTest
 
 import paddle
 import paddle.static
-from paddle.fluid.tests.unittests.ipu.op_test_ipu import IPUOpTest
 
 
 class TestBase(IPUOpTest):

python/paddle/fluid/tests/unittests/ipu/test_one_hot_op_ipu.py → test/ipu/test_one_hot_op_ipu.py

@@ -15,10 +15,10 @@
 import unittest
 
 import numpy as np
+from op_test_ipu import IPUOpTest
 
 import paddle
 import paddle.static
-from paddle.fluid.tests.unittests.ipu.op_test_ipu import IPUOpTest
 
 
 class TestBase(IPUOpTest):

python/paddle/fluid/tests/unittests/ipu/test_one_hot_v2_op_ipu.py → test/ipu/test_one_hot_v2_op_ipu.py

@@ -15,10 +15,10 @@
 import unittest
 
 import numpy as np
+from op_test_ipu import IPUOpTest
 
 import paddle
 import paddle.static
-from paddle.fluid.tests.unittests.ipu.op_test_ipu import IPUOpTest
 
 
 class TestBase(IPUOpTest):

python/paddle/fluid/tests/unittests/ipu/test_optimizer_ipu.py → test/ipu/test_optimizer_ipu.py

@@ -15,10 +15,10 @@
 import unittest
 
 import numpy as np
+from op_test_ipu import IPUOpTest
 
 import paddle
 import paddle.static
-from paddle.fluid.tests.unittests.ipu.op_test_ipu import IPUOpTest
 
 
 class TestBase(IPUOpTest):

python/paddle/fluid/tests/unittests/ipu/test_p_norm_op_ipu.py → test/ipu/test_p_norm_op_ipu.py

@@ -15,10 +15,10 @@
 import unittest
 
 import numpy as np
+from op_test_ipu import IPUOpTest
 
 import paddle
 import paddle.static
-from paddle.fluid.tests.unittests.ipu.op_test_ipu import IPUOpTest
 
 
 class TestBase(IPUOpTest):

python/paddle/fluid/tests/unittests/ipu/test_pad_op_ipu.py → test/ipu/test_pad_op_ipu.py

@@ -15,10 +15,10 @@
 import unittest
 
 import numpy as np
+from op_test_ipu import IPUOpTest
 
 import paddle
 import paddle.static
-from paddle.fluid.tests.unittests.ipu.op_test_ipu import IPUOpTest
 
 
 class TestBase(IPUOpTest):

python/paddle/fluid/tests/unittests/ipu/test_pool_avg_op_ipu.py → test/ipu/test_pool_avg_op_ipu.py

@@ -15,10 +15,10 @@
 import unittest
 
 import numpy as np
+from op_test_ipu import IPUOpTest
 
 import paddle
 import paddle.static
-from paddle.fluid.tests.unittests.ipu.op_test_ipu import IPUOpTest
 
 
 class TestBase(IPUOpTest):

python/paddle/fluid/tests/unittests/ipu/test_pool_max_op_ipu.py → test/ipu/test_pool_max_op_ipu.py

@@ -15,10 +15,10 @@
 import unittest
 
 import numpy as np
+from op_test_ipu import IPUOpTest
 
 import paddle
 import paddle.static
-from paddle.fluid.tests.unittests.ipu.op_test_ipu import IPUOpTest
 
 
 class TestBase(IPUOpTest):

python/paddle/fluid/tests/unittests/ipu/test_pow_op_ipu.py → test/ipu/test_pow_op_ipu.py

@@ -15,10 +15,10 @@
 import unittest
 
 import numpy as np
+from op_test_ipu import IPUOpTest
 
 import paddle
 import paddle.static
-from paddle.fluid.tests.unittests.ipu.op_test_ipu import IPUOpTest
 
 
 class TestBase(IPUOpTest):

python/paddle/fluid/tests/unittests/ipu/test_prelu_op_ipu.py → test/ipu/test_prelu_op_ipu.py

@@ -15,11 +15,11 @@
 import unittest
 
 import numpy as np
+from op_test_ipu import IPUOpTest
 
 import paddle
 import paddle.nn.functional as F
 import paddle.static
-from paddle.fluid.tests.unittests.ipu.op_test_ipu import IPUOpTest
 
 
 class TestBase(IPUOpTest):

python/paddle/fluid/tests/unittests/ipu/test_print_op_ipu.py → test/ipu/test_print_op_ipu.py

@@ -15,10 +15,10 @@
 import unittest
 
 import numpy as np
+from op_test_ipu import IPUD2STest, IPUOpTest
 
 import paddle
 import paddle.static
-from paddle.fluid.tests.unittests.ipu.op_test_ipu import IPUD2STest, IPUOpTest
 from paddle.jit import to_static
 
 

python/paddle/fluid/tests/unittests/ipu/test_reduce_x_op_ipu.py → test/ipu/test_reduce_x_op_ipu.py

@@ -15,10 +15,10 @@
 import unittest
 
 import numpy as np
+from op_test_ipu import IPUOpTest
 
 import paddle
 import paddle.static
-from paddle.fluid.tests.unittests.ipu.op_test_ipu import IPUOpTest
 
 
 class TestMean(IPUOpTest):

python/paddle/fluid/tests/unittests/ipu/test_reshape_inplace_op_ipu.py → test/ipu/test_reshape_inplace_op_ipu.py

@@ -15,10 +15,10 @@
 import unittest
 
 import numpy as np
+from op_test_ipu import IPUOpTest
 
 import paddle
 import paddle.static
-from paddle.fluid.tests.unittests.ipu.op_test_ipu import IPUOpTest
 
 
 class TestBase(IPUOpTest):

python/paddle/fluid/tests/unittests/ipu/test_reshape_op_ipu.py → test/ipu/test_reshape_op_ipu.py

@@ -15,10 +15,10 @@
 import unittest
 
 import numpy as np
+from op_test_ipu import IPUOpTest
 
 import paddle
 import paddle.static
-from paddle.fluid.tests.unittests.ipu.op_test_ipu import IPUOpTest
 
 
 class TestBase(IPUOpTest):

python/paddle/fluid/tests/unittests/ipu/test_save_load_ipu.py → test/ipu/test_save_load_ipu.py

@@ -17,11 +17,11 @@ import unittest
 from functools import partial
 
 import numpy as np
+from op_test_ipu import IPUOpTest
 
 import paddle
 import paddle.optimizer
 import paddle.static
-from paddle.fluid.tests.unittests.ipu.op_test_ipu import IPUOpTest
 
 
 class TestBase(IPUOpTest):

python/paddle/fluid/tests/unittests/ipu/test_scale_op_ipu.py → test/ipu/test_scale_op_ipu.py

@@ -15,10 +15,10 @@
 import unittest
 
 import numpy as np
+from op_test_ipu import IPUOpTest
 
 import paddle
 import paddle.static
-from paddle.fluid.tests.unittests.ipu.op_test_ipu import IPUOpTest
 
 
 class TestBase(IPUOpTest):

python/paddle/fluid/tests/unittests/ipu/test_scaled_optimizer_state_ipu.py → test/ipu/test_scaled_optimizer_state_ipu.py

@@ -15,10 +15,10 @@
 import unittest
 
 import numpy as np
+from op_test_ipu import IPUOpTest
 
 import paddle
 import paddle.static
-from paddle.fluid.tests.unittests.ipu.op_test_ipu import IPUOpTest
 
 
 class TestBase(IPUOpTest):

python/paddle/fluid/tests/unittests/ipu/test_set_batch_size_ipu.py → test/ipu/test_set_batch_size_ipu.py

@@ -15,10 +15,10 @@
 import unittest
 
 import numpy as np
+from op_test_ipu import IPUOpTest
 
 import paddle
 import paddle.static
-from paddle.fluid.tests.unittests.ipu.op_test_ipu import IPUOpTest
 
 
 class TestBase(IPUOpTest):

python/paddle/fluid/tests/unittests/ipu/test_share_data_op_ipu.py → test/ipu/test_share_data_op_ipu.py

@@ -15,10 +15,10 @@
 import unittest
 
 import numpy as np
+from op_test_ipu import IPUOpTest
 
 import paddle
 import paddle.static
-from paddle.fluid.tests.unittests.ipu.op_test_ipu import IPUOpTest
 
 
 class TestBase(IPUOpTest):

python/paddle/fluid/tests/unittests/ipu/test_slice_op_ipu.py → test/ipu/test_slice_op_ipu.py

@@ -15,10 +15,10 @@
 import unittest
 
 import numpy as np
+from op_test_ipu import IPUOpTest
 
 import paddle
 import paddle.static
-from paddle.fluid.tests.unittests.ipu.op_test_ipu import IPUOpTest
 
 
 class TestBase(IPUOpTest):

python/paddle/fluid/tests/unittests/ipu/test_softmax_op_ipu.py → test/ipu/test_softmax_op_ipu.py

@@ -15,10 +15,10 @@
 import unittest
 
 import numpy as np
+from op_test_ipu import IPUOpTest
 
 import paddle
 import paddle.static
-from paddle.fluid.tests.unittests.ipu.op_test_ipu import IPUOpTest
 
 
 class TestBase(IPUOpTest):

python/paddle/fluid/tests/unittests/ipu/test_softmax_with_cross_entropy_op_ipu.py → test/ipu/test_softmax_with_cross_entropy_op_ipu.py

@@ -15,11 +15,11 @@
 import unittest
 
 import numpy as np
+from op_test_ipu import IPUOpTest
 
 import paddle
 import paddle.nn.functional as F
 import paddle.static
-from paddle.fluid.tests.unittests.ipu.op_test_ipu import IPUOpTest
 
 
 class TestBase(IPUOpTest):

python/paddle/fluid/tests/unittests/ipu/test_split_op_ipu.py → test/ipu/test_split_op_ipu.py

@@ -15,10 +15,10 @@
 import unittest
 
 import numpy as np
+from op_test_ipu import IPUOpTest
 
 import paddle
 import paddle.static
-from paddle.fluid.tests.unittests.ipu.op_test_ipu import IPUOpTest
 
 
 class TestBase(IPUOpTest):

python/paddle/fluid/tests/unittests/ipu/test_squeeze_op_ipu.py → test/ipu/test_squeeze_op_ipu.py

@@ -15,10 +15,10 @@
 import unittest
 
 import numpy as np
+from op_test_ipu import IPUOpTest
 
 import paddle
 import paddle.static
-from paddle.fluid.tests.unittests.ipu.op_test_ipu import IPUOpTest
 
 
 class TestBase(IPUOpTest):

python/paddle/fluid/tests/unittests/ipu/test_stack_op_ipu.py → test/ipu/test_stack_op_ipu.py

@@ -15,10 +15,10 @@
 import unittest
 
 import numpy as np
+from op_test_ipu import IPUOpTest
 
 import paddle
 import paddle.static
-from paddle.fluid.tests.unittests.ipu.op_test_ipu import IPUOpTest
 
 
 class TestBase(IPUOpTest):

python/paddle/fluid/tests/unittests/ipu/test_strided_slice_op_ipu.py → test/ipu/test_strided_slice_op_ipu.py

@@ -15,10 +15,10 @@
 import unittest
 
 import numpy as np
+from op_test_ipu import IPUOpTest
 
 import paddle
 import paddle.static
-from paddle.fluid.tests.unittests.ipu.op_test_ipu import IPUOpTest
 
 
 class TestBase(IPUOpTest):

python/paddle/fluid/tests/unittests/ipu/test_sum_op_ipu.py → test/ipu/test_sum_op_ipu.py

@@ -15,10 +15,10 @@
 import unittest
 
 import numpy as np
+from op_test_ipu import IPUOpTest
 
 import paddle
 import paddle.static
-from paddle.fluid.tests.unittests.ipu.op_test_ipu import IPUOpTest
 
 
 class TestBase(IPUOpTest):

python/paddle/fluid/tests/unittests/ipu/test_tile_op_ipu.py → test/ipu/test_tile_op_ipu.py

@@ -15,10 +15,10 @@
 import unittest
 
 import numpy as np
+from op_test_ipu import IPUOpTest
 
 import paddle
 import paddle.static
-from paddle.fluid.tests.unittests.ipu.op_test_ipu import IPUOpTest
 
 
 class TestBase(IPUOpTest):

python/paddle/fluid/tests/unittests/ipu/test_topk_op_ipu.py → test/ipu/test_topk_op_ipu.py

@@ -15,10 +15,10 @@
 import unittest
 
 import numpy as np
+from op_test_ipu import IPUOpTest
 
 import paddle
 import paddle.static
-from paddle.fluid.tests.unittests.ipu.op_test_ipu import IPUOpTest
 
 
 class TestTopKOp(IPUOpTest):

python/paddle/fluid/tests/unittests/ipu/test_transpose_op_ipu.py → test/ipu/test_transpose_op_ipu.py

@@ -15,10 +15,10 @@
 import unittest
 
 import numpy as np
+from op_test_ipu import IPUOpTest
 
 import paddle
 import paddle.static
-from paddle.fluid.tests.unittests.ipu.op_test_ipu import IPUOpTest
 
 
 class TestBase(IPUOpTest):

python/paddle/fluid/tests/unittests/ipu/test_unary_ops_ipu.py → test/ipu/test_unary_ops_ipu.py

@@ -15,11 +15,11 @@
 import unittest
 
 import numpy as np
+from op_test_ipu import IPUOpTest
 
 import paddle
 import paddle.nn.functional as F
 import paddle.static
-from paddle.fluid.tests.unittests.ipu.op_test_ipu import IPUOpTest
 
 
 class TestBase(IPUOpTest):

python/paddle/fluid/tests/unittests/ipu/test_unsqueeze_op_ipu.py → test/ipu/test_unsqueeze_op_ipu.py

@@ -15,10 +15,10 @@
 import unittest
 
 import numpy as np
+from op_test_ipu import IPUOpTest
 
 import paddle
 import paddle.static
-from paddle.fluid.tests.unittests.ipu.op_test_ipu import IPUOpTest
 
 
 class TestBase(IPUOpTest):

python/paddle/fluid/tests/unittests/ipu/test_unstack_op_ipu.py → test/ipu/test_unstack_op_ipu.py

@@ -15,10 +15,10 @@
 import unittest
 
 import numpy as np
+from op_test_ipu import IPUOpTest
 
 import paddle
 import paddle.static
-from paddle.fluid.tests.unittests.ipu.op_test_ipu import IPUOpTest
 
 
 class TestBase(IPUOpTest):

python/paddle/fluid/tests/unittests/ipu/test_varname_inplace_ipu.py → test/ipu/test_varname_inplace_ipu.py

@@ -15,10 +15,10 @@
 import unittest
 
 import numpy as np
+from op_test_ipu import IPUOpTest
 
 import paddle
 import paddle.static
-from paddle.fluid.tests.unittests.ipu.op_test_ipu import IPUOpTest
 
 
 class TestBase(IPUOpTest):

python/paddle/fluid/tests/unittests/ipu/test_warpctc_op_ipu.py → test/ipu/test_warpctc_op_ipu.py

@@ -15,10 +15,10 @@
 import unittest
 
 import numpy as np
+from op_test_ipu import IPUOpTest
 
 import paddle
 import paddle.static
-from paddle.fluid.tests.unittests.ipu.op_test_ipu import IPUOpTest
 
 
 class TestBase(IPUOpTest):

python/paddle/fluid/tests/unittests/ipu/test_weight_decay_ipu.py → test/ipu/test_weight_decay_ipu.py

@@ -17,10 +17,10 @@ import tempfile
 import unittest
 
 import numpy as np
+from op_test_ipu import IPUOpTest
 
 import paddle
 import paddle.static
-from paddle.fluid.tests.unittests.ipu.op_test_ipu import IPUOpTest
 
 
 @unittest.skipIf(IPUOpTest.use_ipumodel(), "skip for ipumodel")

python/paddle/fluid/tests/unittests/ipu/test_weight_sharing_ipu.py → test/ipu/test_weight_sharing_ipu.py

@@ -15,10 +15,10 @@
 import unittest
 
 import numpy as np
+from op_test_ipu import IPUOpTest
 
 import paddle
 import paddle.static
-from paddle.fluid.tests.unittests.ipu.op_test_ipu import IPUOpTest
 
 
 class TestWeightSharing(IPUOpTest):

python/paddle/fluid/tests/unittests/ipu/test_where_op_ipu.py → test/ipu/test_where_op_ipu.py

@@ -15,10 +15,10 @@
 import unittest
 
 import numpy as np
+from op_test_ipu import IPUOpTest
 
 import paddle
 import paddle.static
-from paddle.fluid.tests.unittests.ipu.op_test_ipu import IPUOpTest
 
 
 class TestBase(IPUOpTest):

python/paddle/fluid/tests/unittests/ipu/test_yolo_box_op_ipu.py → test/ipu/test_yolo_box_op_ipu.py

@@ -15,10 +15,10 @@
 import unittest
 
 import numpy as np
+from op_test_ipu import IPUOpTest
 
 import paddle
 import paddle.static
-from paddle.fluid.tests.unittests.ipu.op_test_ipu import IPUOpTest
 
 
 class TestBase(IPUOpTest):