[API Compatibility] Change compatibility apis to ChangePrefixMatcher, inject paddle.enable_compat(), fix test environment context pollution -part

paconvert/api_matcher.py

@@ -395,7 +395,11 @@ def get_paddle_class_nodes(self, func, args, kwargs):
         if self.transformer.mode == "min":
             self.paddle_api = astor.to_source(func).strip("\n")
         else:
-            self.parse_func(func)
+            func_str = astor.to_source(func).strip("\n")
+            paddle_api = self.get_paddle_api()
+            paddle_class = func_str.rsplit(".", 1)[0]
+            paddle_class_api = paddle_api.rsplit(".", 1)[0]
+            self.paddle_api = paddle_api.replace(paddle_class_api, paddle_class, 1)
 
         args = self.parse_args(args)
         kwargs = self.parse_kwargs(kwargs, allow_none=True)
@@ -5799,7 +5803,9 @@ def reduce_scatter_tensor(output, input, op, group, async_op):
                 if input.shape[0] == world_size:
                     input_list = paddle.unstack(input, axis=0)
                 else:
-                    input_list = paddle.split(input, num_or_sections=world_size, axis=0)
+                    input_list = paddle.tensor.split(
+                        input, num_or_sections=world_size, axis=0
+                    )
                 paddle.distributed.reduce_scatter(output, input_list, op, group, async_op)
             """
         )

paconvert/attribute_mapping.json

@@ -33,8 +33,7 @@
   "torch.Tensor.is_meta": {},
   "torch.Tensor.is_quantized": {},
   "torch.Tensor.is_sparse": {
-    "Matcher": "Attribute2Func",
-    "paddle_api": "paddle.Tensor.is_sparse"
+    "Matcher": "ChangePrefixMatcher"
   },
   "torch.Tensor.is_sparse_csr": {
     "Matcher": "Attribute2Func",

paconvert/transformer/import_transformer.py

@@ -505,7 +505,6 @@ def visit_Module(self, node):
         'import torch_package' has been removed already, add 'import paddle_package'
         """
         super(ImportTransformer, self).generic_visit(node)
