Skip to content

Commit 20a53b1

Browse files
Add some warnings and fix RLHF (#1890)
1 parent 27e1e76 commit 20a53b1

File tree

6 files changed

+16
-7
lines changed

6 files changed

+16
-7
lines changed

swift/llm/eval.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,6 @@ def vlmeval_runner(args: EvalArguments, dataset: List[str], model_type: str, is_
260260

261261

262262
def eval_opencompass(args: EvalArguments) -> List[Dict[str, Any]]:
263-
from evalscope.run import run_task
264263
from swift.utils.torch_utils import _find_free_port
265264
logger.info(f'args: {args}')
266265
if args.eval_few_shot:
@@ -297,12 +296,16 @@ def eval_opencompass(args: EvalArguments) -> List[Dict[str, Any]]:
297296
nlp_datasets = set(OpenCompassBackendManager.list_datasets()) & set(args.eval_dataset)
298297
mm_datasets = set(VLMEvalKitBackendManager.list_supported_datasets()) & set(args.eval_dataset)
299298

299+
final_report = []
300300
for dataset, runner in zip([list(nlp_datasets), list(mm_datasets)], [opencompass_runner, vlmeval_runner]):
301301
if not dataset:
302302
continue
303303

304-
final_report = runner(args, dataset, model_type, is_chat, url)
305-
logger.info(f'Final report:{final_report}\n')
304+
report = runner(args, dataset, model_type, is_chat, url)
305+
logger.info(f'Final report:{report}\n')
306+
final_report.extend(report)
307+
if not final_report:
308+
raise ValueError(f'Cannot load final report, please check your dataset: {args.eval_dataset} and the eval log')
306309
if process:
307310
process.kill()
308311
return final_report

swift/trainers/cpo_trainer.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77

88
from swift.llm.utils.template import Template
99
from swift.utils import get_logger
10-
from .mixin import PushToMsHubMixin, SwiftMixin
10+
from .mixin import SwiftMixin
11+
from .push_to_ms import PushToMsHubMixin
1112
from .utils import build_tokenized_answer, patch_trl, sort_by_max_length
1213

1314
logger = get_logger()

swift/trainers/dpo_trainer.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88

99
from swift.llm.utils.template import Template
1010
from swift.utils import get_logger
11-
from .mixin import PushToMsHubMixin, SwiftMixin
11+
from .mixin import SwiftMixin
12+
from .push_to_ms import PushToMsHubMixin
1213
from .utils import build_tokenized_answer, patch_trl, sort_by_max_length
1314

1415
logger = get_logger()

swift/trainers/kto_trainer.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010
from swift.llm.utils.template import Context, History, Template
1111
from swift.utils import get_logger
1212
from .callback import DefaultFlowCallbackNew, PrinterCallbackNew, ProgressCallbackNew
13-
from .mixin import PushToMsHubMixin, SwiftMixin
13+
from .mixin import SwiftMixin
14+
from .push_to_ms import PushToMsHubMixin
1415

1516
logger = get_logger()
1617

swift/trainers/orpo_trainer.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77

88
from swift.llm.utils.template import Template
99
from swift.utils import get_logger
10-
from .mixin import PushToMsHubMixin, SwiftMixin
10+
from .mixin import SwiftMixin
11+
from .push_to_ms import PushToMsHubMixin
1112
from .utils import build_tokenized_answer, patch_trl, sort_by_max_length
1213

1314
logger = get_logger()

swift/ui/llm_train/runtime.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -440,6 +440,8 @@ def parse_info_from_cmdline(task):
440440
args = task.split('swift sft')[1]
441441
elif 'swift rlhf' in task:
442442
args = task.split('swift rlhf')[1]
443+
else:
444+
raise ValueError(f'Cannot parse cmd line: {task}')
443445
args = [arg.strip() for arg in args.split('--') if arg.strip()]
444446
all_args = {}
445447
for i in range(len(args)):

0 commit comments

Comments
 (0)