mirror of
https://github.com/modelscope/FunASR
synced 2025-09-15 14:48:36 +08:00
resolve conflict
This commit is contained in:
parent
28a19dbc4e
commit
dccbcc48a5
@ -1594,11 +1594,7 @@ class AbsTask(ABC):
|
||||
preprocess=iter_options.preprocess_fn,
|
||||
max_cache_size=iter_options.max_cache_size,
|
||||
max_cache_fd=iter_options.max_cache_fd,
|
||||
<<<<<<< HEAD
|
||||
dest_sample_rate=args.frontend_conf["fs"] if args.frontend_conf else 16000,
|
||||
=======
|
||||
dest_sample_rate=dest_sample_rate,
|
||||
>>>>>>> main
|
||||
)
|
||||
cls.check_task_requirements(
|
||||
dataset, args.allow_variable_data_keys, train=iter_options.train
|
||||
|
||||
Loading…
Reference in New Issue
Block a user