resolve conflict

hushenwei2000 · hushenwei2000 · commit a8b9ba67f134 · 2025-09-08T07:56:54.000Z
diff --git a/paddleformers/trainer/training_args.py b/paddleformers/trainer/training_args.py
@@ -1092,11 +1092,11 @@ class TrainingArguments:
         default=False,
         metadata={"help": "Save model to HuggingFace safetensors."},
     )
+    pp_seg_method: Optional[str] = field(default=None, metadata={"help": "PP Segmentation Method"})
     dsv3_fast_pretrain: Optional[bool] = field(
         default=False,
         metadata={"help": "Use fast pretrain version of DeepSeekV3."},
     )
-    pp_seg_method: Optional[str] = field(default=None, metadata={"help": "PP Segmentation Method"})
 
     def __post_init__(self):
         world_size = paddle.distributed.get_world_size()

Original file line number	Diff line number	Diff line change
`@@ -1092,11 +1092,11 @@ class TrainingArguments:`
`1092`	`1092`	`default=False,`
`1093`	`1093`	`metadata={"help": "Save model to HuggingFace safetensors."},`
`1094`	`1094`	`)`
	`1095`	`+ pp_seg_method: Optional[str] = field(default=None, metadata={"help": "PP Segmentation Method"})`
`1095`	`1096`	`dsv3_fast_pretrain: Optional[bool] = field(`
`1096`	`1097`	`default=False,`
`1097`	`1098`	`metadata={"help": "Use fast pretrain version of DeepSeekV3."},`
`1098`	`1099`	`)`
`1099`		`- pp_seg_method: Optional[str] = field(default=None, metadata={"help": "PP Segmentation Method"})`
`1100`	`1100`
`1101`	`1101`	`def __post_init__(self):`
`1102`	`1102`	`world_size = paddle.distributed.get_world_size()`