[Move Test] xpu (#52661)

* move python/paddle/fluid/tests/unittests/xpu to test/xpu

* update CMakeLists.txt

* remove xpu in fluid/tests/unittests/

* add path to op_test_xpu

* fix incorrect path

* update test script

* fix test_adadelta_op_xpu error

paddle/scripts/paddle_build.sh

@@ -2237,7 +2237,7 @@ set +x
 set -x
         ut_endTime_s=`date +%s`
         echo "XPU testCase Time: $[ $ut_endTime_s - $ut_startTime_s ]s"
-        python ${PADDLE_ROOT}/build/python/paddle/fluid/tests/unittests/xpu/get_test_cover_info.py
+        python ${PADDLE_ROOT}/build/test/xpu/get_test_cover_info.py
         unset XPU_OP_LIST_DIR
         if [[ "$EXIT_CODE" != "0" ]]; then
             exit 8;

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

@@ -772,10 +772,6 @@ add_subdirectory(sequence)
 add_subdirectory(rnn)
 add_subdirectory(distribution)
 
-if(WITH_XPU)
-  add_subdirectory(xpu)
-endif()
-
 # dist xpu tests:
 if(WITH_XPU_BKCL)
   py_test(test_collective_allreduce_api_xpu

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

-file(
-  GLOB TEST_OPS
-  RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}"
-  "test_*.py")
-string(REPLACE ".py" "" TEST_OPS "${TEST_OPS}")
-
-if(WITH_XPU_BKCL)
-  list(REMOVE_ITEM TEST_OPS "test_gen_bkcl_id_op")
-endif()
-
-file(
-  GLOB DIST_TEST_OPS
-  RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}"
-  "test_dist_*.py")
-if(WITH_XPU_BKCL)
-  list(APPEND DIST_TEST_OPS test_gen_bkcl_id_op)
-endif()
-
-foreach(TEST_OP ${TEST_OPS})
-  py_test_modules(${TEST_OP} MODULES ${TEST_OP})
-endforeach()
-
-foreach(TEST_OP ${DIST_TEST_OPS})
-  py_test_modules(${TEST_OP} MODULES ${TEST_OP})
-endforeach()
-
-set_tests_properties(test_conv2d_op_xpu PROPERTIES TIMEOUT 120)
-set_tests_properties(test_mul_op_xpu PROPERTIES TIMEOUT 120)
-set_tests_properties(test_matmul_v2_op_xpu PROPERTIES TIMEOUT 900)
-set_tests_properties(test_matmul_op_xpu PROPERTIES TIMEOUT 300)
-set_tests_properties(test_collective_identity_xpu
-                     PROPERTIES LABELS "RUN_TYPE=DIST_KUNLUN")
-set_tests_properties(test_collective_allgather_xpu
-                     PROPERTIES LABELS "RUN_TYPE=DIST_KUNLUN")
-set_tests_properties(test_collective_allreduce_xpu
-                     PROPERTIES LABELS "RUN_TYPE=DIST_KUNLUN")

test/CMakeLists.txt

@@ -128,7 +128,9 @@ if(WITH_TESTING)
   add_subdirectory(standalone_executor)
   add_subdirectory(tokenizer)
   # add_subdirectory(white_list)
-  add_subdirectory(xpu)
+  if(WITH_XPU)
+    add_subdirectory(xpu)
+  endif()
 endif()
 
 get_property(test_srcs GLOBAL PROPERTY TEST_SRCS)

test/xpu/CMakeLists.txt

 if(WITH_XPU)
   add_subdirectory(cpp)
 endif()
+
+file(
+  GLOB TEST_OPS
+  RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}"
+  "test_*.py")
+string(REPLACE ".py" "" TEST_OPS "${TEST_OPS}")
+
+if(WITH_XPU_BKCL)
+  list(REMOVE_ITEM TEST_OPS "test_gen_bkcl_id_op")
+endif()
+
+file(
+  GLOB DIST_TEST_OPS
+  RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}"
+  "test_dist_*.py")
+if(WITH_XPU_BKCL)
+  list(APPEND DIST_TEST_OPS test_gen_bkcl_id_op)
+endif()
+
+foreach(TEST_OP ${TEST_OPS})
+  py_test_modules(${TEST_OP} MODULES ${TEST_OP})
+endforeach()
+
+foreach(TEST_OP ${DIST_TEST_OPS})
+  py_test_modules(${TEST_OP} MODULES ${TEST_OP})
+endforeach()
+
+set_tests_properties(test_conv2d_op_xpu PROPERTIES TIMEOUT 120)
+set_tests_properties(test_mul_op_xpu PROPERTIES TIMEOUT 120)
+set_tests_properties(test_matmul_v2_op_xpu PROPERTIES TIMEOUT 900)
+set_tests_properties(test_matmul_op_xpu PROPERTIES TIMEOUT 300)
+set_tests_properties(test_collective_identity_xpu
+                     PROPERTIES LABELS "RUN_TYPE=DIST_KUNLUN")
+set_tests_properties(test_collective_allgather_xpu
+                     PROPERTIES LABELS "RUN_TYPE=DIST_KUNLUN")
+set_tests_properties(test_collective_allreduce_xpu
+                     PROPERTIES LABELS "RUN_TYPE=DIST_KUNLUN")

python/paddle/fluid/tests/unittests/op_test_xpu.py → test/xpu/op_test_xpu.py

@@ -12,15 +12,21 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import sys
+
 import numpy as np
+
+sys.path.append('..')
+sys.path.append('../../python/paddle/fluid/tests/unittests')
+
 from eager_op_test import OpTest
