From 9997aa078b4da35e04bb492a8a27d45141f4b80b Mon Sep 17 00:00:00 2001
From: xvxuopop <xvxuopop@gmail.com>
Date: Sat, 31 Oct 2026 18:28:09 +0800
Subject: [PATCH] [v1] Fix custom model export with FSDP2 (#10916)

---
 .../trainer_plugins/distributed/fsdp2.py      | 18 +++++++++++--
 .../trainer_plugins/distributed/test_fsdp2.py | 25 +++++++++++++++++++
 2 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/src/llamafactory/v1/plugins/trainer_plugins/distributed/fsdp2.py b/src/llamafactory/v1/plugins/trainer_plugins/distributed/fsdp2.py
index ee539ac01..af2fa01ba 100644
--- a/src/llamafactory/v1/plugins/trainer_plugins/distributed/fsdp2.py
+++ b/src/llamafactory/v1/plugins/trainer_plugins/distributed/fsdp2.py
@@ -29,6 +29,7 @@ from torch.distributed.checkpoint.state_dict import (
 )
 from torch.distributed.fsdp import (
     CPUOffloadPolicy,
+    FSDPModule,
     MixedPrecisionPolicy,
     fully_shard,
 )
@@ -124,6 +125,19 @@ def get_transformer_layer_cls(model: HFModel) -> set[type[nn.Module]]:
     return set()
 
 
+def _save_pretrained(model: HFModel, output_dir: str, state_dict: dict) -> None:
+    """Serialize remote model code using its original class instead of FSDP2's generated wrapper."""
+    model_cls = type(model)
+    if isinstance(model, FSDPModule) and getattr(model_cls, "_auto_class", None) is not None:
+        # fully_shard creates a class with bases (FSDPModule, original_model_class).
+        # HF otherwise copies PyTorch's FSDP source and writes an unloadable auto_map.
+        model.__class__ = model_cls.__bases__[1]
+    try:
+        model.save_pretrained(output_dir, state_dict=state_dict, max_shard_size="4GB")
+    finally:
+        model.__class__ = model_cls
+
+
 def save_model(model: HFModel, output_dir: str, processor: Processor) -> None:
     if DistributedInterface().get_rank() == 0:
         logger.info("Gathering state dict for saving...")
@@ -134,7 +148,7 @@ def save_model(model: HFModel, output_dir: str, processor: Processor) -> None:
 
     if DistributedInterface().get_rank() == 0:
         model_to_save = model.module if hasattr(model, "module") else model
-        model_to_save.save_pretrained(output_dir, state_dict=state_dict, max_shard_size="4GB")
+        _save_pretrained(model_to_save, output_dir, state_dict)
         processor.save_pretrained(output_dir, max_shard_size="4GB")
         logger.info(f"Model saved to {output_dir}")
 
@@ -164,7 +178,7 @@ def save_checkpoint(model: HFModel, optimizer: torch.optim.Optimizer, ckpt_dir:
         if DistributedInterface().get_rank() == 0:
             model_to_save = model.module if hasattr(model, "module") else model
             hf_dir = os.path.join(ckpt_dir, "hf_model")
-            model_to_save.save_pretrained(hf_dir, state_dict=hf_state_dict, max_shard_size="4GB")
+            _save_pretrained(model_to_save, hf_dir, hf_state_dict)
             if processor is not None:
                 processor.save_pretrained(hf_dir, max_shard_size="4GB")
 
diff --git a/tests_v1/plugins/trainer_plugins/distributed/test_fsdp2.py b/tests_v1/plugins/trainer_plugins/distributed/test_fsdp2.py
index cf4e6718f..851d82207 100644
--- a/tests_v1/plugins/trainer_plugins/distributed/test_fsdp2.py
+++ b/tests_v1/plugins/trainer_plugins/distributed/test_fsdp2.py
@@ -21,6 +21,9 @@ and non-persistent buffers by comparing it with the standard non-meta path.
 from types import SimpleNamespace
 
 import torch
+import torch.distributed as dist
+from torch.distributed.device_mesh import init_device_mesh
+from torch.distributed.fsdp import FSDPModule, fully_shard
 from transformers import AutoConfig
 
 from llamafactory.v1.accelerator.interface import DistributedInterface
@@ -45,6 +48,28 @@ def collect_non_persistent_buffers(model):
     return result
 
 
+def test_fsdp2_save_pretrained_uses_original_model_class():
+    """Save using the original custom model class and restore the FSDP2 wrapper."""
+    saved_classes = []
+
+    class CustomModel(torch.nn.Module):
+        _auto_class = "AutoModel"
+
+        def save_pretrained(self, *args, **kwargs):
+            saved_classes.append(type(self))
+
+    model = CustomModel()
+    dist.init_process_group("gloo", store=dist.HashStore(), rank=0, world_size=1)
+    fully_shard(model, mesh=init_device_mesh("cpu", (1,)))
+    wrapper_cls = type(model)
+    assert isinstance(model, FSDPModule)
+
+    fsdp2_module._save_pretrained(model, "unused", {})
+
+    assert saved_classes == [CustomModel]
+    assert type(model) is wrapper_cls
+
+
 def test_fsdp2_rank0_syncs_non_persistent_buffers(monkeypatch):
     expected = torch.tensor([1.0, 0.5, 0.25])