🐛 Fix logging import error (#701)

Author: cangtianhuang

engine.py

@@ -32,12 +32,12 @@
     APITestPaddleTorchGPUPerformance,
     APITestTorchGPUPerformance,
 )
-from tester.api_config.logging.log_runtime import (
+from tester.log_writer.log_runtime import (
     close_process_files,
     configure_direct_results,
     read_log,
 )
-from tester.api_config.logging.log_worker import write_to_log
+from tester.log_writer.log_worker import write_to_log
 
 
 def parse_bool(value):

engineV2.py

@@ -43,7 +43,7 @@
     record_dump_terminal_status,
     resolve_dump_options,
 )
-from tester.api_config.logging import (
+from tester.log_writer import (
     init_log,
     log_aggregation,
     log_report,

engineV4.py

@@ -50,15 +50,15 @@
     record_dump_terminal_status,
     resolve_dump_options,
 )
-from tester.api_config.logging import (
+from tester.api_config.sanitizer_output import analyze_sanitizer_output
+from tester.log_writer import (
     init_log,
     log_aggregation,
     log_report,
     log_retest,
     log_runtime,
     log_worker,
 )
-from tester.api_config.sanitizer_output import analyze_sanitizer_output
 from tester.runtime_config import (
     TestRuntimeConfig,
     limit_worker_layout,

tester/accuracy.py

@@ -8,8 +8,8 @@
 import torch
 import yaml
 
-from .api_config.logging.log_worker import write_to_log
 from .base import APITestBase, gpu_mode_maybe_empty_cache
+from .log_writer.log_worker import write_to_log
 from .paddle_to_torch import adaptive_workspace_bytes, get_converter
 
 # from func_timeout import func_set_timeout

tester/accuracy_stable.py

@@ -9,8 +9,8 @@
 import torch
 
 from .accuracy import process_grad_output, process_output
-from .api_config.logging import log_comparison, log_worker
 from .base import CUDA_ERROR, CUDA_OOM, APITestBase, gpu_mode_memory_decision
+from .log_writer import log_comparison, log_worker
 from .paddle_to_torch import adaptive_workspace_bytes, get_converter
 
 

tester/api_config/config_analyzer.py

@@ -12,6 +12,27 @@
 import yaml
 
 
+def _is_paddle_place(value):
+    value_type = type(value)
+    return value_type.__module__.startswith("paddle.") and value_type.__name__.endswith("Place")
+
+
+def _deepcopy_config_value(value, memo):
+    if _is_paddle_place(value):
+        return value
+    if isinstance(value, list):
+        return [_deepcopy_config_value(item, memo) for item in value]
+    if isinstance(value, tuple):
+        return tuple(_deepcopy_config_value(item, memo) for item in value)
+    if isinstance(value, collections.OrderedDict):
+        return collections.OrderedDict(
+            (key, _deepcopy_config_value(item, memo)) for key, item in value.items()
+        )
+    if isinstance(value, dict):
+        return {key: _deepcopy_config_value(item, memo) for key, item in value.items()}
+    return copy.deepcopy(value, memo)
+
+
 class _LazyTorch:
     def __getattr__(self, name):
         import torch
@@ -237,7 +258,7 @@ def __deepcopy__(self, memo):
         memo[id(self)] = result
         result.shape = copy.deepcopy(self.shape)
         result.dtype = copy.deepcopy(self.dtype)
-        result.place = copy.deepcopy(self.place)
+        result.place = _deepcopy_config_value(self.place, memo)
         result.is_contiguous = self.is_contiguous
         result.strides = copy.deepcopy(self.strides)
         result.numpy_tensor = None
@@ -3726,8 +3747,8 @@ def __deepcopy__(self, memo):
         cls = self.__class__
         result = cls.__new__(cls)
         memo[id(self)] = result
-        result.args = copy.deepcopy(self.args)
-        result.kwargs = copy.deepcopy(self.kwargs)
+        result.args = _deepcopy_config_value(self.args, memo)
+        result.kwargs = _deepcopy_config_value(self.kwargs, memo)
         result.api_name = self.api_name
         return result
 

tester/api_config/dump_writer.py

@@ -546,9 +546,13 @@ def tensor_to_numpy(obj: Any, meta: dict[str, Any]) -> np.ndarray | None:
         tensor = obj.detach().cpu().contiguous()
         try:
             return tensor.numpy()
-        except Exception:
-            meta["stored_as"] = "raw_uint8"
-            return np.frombuffer(tensor.numpy(force=True).tobytes(), dtype=np.uint8)
+        except Exception as err:
+            raw = _torch_tensor_to_raw_uint8_numpy(tensor)
+            if raw is not None:
+                meta["stored_as"] = "raw_uint8"
+                return raw
+            meta["error"] = f"{type(err).__name__}: {err}"
+            return None
     if isinstance(obj, np.ndarray):
         meta.update({"kind": "ndarray", "dtype": str(obj.dtype), "shape": list(obj.shape)})
         return obj
@@ -595,6 +599,20 @@ def _make_yaml_safe(value: Any) -> Any:
     return str(value)
 
 
+def _torch_tensor_to_raw_uint8_numpy(obj: Any) -> np.ndarray | None:
+    try:
+        import torch
+    except Exception:
+        return None
+
+    try:
+        tensor = obj
+        tensor = tensor.detach().cpu().contiguous()
+        return tensor.view(torch.uint8).numpy()
+    except Exception:
+        return None
+
+
 def _now_text() -> str:
     return time.strftime("%Y-%m-%dT%H:%M:%S%z")
 

tester/base.py

@@ -17,9 +17,9 @@
     get_cached_numpy_array,
 )
 from .api_config.dump_writer import DEFAULT_DUMP_DIR, DumpContext, dump_enabled
-from .api_config.logging.log_comparison import log_accuracy_tolerance
-from .api_config.logging.log_schema import MAX_CSV_CONFIG_LENGTH
-from .api_config.logging.log_worker import write_to_log
+from .log_writer.log_comparison import log_accuracy_tolerance
+from .log_writer.log_schema import MAX_CSV_CONFIG_LENGTH
+from .log_writer.log_worker import write_to_log
 from .runtime_config import TestRuntimeConfig
 
 with open("tester/base_config.yaml", encoding="utf-8") as f:

tester/api_config/logging/__init__.py tester/log_writer/__init__.pytester/api_config/logging/__init__.py renamed to tester/log_writer/__init__.py

@@ -1,5 +1,7 @@
 """Paddle API 测试日志包。"""
 
+from __future__ import annotations
+
 from . import log_aggregation as _aggregation
 from . import log_runtime as _runtime
 from . import log_worker as _worker