-        line_NO = 1
         paddle_package_list = []
         for torch_package in self.imports_map[self.file]["torch_packages"]:
             paddle_package_list.append(
@@ -515,13 +514,29 @@ def visit_Module(self, node):
         for may_torch_package in self.imports_map[self.file]["may_torch_packages"]:
             paddle_package_list.append(may_torch_package)
 
-        for paddle_package in paddle_package_list:
+        import_code = ""
+        enable_compat_code = ""
+        for paddle_package in dict.fromkeys(paddle_package_list):
+            import_code += f"import {paddle_package}\n"
+            if paddle_package == "paddle":
+                enable_compat_code = "paddle.enable_compat(level=2)\n"
+
+        import_code += enable_compat_code
+
+        if import_code:
             log_info(
                 self.logger,
-                f"add 'import {paddle_package}' in line {line_NO}",
+                f"add '{import_code.strip()}' ",
                 self.file_name,
             )
+            import_end = 1 if ast.get_docstring(node, clean=False) else 0
+            while (
+                import_end < len(node.body)
+                and isinstance(node.body[import_end], ast.ImportFrom)
+                and node.body[import_end].module == "__future__"
+            ):
+                import_end += 1
             self.record_scope(
-                (self.root, "body", 0), ast.parse(f"import {paddle_package}").body
+                (self.root, "body", import_end), ast.parse(import_code).body
             )
-            line_NO += 1
+        return node

scripts/ci/run_cpu_unittest.sh

@@ -38,6 +38,10 @@ echo '**************************************************************************
 echo "Checking code cpu unit test by pytest ..."
 set +e
 
+ISOLATED_TESTS=(
+    tests/test_set_num_interop_threads.py
+)
+
 PYTEST_IGNORE=(
     --ignore=tests/test_backends_cuda_is_built.py
     --ignore=tests/test_cuda_is_bf16_supported.py
@@ -49,15 +53,27 @@ PYTEST_IGNORE=(
     --ignore=tests/test_hub_load.py
     --ignore=tests/test_hub_load_state_dict_from_url.py
 )
+for test_file in "${ISOLATED_TESTS[@]}"; do
+    PYTEST_IGNORE+=(--ignore="${test_file}")
+done
+
+python -m pytest -v -s -p no:warnings "${ISOLATED_TESTS[@]}" \
+    --reruns=3 2>&1 | tee pytest.log
+isolated_errors=${PIPESTATUS[0]}
 
-python -m pytest -v -s -p no:warnings "${PYTEST_IGNORE[@]}" --reruns=3 ./tests 2>&1 | tee pytest.log
+python -m pytest -v -s -p no:warnings "${PYTEST_IGNORE[@]}" \
+    --reruns=3 ./tests 2>&1 | tee -a pytest.log
 check_errors=${PIPESTATUS[0]}
 if [ ${check_errors} -ne 0 ]; then
     echo "Rerun CPU unit test"
     python -m pytest -v -s -p no:warnings "${PYTEST_IGNORE[@]}" --lf ./tests 2>&1 | tee -a pytest.log
     check_errors=${PIPESTATUS[0]}
 fi
 
+if [ ${isolated_errors} -ne 0 ]; then
+    check_errors=${isolated_errors}
+fi
+
 echo '******************************************************************************'
 if [ ${check_errors} -ne 0 ]; then
     echo "Your PR code CPU unit test check FAILED"

scripts/ci/run_gpu_unittest.sh

@@ -39,40 +39,40 @@ echo '**************************************************************************
 echo "Checking code gpu unit test by pytest ..."
 set +e
 
+ISOLATED_TESTS=(
+    tests/test_cuda_stream.py
+    tests/test_cuda_CUDAGraph.py
+    tests/test_cuda_set_stream.py
+    tests/test_set_num_interop_threads.py
+)
+
 PYTEST_IGNORE=(
     --ignore=tests/test_hub_download_url_to_file.py
     --ignore=tests/test_hub_help.py
     --ignore=tests/test_hub_list.py
     --ignore=tests/test_hub_load.py
     --ignore=tests/test_hub_load_state_dict_from_url.py
 )
+for test_file in "${ISOLATED_TESTS[@]}"; do
+    PYTEST_IGNORE+=(--ignore="${test_file}")
+done
 
-# Run test_cuda_stream.py separately and FIRST (GPU state is clean),
-# as it can segfault when run after other GPU tests (Paddle FullKernel issue).
-# Running in isolation prevents the segfault from killing the entire test batch.
-python -m pytest -v -s -p no:warnings tests/test_cuda_stream.py 2>&1 | tee pytest.log
-stream_exit=${PIPESTATUS[0]}
+python -m pytest -v -s -p no:warnings "${ISOLATED_TESTS[@]}" \
+    -n 1 --reruns=3 2>&1 | tee pytest.log
+isolated_errors=${PIPESTATUS[0]}
 
-# Run test_cuda_CUDAGraph.py in its own process as well: CUDA graph
-# capture/replay leaves Paddle GPU state that can natively crash later
-# AMP tests (e.g. test_cuda_amp_GradScaler) in the same pytest worker.
-python -m pytest -v -s -p no:warnings tests/test_cuda_CUDAGraph.py 2>&1 | tee -a pytest.log
-cudagraph_exit=${PIPESTATUS[0]}
-
-python -m pytest -v -s -p no:warnings "${PYTEST_IGNORE[@]}" --ignore=tests/test_cuda_stream.py --ignore=tests/test_cuda_CUDAGraph.py -n 1 --reruns=3 ./tests 2>&1 | tee -a pytest.log
+python -m pytest -v -s -p no:warnings "${PYTEST_IGNORE[@]}" \
+    -n 1 --reruns=3 ./tests 2>&1 | tee -a pytest.log
 check_errors=${PIPESTATUS[0]}
 if [ ${check_errors} -ne 0 ]; then
     echo "Rerun GPU unit test"
-    python -m pytest -v -s -p no:warnings "${PYTEST_IGNORE[@]}" --ignore=tests/test_cuda_stream.py --ignore=tests/test_cuda_CUDAGraph.py -n 1 --lf ./tests 2>&1 | tee -a pytest.log
+    python -m pytest -v -s -p no:warnings "${PYTEST_IGNORE[@]}" \
+        -n 1 --lf ./tests 2>&1 | tee -a pytest.log
     check_errors=${PIPESTATUS[0]}
 fi
 
-# Propagate isolated test failures if any
-if [ ${stream_exit} -ne 0 ]; then
-    check_errors=${stream_exit}
-fi
-if [ ${cudagraph_exit} -ne 0 ]; then
-    check_errors=${cudagraph_exit}
+if [ ${isolated_errors} -ne 0 ]; then
+    check_errors=${isolated_errors}
 fi
 
 echo '******************************************************************************'

tests/apibase.py

@@ -16,6 +16,7 @@
 import os
 import re
 import sys
+from contextlib import nullcontext
 
 import numpy as np
 
@@ -24,6 +25,13 @@
 from paconvert.converter import Converter
 
 
+def _pytorch_exec_guard():
+    paddle = sys.modules.get("paddle")
+    if paddle is None:
+        return nullcontext()
+    return paddle.use_compat_guard(enable=False)
+
+
 class APIBase(object):
     def __init__(self, pytorch_api) -> None:
         """
@@ -87,51 +95,59 @@ def run(
         elif compared_tensor_names:
             pytorch_ns = {}
             try:
-                exec(pytorch_code, pytorch_ns)
+                with _pytorch_exec_guard():
+                    exec(pytorch_code, pytorch_ns)
             except Exception as e:
                 raise RuntimeError(f"Failed to execute pytorch code:\n{e}")
             pytorch_result = [pytorch_ns[name] for name in compared_tensor_names]
             pytorch_ns.clear()
 
-            paddle_ns = {}
-            try:
-                exec(paddle_code, paddle_ns)
-            except Exception as e:
-                raise RuntimeError(f"Failed to execute paddle code:\n{e}")
-            paddle_result = [paddle_ns[name] for name in compared_tensor_names]
-            paddle_ns.clear()
+            import paddle
 
-            for i in range(len(compared_tensor_names)):
+            paddle_ns = {}
+            with paddle.use_compat_guard(enable=False):
                 try:
-                    self.compare(
-                        self.pytorch_api,
-                        pytorch_result[i],
-                        paddle_result[i],
-                        check_value,
-                        check_shape,
-                        check_dtype,
-                        check_stop_gradient,
-                        rtol,
-                        atol,
-                    )
+                    exec(paddle_code, paddle_ns)
                 except Exception as e:
-                    raise AssertionError(f"Unable to align results: {e}")
+                    raise RuntimeError(f"Failed to execute paddle code:\n{e}")
+                paddle_result = [paddle_ns[name] for name in compared_tensor_names]
+                paddle_ns.clear()
+
+                for i in range(len(compared_tensor_names)):
+                    try:
+                        self.compare(
+                            self.pytorch_api,
+                            pytorch_result[i],
+                            paddle_result[i],
+                            check_value,
+                            check_shape,
+                            check_dtype,
+                            check_stop_gradient,
+                            rtol,
+                            atol,
+                        )
+                    except Exception as e:
+                        raise AssertionError(f"Unable to align results: {e}")
         else:
             pytorch_ns = {}
             try:
-                exec(pytorch_code, pytorch_ns)
+                with _pytorch_exec_guard():
+                    exec(pytorch_code, pytorch_ns)
             except Exception as e:
                 raise RuntimeError(f"Failed to execute pytorch code:\n{e}")
             finally:
                 pytorch_ns.clear()
 
+            import paddle
+
             paddle_ns = {}
-            try:
-                exec(paddle_code, paddle_ns)
-            except Exception as e:
-                raise RuntimeError(f"Failed to execute paddle code:\n{e}")
-            finally:
-                paddle_ns.clear()
+            with paddle.use_compat_guard(enable=False):
+                try:
+                    exec(paddle_code, paddle_ns)
+                except Exception as e:
+                    raise RuntimeError(f"Failed to execute paddle code:\n{e}")
+                finally:
+                    paddle_ns.clear()
 
     def compare(
         self,