resolve conflict

hushenwei2000 · hushenwei2000 · commit 3e8a9f01f63d · 2025-09-08T07:55:47.000Z
diff --git a/paddleformers/trainer/training_args.py b/paddleformers/trainer/training_args.py
@@ -1096,6 +1096,7 @@ class TrainingArguments:
         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
`@@ -1096,6 +1096,7 @@ class TrainingArguments:`
`1096`	`1096`	`default=False,`
`1097`	`1097`	`metadata={"help": "Use fast pretrain version of DeepSeekV3."},`
`1098`	`1098`	`)`
	`1099`	`+ pp_seg_method: Optional[str] = field(default=None, metadata={"help": "PP Segmentation Method"})`
`1099`	`1100`
`1100`	`1101`	`def __post_init__(self):`
`1101`	`1102`	`world_size = paddle.distributed.get_world_size()`