fix conflict

Wanglongzhi2001 · Wanglongzhi2001 · commit 376e87afd9e4 · 2024-10-25T17:06:12.000+08:00
diff --git a/llm/predict/predictor.py b/llm/predict/predictor.py
@@ -134,9 +134,6 @@ class PredictorArgument:
         },
     )
 
-    total_max_length: int = field(
-        default=4096, metadata={"help": "Super parameter. Maximum sequence length(encoder+decoder)."}
-    )
     speculate_method: str = field(
         default=None,
         metadata={

Original file line number	Diff line number	Diff line change
`@@ -134,9 +134,6 @@ class PredictorArgument:`
`134`	`134`	`},`
`135`	`135`	`)`
`136`	`136`
`137`		`- total_max_length: int = field(`
`138`		`- default=4096, metadata={"help": "Super parameter. Maximum sequence length(encoder+decoder)."}`
`139`		`- )`
`140`	`137`	`speculate_method: str = field(`
`141`	`138`	`default=None,`
`142`	`139`	`metadata={`