fix ci failed test

Author: risemeup1

.github/workflows/fleet-release-test.yml

@@ -1276,14 +1276,13 @@ jobs:
           docker exec -i -e "python_version=${{ env.python_version }}" ${{ env.container_name }} /bin/bash <<-DOCKER_EOF
           echo "Change python version to $python_version"
           set -e
-          cp ${{ github.workspace }}/../../../Miniconda3-latest-Linux-x86_64.sh /tmp/miniconda.sh
-          bash /tmp/miniconda.sh -b -p /opt/conda
-          export PATH=/opt/conda/bin:$PATH
-          conda tos accept --override-channels --channel https://repo.anaconda.com/pkgs/main
-          conda tos accept --override-channels --channel https://repo.anaconda.com/pkgs/r
-          conda create -n py_$python_version python=$python_version -y
+          cp /home/models/Miniforge3-Linux-x86_64.sh /tmp/miniforge.sh
+          bash /tmp/miniforge.sh -b -p /opt/conda
+          /opt/conda/bin/conda create -n py_\$python_version python=\$python_version -y \
+            --override-channels \
+            -c conda-forge
           . /opt/conda/etc/profile.d/conda.sh
-          conda activate py_$python_version
+          conda activate py_\$python_version
           python --version
           DOCKER_EOF
       - name: Test

paddleformers/trainer/argparser.py

@@ -20,6 +20,7 @@
 import json
 import os
 import sys
+import types
 from argparse import (
     ArgumentDefaultsHelpFormatter,
     ArgumentParser,
@@ -112,6 +113,15 @@ def _parse_dataclass_field(
             )
 
         origin_type = getattr(field.type, "__origin__", field.type)
+        # Python 3.10+ `str | None` syntax produces types.UnionType, normalize it to typing.Union
+        if isinstance(field.type, types.UnionType):
+            args = field.type.__args__
+            field.type = (
+                Optional[args[0]]
+                if len(args) == 2 and type(None) in args
+                else Union[args]
+            )
+            origin_type = Union
         if origin_type is Union:
             if (
                 len(field.type.__args__) != 2

paddleformers/utils/__init__.py

@@ -52,6 +52,7 @@
         "is_datasets_available",
         "is_transformers_available",
         "is_paddleformers_available",
+        "is_paddlefleet_available",
         "dynamic_graph_pybind_context",
         "custom_import",
         "direct_paddleformers_import",

paddleformers/utils/import_utils.py

@@ -246,6 +246,16 @@ def is_paddle_available() -> bool:
     return is_package_available("paddle")
 
 
+def is_paddlefleet_available() -> bool:
+    """Check if paddleformers.fleet is available (PaddleFleet was merged into PaddleFormers)."""
+    try:
+        import paddleformers.fleet  # noqa: F401
+
+        return True
+    except ImportError:
+        return False
+
+
 def is_tiktoken_available():
     return importlib.util.find_spec("tiktoken") is not None
 

tests/fleet/multi_card_tests/pipeline_parallel/test_vpp_balanced_memory_with_shared_weight.py

@@ -19,7 +19,9 @@
     0,
     os.path.dirname(
         os.path.dirname(
-            os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+            os.path.dirname(
+                os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+            )
         )
     ),
 )

tests/fleet/single_card_tests/ai_edited_test/extensions/test_ai_block_mask_utils_2.py

@@ -65,7 +65,9 @@
 _project_root = os.path.dirname(
     os.path.dirname(
         os.path.dirname(
-            os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+            os.path.dirname(
+                os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+            )
         )
     )
 )

tests/fleet/single_card_tests/ai_edited_test/extensions/test_ai_rr_attn_estimate_triton_op_3.py

@@ -65,7 +65,9 @@
 _project_root = os.path.dirname(
     os.path.dirname(
         os.path.dirname(
-            os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+            os.path.dirname(
+                os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+            )
         )
     )
 )

tests/fleet/single_card_tests/ai_edited_test/fp8/test_ai_fp8_module_structure.py

@@ -35,8 +35,9 @@ def _load_fp8_module(mod_name, filename):
         "..",
         "..",
         "..",
-        "src",
-        "paddleformers.fleet",
+        "..",
+        "paddleformers",
+        "fleet",
         "fp8",
         filename,
     )
@@ -74,8 +75,9 @@ def test_fp8_has_linear(self):
             "..",
             "..",
             "..",
-            "src",
-            "paddleformers.fleet",
+            "..",
+            "paddleformers",
+            "fleet",
             "fp8",
             "linear.py",
         )

tests/fleet/single_card_tests/ai_edited_test/fp8/test_ai_fp8_utils.py

@@ -39,8 +39,9 @@ def _load_fp8_utils():
             "..",
             "..",
             "..",
-            "src",
-            "paddleformers.fleet",
+            "..",
+            "paddleformers",
+            "fleet",
             "fp8",
             "utils.py",
         ),

tests/fleet/single_card_tests/ai_edited_test/fp8/test_ai_quantization_3.py

@@ -41,8 +41,9 @@ def _load_quantization_module():
             "..",
             "..",
             "..",
-            "src",
-            "paddleformers.fleet",
+            "..",
+            "paddleformers",
+            "fleet",
             "fp8",
             "quantization.py",
         ),