-from testsuite import append_loss_ops, create_op, set_input
-from white_list import no_grad_set_white_list, op_threshold_white_list
-from xpu.get_test_cover_info import (
+from get_test_cover_info import (
     get_xpu_op_support_types,
     is_empty_grad_op_type,
     type_dict_str_to_numpy,
 )
+from testsuite import append_loss_ops, create_op, set_input
+from white_list import no_grad_set_white_list, op_threshold_white_list
 
 import paddle
 from paddle import fluid

python/paddle/fluid/tests/unittests/xpu/test_accuracy_op_xpu.py → test/xpu/test_accuracy_op_xpu.py

@@ -12,18 +12,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import sys
 import unittest
 
 import numpy as np
-
-sys.path.append("..")
-from op_test_xpu import XPUOpTest
-from xpu.get_test_cover_info import (
+from get_test_cover_info import (
     XPUOpTestWrapper,
     create_test_class,
     get_xpu_op_support_types,
 )
+from op_test_xpu import XPUOpTest
 
 import paddle
 

python/paddle/fluid/tests/unittests/xpu/test_activation_op_xpu.py → test/xpu/test_activation_op_xpu.py

@@ -15,17 +15,16 @@
 import sys
 import unittest
 
-import numpy as np
-
-sys.path.append("..")
+sys.path.append('../../python/paddle/fluid/tests/unittests')
 
+import numpy as np
 from eager_op_test import OpTest
-from op_test_xpu import XPUOpTest
-from xpu.get_test_cover_info import (
+from get_test_cover_info import (
     XPUOpTestWrapper,
     create_test_class,
     get_xpu_op_support_types,
 )
+from op_test_xpu import XPUOpTest
 
 import paddle
 import paddle.nn.functional as F

python/paddle/fluid/tests/unittests/xpu/test_adadelta_op_xpu.py → test/xpu/test_adadelta_op_xpu.py

@@ -12,19 +12,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import sys
 import unittest
 
 import numpy as np
-
-sys.path.append("..")
-
-from op_test_xpu import XPUOpTest
-from xpu.get_test_cover_info import (
+from get_test_cover_info import (
     XPUOpTestWrapper,
     create_test_class,
     get_xpu_op_support_types,
 )
+from op_test_xpu import XPUOpTest
 
 import paddle
 from paddle import fluid
@@ -52,11 +48,13 @@ class XPUTestAdadelta(XPUOpTestWrapper):
             rho = 0.95
             epsilon = 1e-6
 
+            learning_rate = 1.0
             self.inputs = {
                 'Param': param,
                 'Grad': grad,
                 'AvgSquaredGrad': avg_squared_grad,
                 'AvgSquaredUpdate': avg_squared_update,
+                'LearningRate': np.array([learning_rate]).astype("float32"),
             }
 
             self.attrs = {'rho': rho, 'epsilon': epsilon}
@@ -107,11 +105,13 @@ class XPUTestAdadelta(XPUOpTestWrapper):
             rho = 0.95
             epsilon = 1e-6
 
+            learning_rate = 1.0
             self.inputs = {
                 'Param': param,
                 'Grad': grad,
                 'AvgSquaredGrad': avg_squared_grad,
                 'AvgSquaredUpdate': avg_squared_update,
+                'LearningRate': np.array([learning_rate]).astype("float32"),
             }
 
             avg_squared_grad_out = rho * avg_squared_grad + (

python/paddle/fluid/tests/unittests/xpu/test_adagrad_op_xpu.py → test/xpu/test_adagrad_op_xpu.py

@@ -12,21 +12,17 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import sys
-
-import numpy as np
-
-import paddle
-
-sys.path.append("..")
 import unittest
 
-from op_test_xpu import XPUOpTest
-from xpu.get_test_cover_info import (
+import numpy as np
+from get_test_cover_info import (
     XPUOpTestWrapper,
     create_test_class,
     get_xpu_op_support_types,
 )
+from op_test_xpu import XPUOpTest
+
+import paddle
 
 paddle.enable_static()
 

python/paddle/fluid/tests/unittests/xpu/test_adam_op_xpu.py → test/xpu/test_adam_op_xpu.py

@@ -12,18 +12,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import sys
-
-sys.path.append("..")
 import unittest
 
 import numpy as np
-from op_test_xpu import XPUOpTest
-from xpu.get_test_cover_info import (
+from get_test_cover_info import (
     XPUOpTestWrapper,
     create_test_class,
     get_xpu_op_support_types,
 )
+from op_test_xpu import XPUOpTest
 
 import paddle
 from paddle.fluid import core

python/paddle/fluid/tests/unittests/xpu/test_adamw_op_xpu.py → test/xpu/test_adamw_op_xpu.py

@@ -12,20 +12,16 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import sys
-
-sys.path.append("..")
-
 import unittest
 from functools import partial
 
 import numpy as np
-from op_test_xpu import XPUOpTest
-from xpu.get_test_cover_info import (
+from get_test_cover_info import (
     XPUOpTestWrapper,
     create_test_class,
     get_xpu_op_support_types,
 )
+from op_test_xpu import XPUOpTest
 
 import paddle
 from paddle import fluid

python/paddle/fluid/tests/unittests/xpu/test_affine_channel_op_xpu.py → test/xpu/test_affine_channel_op_xpu.py

@@ -15,10 +15,6 @@
 Unit testing for affine_channel_op
 """
 
-import sys
-
-sys.path.append("..")
-
 import unittest
 
 import numpy as np

python/paddle/fluid/tests/unittests/xpu/test_amp_check_finite_and_scale_op_xpu.py → test/xpu/test_amp_check_finite_and_scale_op_xpu.py

@@ -12,18 +12,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import sys
-
-sys.path.append("..")
 import unittest
 
 import numpy as np
-from op_test_xpu import XPUOpTest
-from xpu.get_test_cover_info import (
+from get_test_cover_info import (
     XPUOpTestWrapper,
     create_test_class,
     get_xpu_op_support_types,
 )
+from op_test_xpu import XPUOpTest
 
 import paddle
 

python/paddle/fluid/tests/unittests/xpu/test_arg_max_op_xpu.py → test/xpu/test_arg_max_op_xpu.py

@@ -12,19 +12,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import sys
 import unittest
 
 import numpy as np
-
-sys.path.append("..")
-
-from op_test_xpu import XPUOpTest
-from xpu.get_test_cover_info import (
+from get_test_cover_info import (
     XPUOpTestWrapper,
     create_test_class,
     get_xpu_op_support_types,
 )
+from op_test_xpu import XPUOpTest
 
 import paddle
 

python/paddle/fluid/tests/unittests/xpu/test_argsort_op_xpu.py → test/xpu/test_argsort_op_xpu.py

@@ -12,19 +12,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import sys
 import unittest
 
 import numpy as np
-
-sys.path.append("..")
-
-from op_test_xpu import XPUOpTest
-from xpu.get_test_cover_info import (
+from get_test_cover_info import (
     XPUOpTestWrapper,
     create_test_class,
     get_xpu_op_support_types,
 )
+from op_test_xpu import XPUOpTest
 
 import paddle
 

python/paddle/fluid/tests/unittests/xpu/test_assign_op_xpu.py → test/xpu/test_assign_op_xpu.py

@@ -12,19 +12,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import sys
 import unittest
 
 import numpy as np
-
-sys.path.append("..")
-
-from op_test_xpu import XPUOpTest
-from xpu.get_test_cover_info import (
+from get_test_cover_info import (
     XPUOpTestWrapper,
     create_test_class,
     get_xpu_op_support_types,
 )
+from op_test_xpu import XPUOpTest
 
 import paddle
 

python/paddle/fluid/tests/unittests/xpu/test_assign_value_op_xpu.py → test/xpu/test_assign_value_op_xpu.py

@@ -12,18 +12,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import sys
 import unittest
 
 import numpy as np
-
-sys.path.append("..")
-from op_test_xpu import XPUOpTest
-from xpu.get_test_cover_info import (
+from get_test_cover_info import (
     XPUOpTestWrapper,
     create_test_class,
     get_xpu_op_support_types,
 )
+from op_test_xpu import XPUOpTest
 
 import paddle
 from paddle import fluid

python/paddle/fluid/tests/unittests/xpu/test_atan_op_xpu.py → test/xpu/test_atan_op_xpu.py

@@ -12,7 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import sys
 import unittest
 
 import numpy as np
@@ -21,14 +20,13 @@ import paddle
 
 paddle.enable_static()
 
-sys.path.append("..")
 
-from op_test_xpu import XPUOpTest
-from xpu.get_test_cover_info import (
+from get_test_cover_info import (
     XPUOpTestWrapper,
     create_test_class,
     get_xpu_op_support_types,
 )
+from op_test_xpu import XPUOpTest
 
 
 class XPUTestAtanOp(XPUOpTestWrapper):

python/paddle/fluid/tests/unittests/xpu/test_batch_norm_op_xpu.py → test/xpu/test_batch_norm_op_xpu.py

@@ -12,13 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import sys
-
-sys.path.append("..")
 import unittest
 
 import numpy as np
-from xpu.get_test_cover_info import (
+from get_test_cover_info import (
     XPUOpTestWrapper,
     create_test_class,
     get_xpu_op_support_types,

python/paddle/fluid/tests/unittests/xpu/test_bce_loss_op_xpu.py → test/xpu/test_bce_loss_op_xpu.py

@@ -12,18 +12,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import sys
-
-sys.path.append("..")
 import unittest
 
 import numpy as np
-from op_test_xpu import XPUOpTest
-from xpu.get_test_cover_info import (
+from get_test_cover_info import (
     XPUOpTestWrapper,
     create_test_class,
     get_xpu_op_support_types,
 )
+from op_test_xpu import XPUOpTest
 
 import paddle
 

python/paddle/fluid/tests/unittests/xpu/test_bilinear_interp_op_xpu.py → test/xpu/test_bilinear_interp_op_xpu.py

@@ -12,13 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import sys
 import unittest
 
 import paddle
 
-sys.path.append("..")
-
 paddle.enable_static()
 '''
 def bilinear_interp_np(input,

python/paddle/fluid/tests/unittests/xpu/test_bilinear_interp_v2_op_xpu.py → test/xpu/test_bilinear_interp_v2_op_xpu.py

@@ -12,19 +12,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import sys
 import unittest
 
 import numpy as np
-
-sys.path.append("..")
-
-from op_test_xpu import XPUOpTest
-from xpu.get_test_cover_info import (
+from get_test_cover_info import (
     XPUOpTestWrapper,
     create_test_class,
     get_xpu_op_support_types,
 )
+from op_test_xpu import XPUOpTest
 
 import paddle
 

python/paddle/fluid/tests/unittests/xpu/test_bitwise_op_xpu.py → test/xpu/test_bitwise_op_xpu.py

@@ -15,17 +15,16 @@
 import sys
 import unittest
 
-import numpy as np
-
-sys.path.append("..")
+sys.path.append('../../python/paddle/fluid/tests/unittests')
 
+import numpy as np
 from eager_op_test import OpTest
-from op_test_xpu import XPUOpTest
-from xpu.get_test_cover_info import (
+from get_test_cover_info import (
     XPUOpTestWrapper,
     create_test_class,
     get_xpu_op_support_types,
 )
+from op_test_xpu import XPUOpTest
 
 import paddle
 

python/paddle/fluid/tests/unittests/xpu/test_bmm_op_xpu.py → test/xpu/test_bmm_op_xpu.py

@@ -10,19 +10,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import sys
-
-sys.path.append("..")
-
 import unittest
 
 import numpy as np
-from op_test_xpu import XPUOpTest
-from xpu.get_test_cover_info import (
+from get_test_cover_info import (
     XPUOpTestWrapper,
     create_test_class,
     get_xpu_op_support_types,
 )
+from op_test_xpu import XPUOpTest
 
 import paddle
 

python/paddle/fluid/tests/unittests/xpu/test_c_concat.py → test/xpu/test_c_concat.py

@@ -12,21 +12,17 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import sys
 import unittest
 
-from test_collective_base_xpu import TestDistBase
-
-import paddle
-from paddle.fluid import core
-
-sys.path.append("..")
-
-from xpu.get_test_cover_info import (
+from get_test_cover_info import (
     XPUOpTestWrapper,
     create_test_class,
     get_xpu_op_support_types,
 )
+from test_collective_base_xpu import TestDistBase
+
+import paddle
+from paddle.fluid import core
 
 paddle.enable_static()
 

python/paddle/fluid/tests/unittests/xpu/test_c_embedding_op_xpu.py → test/xpu/test_c_embedding_op_xpu.py

@@ -12,10 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import sys
 import unittest
 
-sys.path.append("..")
 import paddle
 from paddle.fluid.tests.unittests.c_embedding_op_base import (
     TestCEmbeddingCPU,

python/paddle/fluid/tests/unittests/xpu/test_c_split.py → test/xpu/test_c_split.py

@@ -12,21 +12,17 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import sys
 import unittest
 
-from test_collective_base_xpu import TestDistBase
-
-import paddle
-from paddle.fluid import core
-
-sys.path.append("..")
-
-from xpu.get_test_cover_info import (
+from get_test_cover_info import (
     XPUOpTestWrapper,
     create_test_class,
     get_xpu_op_support_types,
 )
+from test_collective_base_xpu import TestDistBase
+
+import paddle
+from paddle.fluid import core
 
 paddle.enable_static()
 

python/paddle/fluid/tests/unittests/xpu/test_cast_op_xpu.py → test/xpu/test_cast_op_xpu.py

@@ -12,18 +12,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import sys
-
-sys.path.append("..")
 import unittest
 
 import numpy as np
-from op_test_xpu import XPUOpTest
-from xpu.get_test_cover_info import (
+from get_test_cover_info import (
     XPUOpTestWrapper,
     create_test_class,
     get_xpu_op_support_types,
 )
+from op_test_xpu import XPUOpTest
 
 import paddle
 from paddle import fluid

python/paddle/fluid/tests/unittests/xpu/test_clip_by_norm_op_xpu.py → test/xpu/test_clip_by_norm_op_xpu.py

@@ -12,18 +12,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import sys
-
-sys.path.append("..")
 import unittest
 
 import numpy as np
-from op_test_xpu import XPUOpTest
-from xpu.get_test_cover_info import (
+from get_test_cover_info import (
     XPUOpTestWrapper,
     create_test_class,
     get_xpu_op_support_types,
 )
+from op_test_xpu import XPUOpTest
 
 import paddle
 

python/paddle/fluid/tests/unittests/xpu/test_clip_op_xpu.py → test/xpu/test_clip_op_xpu.py

@@ -12,18 +12,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import sys
-
-sys.path.append("..")
 import unittest
 
 import numpy as np
-from op_test_xpu import XPUOpTest
-from xpu.get_test_cover_info import (
+from get_test_cover_info import (
     XPUOpTestWrapper,
     create_test_class,
     get_xpu_op_support_types,
 )
+from op_test_xpu import XPUOpTest
 
 import paddle
 from paddle import fluid

python/paddle/fluid/tests/unittests/xpu/test_coalesce_tensor_op_xpu.py → test/xpu/test_coalesce_tensor_op_xpu.py

@@ -12,22 +12,19 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import sys
 import unittest
 
 import numpy as np
 
 from paddle.fluid import core
 
-sys.path.append("..")
-
 alignment = 256
-from op_test_xpu import XPUOpTest
-from xpu.get_test_cover_info import (
+from get_test_cover_info import (
     XPUOpTestWrapper,
     create_test_class,
     get_xpu_op_support_types,
 )
+from op_test_xpu import XPUOpTest
 
 import paddle
 

python/paddle/fluid/tests/unittests/xpu/test_collective_allgather_xpu.py → test/xpu/test_collective_allgather_xpu.py

@@ -12,21 +12,17 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import sys
 import unittest
 
-from test_collective_base_xpu import TestDistBase
-
-import paddle
-from paddle.fluid import core
-
-sys.path.append("..")
-
-from xpu.get_test_cover_info import (
+from get_test_cover_info import (
     XPUOpTestWrapper,
     create_test_class,
     get_xpu_op_support_types,
 )
+from test_collective_base_xpu import TestDistBase
+
+import paddle
+from paddle.fluid import core
 
 paddle.enable_static()
 

python/paddle/fluid/tests/unittests/xpu/test_collective_allreduce_xpu.py → test/xpu/test_collective_allreduce_xpu.py

@@ -12,21 +12,17 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import sys
 import unittest
 
-from test_collective_base_xpu import TestDistBase
-
-import paddle
-from paddle.fluid import core
-
-sys.path.append("..")
-
-from xpu.get_test_cover_info import (
+from get_test_cover_info import (
     XPUOpTestWrapper,
     create_test_class,
     get_xpu_op_support_types,
 )
+from test_collective_base_xpu import TestDistBase
+
+import paddle
+from paddle.fluid import core
 
 paddle.enable_static()
 

python/paddle/fluid/tests/unittests/xpu/test_collective_broadcast_xpu.py → test/xpu/test_collective_broadcast_xpu.py

@@ -12,18 +12,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import sys
 import unittest
 
+from get_test_cover_info import XPUOpTestWrapper, create_test_class
 from test_collective_base_xpu import TestDistBase
 
 import paddle
 from paddle.fluid import core
 
-sys.path.append("..")
-
-from xpu.get_test_cover_info import XPUOpTestWrapper, create_test_class
-
 paddle.enable_static()
 
 

python/paddle/fluid/tests/unittests/xpu/test_collective_identity_xpu.py → test/xpu/test_collective_identity_xpu.py

@@ -12,21 +12,17 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import sys
 import unittest
 
-from test_collective_base_xpu import TestDistBase
-
-import paddle
-from paddle.fluid import core
-
-sys.path.append("..")
-
-from xpu.get_test_cover_info import (
+from get_test_cover_info import (
     XPUOpTestWrapper,
     create_test_class,
     get_xpu_op_support_types,
 )
+from test_collective_base_xpu import TestDistBase
+
+import paddle
+from paddle.fluid import core
 
 paddle.enable_static()
 

python/paddle/fluid/tests/unittests/xpu/test_collective_softmax_with_cross_entropy_xpu.py → test/xpu/test_collective_softmax_with_cross_entropy_xpu.py

@@ -13,22 +13,18 @@
 # limitations under the License.
 
 import os
-import sys
 import unittest
 
 import numpy as np
-from test_collective_base_xpu import DataTypeCast, TestDistBase
-
-import paddle
-from paddle.framework import core
-
-sys.path.append("..")
-
-from xpu.get_test_cover_info import (
+from get_test_cover_info import (
     XPUOpTestWrapper,
     create_test_class,
     get_xpu_op_support_types,
 )
+from test_collective_base_xpu import DataTypeCast, TestDistBase
+
+import paddle
+from paddle.framework import core
 
 paddle.enable_static()
 

python/paddle/fluid/tests/unittests/xpu/test_compare_op_xpu.py → test/xpu/test_compare_op_xpu.py

@@ -12,18 +12,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import sys
-
-sys.path.append("..")
 import unittest
 
 import numpy as np
-from op_test_xpu import XPUOpTest
-from xpu.get_test_cover_info import (
+from get_test_cover_info import (
     XPUOpTestWrapper,
     create_test_class,
     get_xpu_op_support_types,
 )
+from op_test_xpu import XPUOpTest
 
 import paddle
 

python/paddle/fluid/tests/unittests/xpu/test_concat_op_xpu.py → test/xpu/test_concat_op_xpu.py

@@ -13,18 +13,18 @@
 # limitations under the License.
 
 import sys
-
-sys.path.append("..")
 import unittest
 
+sys.path.append('../../python/paddle/fluid/tests/unittests')
+
 import numpy as np
 from eager_op_test import skip_check_grad_ci
-from op_test_xpu import XPUOpTest
-from xpu.get_test_cover_info import (
+from get_test_cover_info import (
     XPUOpTestWrapper,
     create_test_class,
     get_xpu_op_support_types,
 )
+from op_test_xpu import XPUOpTest
 
 import paddle
 

python/paddle/fluid/tests/unittests/xpu/test_conv2d_op_xpu.py → test/xpu/test_conv2d_op_xpu.py

@@ -12,18 +12,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import sys
-
-sys.path.append("..")
 import unittest
 
 import numpy as np
-from op_test_xpu import XPUOpTest
-from xpu.get_test_cover_info import (
+from get_test_cover_info import (
     XPUOpTestWrapper,
     create_test_class,
     get_xpu_op_support_types,
 )
+from op_test_xpu import XPUOpTest
 
 import paddle
 from paddle.fluid import core

python/paddle/fluid/tests/unittests/xpu/test_conv2d_transpose_op_xpu.py → test/xpu/test_conv2d_transpose_op_xpu.py

@@ -12,18 +12,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import sys
-
-sys.path.append("..")
 import unittest
 
 import numpy as np
-from op_test_xpu import XPUOpTest
-from xpu.get_test_cover_info import (
+from get_test_cover_info import (
     XPUOpTestWrapper,
     create_test_class,
     get_xpu_op_support_types,
 )
+from op_test_xpu import XPUOpTest
 
 import paddle
 

python/paddle/fluid/tests/unittests/xpu/test_conv3d_op_xpu.py → test/xpu/test_conv3d_op_xpu.py

@@ -12,14 +12,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import sys
-
-sys.path.append("..")
 import unittest
 
 import numpy as np
+from get_test_cover_info import XPUOpTestWrapper, create_test_class
 from op_test_xpu import XPUOpTest
-from xpu.get_test_cover_info import XPUOpTestWrapper, create_test_class
 
 import paddle
 

python/paddle/fluid/tests/unittests/xpu/test_cumprod_op_xpu.py → test/xpu/test_cumprod_op_xpu.py

@@ -13,19 +13,15 @@
 # limitations under the License.
 
 import random
-import sys
 import unittest
 
 import numpy as np
-
-sys.path.append("..")
-
-from op_test_xpu import XPUOpTest
-from xpu.get_test_cover_info import (
+from get_test_cover_info import (
     XPUOpTestWrapper,
     create_test_class,
     get_xpu_op_support_types,
 )
+from op_test_xpu import XPUOpTest
 
 import paddle
 

python/paddle/fluid/tests/unittests/xpu/test_cumsum_op_xpu.py → test/xpu/test_cumsum_op_xpu.py

@@ -12,19 +12,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import sys
 import unittest
 
 import numpy as np
-
-sys.path.append("..")
-
-from op_test_xpu import XPUOpTest
-from xpu.get_test_cover_info import (
+from get_test_cover_info import (
     XPUOpTestWrapper,
     create_test_class,
     get_xpu_op_support_types,
 )
+from op_test_xpu import XPUOpTest
 
 import paddle
 

python/paddle/fluid/tests/unittests/xpu/test_deformable_conv_op_xpu.py → test/xpu/test_deformable_conv_op_xpu.py

@@ -12,18 +12,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import sys
-
-sys.path.append("..")
 import unittest
 
 import numpy as np
-from op_test_xpu import OpTest, XPUOpTest
-from xpu.get_test_cover_info import (
+from get_test_cover_info import (
     XPUOpTestWrapper,
     create_test_class,
     get_xpu_op_support_types,
 )
+from op_test_xpu import OpTest, XPUOpTest
 
 import paddle
 from paddle.fluid import core

python/paddle/fluid/tests/unittests/xpu/test_depthwise_conv2d_op_xpu.py → test/xpu/test_depthwise_conv2d_op_xpu.py

@@ -12,9 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import sys
-
-sys.path.append("..")
 import unittest
 
 import numpy as np
@@ -22,12 +19,12 @@ import numpy as np
 import paddle
 
 paddle.enable_static()
-from test_conv2d_op_xpu import XPUTestConv2DOp, XPUTestConv2DOp_v2
-from xpu.get_test_cover_info import (
+from get_test_cover_info import (
     XPUOpTestWrapper,
     create_test_class,
     get_xpu_op_support_types,
 )
+from test_conv2d_op_xpu import XPUTestConv2DOp, XPUTestConv2DOp_v2
 
 
 class XPUTestDepthwiseConv2DOp(XPUOpTestWrapper):

python/paddle/fluid/tests/unittests/xpu/test_device_guard_xpu.py → test/xpu/test_device_guard_xpu.py

@@ -12,11 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import sys
 import unittest
-
-sys.path.append("..")
-
 import warnings
 
 import paddle

python/paddle/fluid/tests/unittests/xpu/test_diag_v2_op_xpu.py → test/xpu/test_diag_v2_op_xpu.py

@@ -12,18 +12,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import sys
 import unittest
 
-sys.path.append("..")
-
 import numpy as np
-from op_test_xpu import XPUOpTest
-from xpu.get_test_cover_info import (
+from get_test_cover_info import (
     XPUOpTestWrapper,
     create_test_class,
     get_xpu_op_support_types,
 )
+from op_test_xpu import XPUOpTest
 
 import paddle
 from paddle import fluid

python/paddle/fluid/tests/unittests/xpu/test_diagonal_op_xpu.py → test/xpu/test_diagonal_op_xpu.py

@@ -15,18 +15,18 @@
 import sys
 import unittest
 
-import numpy as np
-
-import paddle
+sys.path.append('../../python/paddle/fluid/tests/unittests')
 
-sys.path.append("..")
+import numpy as np
 from eager_op_test import skip_check_grad_ci
-from op_test_xpu import XPUOpTest
-from xpu.get_test_cover_info import (
+from get_test_cover_info import (
     XPUOpTestWrapper,
     create_test_class,
     get_xpu_op_support_types,
 )
+from op_test_xpu import XPUOpTest
+
+import paddle
 
 paddle.enable_static()
 

python/paddle/fluid/tests/unittests/xpu/test_distribute_fpn_proposals_op_xpu.py → test/xpu/test_distribute_fpn_proposals_op_xpu.py

@@ -11,9 +11,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-import sys
-
-sys.path.append("..")
 import unittest
 
 import numpy as np
@@ -23,7 +20,7 @@ import paddle
 
 paddle.enable_static()
 
-from xpu.get_test_cover_info import (
+from get_test_cover_info import (
     XPUOpTestWrapper,
     create_test_class,
     get_xpu_op_support_types,

python/paddle/fluid/tests/unittests/xpu/test_dropout_op_xpu.py → test/xpu/test_dropout_op_xpu.py

@@ -12,9 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import sys
-
-sys.path.append("..")
 import unittest
 
 import numpy as np
@@ -26,7 +23,7 @@ from paddle.fluid import Program, program_guard
 
 paddle.enable_static()
 
-from xpu.get_test_cover_info import (
+from get_test_cover_info import (
     XPUOpTestWrapper,
     create_test_class,
     get_xpu_op_support_types,

python/paddle/fluid/tests/unittests/xpu/test_einsum_op_xpu.py → test/xpu/test_einsum_op_xpu.py

@@ -12,20 +12,17 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import sys
 import unittest
 
 import numpy as np
-
-import paddle
-
-sys.path.append("..")
-from op_test_xpu import XPUOpTest
-from xpu.get_test_cover_info import (
+from get_test_cover_info import (
     XPUOpTestWrapper,
     create_test_class,
     get_xpu_op_support_types,
 )
+from op_test_xpu import XPUOpTest
+
+import paddle
 
 paddle.enable_static()
 

python/paddle/fluid/tests/unittests/xpu/test_elementwise_add_op_xpu.py → test/xpu/test_elementwise_add_op_xpu.py

@@ -13,19 +13,18 @@
 # limitations under the License.
 
 import sys
-
-import numpy as np
-
-sys.path.append("..")
 import unittest
 
+sys.path.append('../../python/paddle/fluid/tests/unittests')
+
+import numpy as np
 from eager_op_test import OpTest, skip_check_grad_ci
-from op_test_xpu import XPUOpTest
-from xpu.get_test_cover_info import (
+from get_test_cover_info import (
     XPUOpTestWrapper,
     create_test_class,
     get_xpu_op_support_types,
 )
+from op_test_xpu import XPUOpTest
 
 import paddle
 from paddle import fluid

python/paddle/fluid/tests/unittests/xpu/test_elementwise_add_op_xpu_kp.py → test/xpu/test_elementwise_add_op_xpu_kp.py

@@ -13,12 +13,11 @@
 # limitations under the License.
 
 import sys
-
-import numpy as np
-
-sys.path.append("..")
 import unittest
 
+sys.path.append('../../python/paddle/fluid/tests/unittests')
+
+import numpy as np
 from eager_op_test import OpTest, skip_check_grad_ci
 from op_test_xpu import XPUOpTest
 

python/paddle/fluid/tests/unittests/xpu/test_elementwise_div_op_xpu.py → test/xpu/test_elementwise_div_op_xpu.py

@@ -12,18 +12,18 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 import sys
-
-sys.path.append("..")
 import unittest
 
+sys.path.append('../../python/paddle/fluid/tests/unittests')
+
 import numpy as np
 from eager_op_test import skip_check_grad_ci
-from op_test_xpu import XPUOpTest
-from xpu.get_test_cover_info import (
+from get_test_cover_info import (
     XPUOpTestWrapper,
     create_test_class,
     get_xpu_op_support_types,
 )
+from op_test_xpu import XPUOpTest
 
 import paddle
 from paddle import fluid

python/paddle/fluid/tests/unittests/xpu/test_elementwise_floordiv_op_xpu.py → test/xpu/test_elementwise_floordiv_op_xpu.py

@@ -12,18 +12,18 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 import sys
-
-sys.path.append("..")
 import unittest
 
+sys.path.append('../../python/paddle/fluid/tests/unittests')
+
 import numpy as np
 from eager_op_test import OpTest
-from op_test_xpu import XPUOpTest
-from xpu.get_test_cover_info import (
+from get_test_cover_info import (
     XPUOpTestWrapper,
     create_test_class,
     get_xpu_op_support_types,
 )
+from op_test_xpu import XPUOpTest
 
 import paddle
 

python/paddle/fluid/tests/unittests/xpu/test_elementwise_max_op_xpu.py → test/xpu/test_elementwise_max_op_xpu.py

@@ -12,18 +12,18 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 import sys
-
-sys.path.append("..")
 import unittest
 
+sys.path.append('../../python/paddle/fluid/tests/unittests')
+
 import numpy as np
 from eager_op_test import skip_check_grad_ci
-from op_test_xpu import XPUOpTest
-from xpu.get_test_cover_info import (
+from get_test_cover_info import (
     XPUOpTestWrapper,
     create_test_class,
     get_xpu_op_support_types,
 )
+from op_test_xpu import XPUOpTest
 
 import paddle
 

python/paddle/fluid/tests/unittests/xpu/test_elementwise_min_op_xpu.py → test/xpu/test_elementwise_min_op_xpu.py

@@ -12,18 +12,18 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 import sys
-
-sys.path.append("..")
 import unittest
 
+sys.path.append('../../python/paddle/fluid/tests/unittests')
+
 import numpy as np
 from eager_op_test import skip_check_grad_ci
-from op_test_xpu import XPUOpTest
-from xpu.get_test_cover_info import (
+from get_test_cover_info import (
     XPUOpTestWrapper,
     create_test_class,
     get_xpu_op_support_types,
 )
+from op_test_xpu import XPUOpTest
 
 import paddle
 

python/paddle/fluid/tests/unittests/xpu/test_elementwise_mod_op_xpu.py → test/xpu/test_elementwise_mod_op_xpu.py

@@ -12,18 +12,18 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 import sys
-
-sys.path.append("..")
 import unittest
 
+sys.path.append('../../python/paddle/fluid/tests/unittests')
+
 import numpy as np
 from eager_op_test import OpTest
-from op_test_xpu import XPUOpTest
-from xpu.get_test_cover_info import (
+from get_test_cover_info import (
     XPUOpTestWrapper,
     create_test_class,
     get_xpu_op_support_types,
 )
+from op_test_xpu import XPUOpTest
 
 import paddle
 from paddle import fluid

python/paddle/fluid/tests/unittests/xpu/test_elementwise_mul_op_xpu.py → test/xpu/test_elementwise_mul_op_xpu.py

@@ -12,18 +12,18 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 import sys
-
-sys.path.append("..")
 import unittest
 
+sys.path.append('../../python/paddle/fluid/tests/unittests')
+
 import numpy as np
 from eager_op_test import OpTest, skip_check_grad_ci
-from op_test_xpu import XPUOpTest
-from xpu.get_test_cover_info import (
+from get_test_cover_info import (
     XPUOpTestWrapper,
     create_test_class,
     get_xpu_op_support_types,
 )
+from op_test_xpu import XPUOpTest
 
 import paddle
 

python/paddle/fluid/tests/unittests/xpu/test_elementwise_pow_op_xpu.py → test/xpu/test_elementwise_pow_op_xpu.py

@@ -12,18 +12,18 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 import sys
-
-sys.path.append("..")
 import unittest
 
+sys.path.append('../../python/paddle/fluid/tests/unittests')
+
 import numpy as np
 from eager_op_test import OpTest, skip_check_grad_ci
-from op_test_xpu import XPUOpTest
-from xpu.get_test_cover_info import (
+from get_test_cover_info import (
     XPUOpTestWrapper,
     create_test_class,
     get_xpu_op_support_types,
 )
+from op_test_xpu import XPUOpTest
 
 import paddle
 

python/paddle/fluid/tests/unittests/xpu/test_elementwise_sub_op_xpu.py → test/xpu/test_elementwise_sub_op_xpu.py

@@ -13,19 +13,18 @@
 # limitations under the License.
 
 import sys
-
-import numpy as np
-
-sys.path.append("..")
 import unittest
 
+sys.path.append('../../python/paddle/fluid/tests/unittests')
+
+import numpy as np
 from eager_op_test import skip_check_grad_ci
-from op_test_xpu import XPUOpTest
-from xpu.get_test_cover_info import (
+from get_test_cover_info import (
     XPUOpTestWrapper,
     create_test_class,
     get_xpu_op_support_types,
 )
+from op_test_xpu import XPUOpTest
 
 import paddle
 

python/paddle/fluid/tests/unittests/xpu/test_empty_op_xpu.py → test/xpu/test_empty_op_xpu.py

@@ -12,19 +12,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import sys
-
-sys.path.append("..")
-
 import unittest
 
 import numpy as np
-from op_test_xpu import XPUOpTest
-from xpu.get_test_cover_info import (
+from get_test_cover_info import (
     XPUOpTestWrapper,
     create_test_class,
     get_xpu_op_support_types,
 )
+from op_test_xpu import XPUOpTest
 
 import paddle
 from paddle.fluid.framework import convert_np_dtype_to_dtype_

python/paddle/fluid/tests/unittests/xpu/test_expand_as_v2_op_xpu.py → test/xpu/test_expand_as_v2_op_xpu.py

@@ -12,18 +12,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import sys
 import unittest
 
 import numpy as np
-
-sys.path.append("..")
-from op_test_xpu import XPUOpTest
-from xpu.get_test_cover_info import (
+from get_test_cover_info import (
     XPUOpTestWrapper,
     create_test_class,
     get_xpu_op_support_types,
 )
+from op_test_xpu import XPUOpTest
 
 import paddle
 from paddle import fluid

python/paddle/fluid/tests/unittests/xpu/test_expand_v2_op_xpu.py → test/xpu/test_expand_v2_op_xpu.py

@@ -12,18 +12,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import sys
 import unittest
 
 import numpy as np
-
-sys.path.append("..")
-from op_test_xpu import XPUOpTest
-from xpu.get_test_cover_info import (
+from get_test_cover_info import (
     XPUOpTestWrapper,
     create_test_class,
     get_xpu_op_support_types,
 )
+from op_test_xpu import XPUOpTest
 
 import paddle
 from paddle import fluid

python/paddle/fluid/tests/unittests/xpu/test_fill_any_like_op_xpu.py → test/xpu/test_fill_any_like_op_xpu.py

@@ -12,19 +12,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import sys
-
-sys.path.append("..")
-
 import unittest
 
 import numpy as np
-from op_test_xpu import XPUOpTest
-from xpu.get_test_cover_info import (
+from get_test_cover_info import (
     XPUOpTestWrapper,
     create_test_class,
     get_xpu_op_support_types,
 )
+from op_test_xpu import XPUOpTest
 
 import paddle
 

python/paddle/fluid/tests/unittests/xpu/test_fill_any_op_xpu.py → test/xpu/test_fill_any_op_xpu.py

@@ -12,18 +12,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import sys
-
-sys.path.append("..")
 import unittest
 
 import numpy as np
-from op_test_xpu import XPUOpTest
-from xpu.get_test_cover_info import (
+from get_test_cover_info import (
     XPUOpTestWrapper,
     create_test_class,
     get_xpu_op_support_types,
 )
+from op_test_xpu import XPUOpTest
 
 import paddle
 

python/paddle/fluid/tests/unittests/xpu/test_fill_constant_op_xpu.py → test/xpu/test_fill_constant_op_xpu.py

@@ -13,18 +13,18 @@
 # limitations under the License.
 
 import sys
-
-sys.path.append("..")
 import unittest
 
+sys.path.append('../../python/paddle/fluid/tests/unittests')
+
 import numpy as np
 from eager_op_test import convert_float_to_uint16
-from op_test_xpu import XPUOpTest
-from xpu.get_test_cover_info import (
+from get_test_cover_info import (
     XPUOpTestWrapper,
     create_test_class,
     get_xpu_op_support_types,
 )
+from op_test_xpu import XPUOpTest
 
 import paddle
 

python/paddle/fluid/tests/unittests/xpu/test_fill_diagonal_tensor_op_xpu.py → test/xpu/test_fill_diagonal_tensor_op_xpu.py

@@ -15,18 +15,18 @@
 import sys
 import unittest
 
-import numpy as np
-
-import paddle
+sys.path.append('../../python/paddle/fluid/tests/unittests')
 
-sys.path.append("..")
+import numpy as np
 from eager_op_test import skip_check_grad_ci
-from op_test_xpu import XPUOpTest
-from xpu.get_test_cover_info import (
+from get_test_cover_info import (
     XPUOpTestWrapper,
     create_test_class,
     get_xpu_op_support_types,
 )
+from op_test_xpu import XPUOpTest
+
+import paddle
 
 paddle.enable_static()
 

python/paddle/fluid/tests/unittests/xpu/test_fill_op_xpu.py → test/xpu/test_fill_op_xpu.py

@@ -12,18 +12,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import sys
-
-sys.path.append("..")
 import unittest
 
 import numpy as np
-from op_test_xpu import XPUOpTest
-from xpu.get_test_cover_info import (
+from get_test_cover_info import (
     XPUOpTestWrapper,
     create_test_class,
     get_xpu_op_support_types,
 )
+from op_test_xpu import XPUOpTest
 
 import paddle
 from paddle.fluid import core

python/paddle/fluid/tests/unittests/xpu/test_flatten2_op_xpu.py → test/xpu/test_flatten2_op_xpu.py

@@ -12,17 +12,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import sys
 import unittest
 
-sys.path.append("..")
 import numpy as np
-from op_test_xpu import XPUOpTest
-from xpu.get_test_cover_info import (
+from get_test_cover_info import (
     XPUOpTestWrapper,
     create_test_class,
     get_xpu_op_support_types,
 )
+from op_test_xpu import XPUOpTest
 
 import paddle
 

python/paddle/fluid/tests/unittests/xpu/test_flatten_contiguous_range_op_xpu.py → test/xpu/test_flatten_contiguous_range_op_xpu.py

@@ -12,21 +12,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import sys
-
-sys.path.append("..")
-import sys
 import unittest
 
 import numpy as np
-
-sys.path.append("..")
-from op_test_xpu import XPUOpTest
-from xpu.get_test_cover_info import (
+from get_test_cover_info import (
     XPUOpTestWrapper,
     create_test_class,
     get_xpu_op_support_types,
 )
+from op_test_xpu import XPUOpTest
 
 import paddle
 

python/paddle/fluid/tests/unittests/xpu/test_flatten_op_xpu.py → test/xpu/test_flatten_op_xpu.py

@@ -12,17 +12,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import sys
 import unittest
 
-sys.path.append("..")
 import numpy as np
-from op_test_xpu import XPUOpTest
-from xpu.get_test_cover_info import (
+from get_test_cover_info import (
     XPUOpTestWrapper,
     create_test_class,
     get_xpu_op_support_types,
 )
+from op_test_xpu import XPUOpTest
 
 import paddle
 

python/paddle/fluid/tests/unittests/xpu/test_fused_attention_op_xpu.py → test/xpu/test_fused_attention_op_xpu.py

@@ -12,20 +12,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import sys
-
-import numpy as np
-
-sys.path.append("..")
-
 import unittest
 
-from op_test_xpu import XPUOpTest
-from xpu.get_test_cover_info import (
+import numpy as np
+from get_test_cover_info import (
     XPUOpTestWrapper,
     create_test_class,
     get_xpu_op_support_types,
 )
+from op_test_xpu import XPUOpTest
 
 import paddle
 import paddle.incubate.nn.functional as incubate_f

python/paddle/fluid/tests/unittests/xpu/test_fused_feedforward_op_xpu.py → test/xpu/test_fused_feedforward_op_xpu.py

@@ -11,16 +11,11 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-import sys
-
-import numpy as np
-
-sys.path.append("..")
-
 import unittest
 
+import numpy as np
+from get_test_cover_info import XPUOpTestWrapper, create_test_class
 from op_test_xpu import XPUOpTest
-from xpu.get_test_cover_info import XPUOpTestWrapper, create_test_class
 
 import paddle
 import paddle.incubate.nn.functional as incubate_f

python/paddle/fluid/tests/unittests/xpu/test_fused_gemm_epilogue_grad_op_xpu.py → test/xpu/test_fused_gemm_epilogue_grad_op_xpu.py

@@ -13,19 +13,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import sys
-
-sys.path.append("..")
-
 import unittest
 
 import numpy as np
-from op_test_xpu import XPUOpTest
-from xpu.get_test_cover_info import (
+from get_test_cover_info import (
     XPUOpTestWrapper,
     create_test_class,
     get_xpu_op_support_types,
 )
+from op_test_xpu import XPUOpTest
 
 import paddle
 from paddle.fluid import core

python/paddle/fluid/tests/unittests/xpu/test_fused_gemm_epilogue_op_xpu.py → test/xpu/test_fused_gemm_epilogue_op_xpu.py

@@ -13,18 +13,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import sys
-
-sys.path.append("..")
 import unittest
 
 import numpy as np
-from op_test_xpu import XPUOpTest
-from xpu.get_test_cover_info import (
+from get_test_cover_info import (
     XPUOpTestWrapper,
     create_test_class,
     get_xpu_op_support_types,
 )
+from op_test_xpu import XPUOpTest
 
 import paddle
 from paddle import _legacy_C_ops

python/paddle/fluid/tests/unittests/xpu/test_fused_resnet_basic_block_op_xpu.py → test/xpu/test_fused_resnet_basic_block_op_xpu.py

@@ -13,13 +13,13 @@
 # limitations under the License.
 
 import sys
-
-sys.path.append("..")
 import unittest
 
+sys.path.append('../../python/paddle/fluid/tests/unittests')
+
 import numpy as np
 from eager_op_test import OpTest
-from xpu.get_test_cover_info import (
+from get_test_cover_info import (
     XPUOpTestWrapper,
     create_test_class,
     get_xpu_op_support_types,

python/paddle/fluid/tests/unittests/xpu/test_gather_nd_op_xpu.py → test/xpu/test_gather_nd_op_xpu.py

@@ -12,19 +12,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import sys
 import unittest
 
 import numpy as np
-
-sys.path.append("..")
-
-from op_test_xpu import XPUOpTest
-from xpu.get_test_cover_info import (
+from get_test_cover_info import (
     XPUOpTestWrapper,
     create_test_class,
     get_xpu_op_support_types,
 )
+from op_test_xpu import XPUOpTest
 
 import paddle
 

python/paddle/fluid/tests/unittests/xpu/test_gather_op_xpu.py → test/xpu/test_gather_op_xpu.py

@@ -12,18 +12,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import sys
 import unittest
 
-sys.path.append("..")
-
 import numpy as np
-from op_test_xpu import XPUOpTest
-from xpu.get_test_cover_info import (
+from get_test_cover_info import (
     XPUOpTestWrapper,
     create_test_class,
     get_xpu_op_support_types,
 )
+from op_test_xpu import XPUOpTest
 
 import paddle
 

python/paddle/fluid/tests/unittests/xpu/test_gaussian_random_op_xpu.py → test/xpu/test_gaussian_random_op_xpu.py

@@ -12,18 +12,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import sys
-
-sys.path.append("..")
 import unittest
 
 import numpy as np
-from op_test_xpu import XPUOpTest
-from xpu.get_test_cover_info import (
+from get_test_cover_info import (
     XPUOpTestWrapper,
     create_test_class,
     get_xpu_op_support_types,
 )
+from op_test_xpu import XPUOpTest
 
 import paddle
 from paddle import fluid

python/paddle/fluid/tests/unittests/xpu/test_gen_bkcl_id_op.py → test/xpu/test_gen_bkcl_id_op.py

@@ -13,10 +13,7 @@
 # limitations under the License.
 
 import os
-import sys
 import unittest
-
-sys.path.append("..")
 from multiprocessing import Process
 
 from launch_function_helper import _find_free_port, wait

python/paddle/fluid/tests/unittests/xpu/test_generate_proposals_v2_op_xpu.py → test/xpu/test_generate_proposals_v2_op_xpu.py

@@ -12,22 +12,17 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import sys
-import unittest
-
-import numpy as np
-
-sys.path.append("..")
-
 import copy
 import math
+import unittest
 
-from op_test_xpu import XPUOpTest
-from xpu.get_test_cover_info import (
+import numpy as np
+from get_test_cover_info import (
     XPUOpTestWrapper,
     create_test_class,
     get_xpu_op_support_types,
 )
+from op_test_xpu import XPUOpTest
 
 import paddle
 from paddle.fluid import core

python/paddle/fluid/tests/unittests/xpu/test_grid_sampler_op_xpu.py → test/xpu/test_grid_sampler_op_xpu.py

@@ -12,19 +12,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import sys
 import unittest
 
 import numpy as np
-
-sys.path.append("..")
-
-from op_test_xpu import XPUOpTest
-from xpu.get_test_cover_info import (
+from get_test_cover_info import (
     XPUOpTestWrapper,
     create_test_class,
     get_xpu_op_support_types,
 )
+from op_test_xpu import XPUOpTest
 
 import paddle
 

python/paddle/fluid/tests/unittests/xpu/test_group_norm_op_xpu.py → test/xpu/test_group_norm_op_xpu.py

@@ -15,17 +15,16 @@
 import sys
 import unittest
 
-import numpy as np
-
-sys.path.append("..")
+sys.path.append('../../python/paddle/fluid/tests/unittests')
 
+import numpy as np
 from eager_op_test import OpTest
-from op_test_xpu import XPUOpTest
-from xpu.get_test_cover_info import (
+from get_test_cover_info import (
     XPUOpTestWrapper,
     create_test_class,
     get_xpu_op_support_types,
 )
+from op_test_xpu import XPUOpTest
 
 import paddle