From 82530ddf974a706df5a6a1e258d80c8dbc3f1d72 Mon Sep 17 00:00:00 2001
From: 游雁 <zhifu.gzf@alibaba-inc.com>
Date: 星期一, 10 六月 2024 09:19:16 +0800
Subject: [PATCH] fix bug
---
funasr/bin/train_ds.py | 56 +++++++++++++++++---------------------------------------
1 files changed, 17 insertions(+), 39 deletions(-)
diff --git a/funasr/bin/train_ds.py b/funasr/bin/train_ds.py
index e4db533..d9b7679 100644
--- a/funasr/bin/train_ds.py
+++ b/funasr/bin/train_ds.py
@@ -130,32 +130,10 @@
model = trainer.warp_model(model)
- kwargs["device"] = next(model.parameters()).device
- trainer.device = kwargs["device"]
+ kwargs["device"] = int(os.environ.get("LOCAL_RANK", 0))
+ trainer.device = int(os.environ.get("LOCAL_RANK", 0))
- # optim
- logging.info("Build optim")
- optim = kwargs.get("optim", "adam")
- assert optim in optim_classes
- optim_class = optim_classes.get(optim)
- optim = optim_class(model.parameters(), **kwargs.get("optim_conf"))
-
- # scheduler
- logging.info("Build scheduler")
- scheduler = kwargs.get("scheduler", "warmuplr")
- assert scheduler in scheduler_classes
- scheduler_class = scheduler_classes.get(scheduler)
- scheduler = scheduler_class(optim, **kwargs.get("scheduler_conf"))
-
- if use_deepspeed:
- args = OmegaConf.create({"deepspeed_config": kwargs.get("deepspeed_config", "")})
- model, optimizer, _, scheduler = deepspeed.initialize(
- args=args,
- model=model,
- optimizer=optim,
- lr_scheduler=scheduler,
- model_parameters=model.parameters(),
- )
+ model, optim, scheduler = trainer.warp_optim_scheduler(model, **kwargs)
# dataset
logging.info("Build dataloader")
@@ -175,20 +153,13 @@
scaler=scaler,
)
- tensorboard_dir = os.path.join(kwargs.get("output_dir"), "tensorboard")
- os.makedirs(tensorboard_dir, exist_ok=True)
- try:
- from tensorboardX import SummaryWriter
-
- writer = SummaryWriter(tensorboard_dir) # if trainer.rank == 0 else None
- except:
- writer = None
-
dataloader_tr, dataloader_val = None, None
for epoch in range(trainer.start_epoch, trainer.max_epoch):
time1 = time.perf_counter()
for data_split_i in range(trainer.start_data_split_i, dataloader.data_split_num):
+ time_slice_i = time.perf_counter()
+
dataloader_tr, dataloader_val = dataloader.build_iter(
epoch, data_split_i=data_split_i, start_step=trainer.start_step
)
@@ -201,7 +172,6 @@
dataloader_train=dataloader_tr,
dataloader_val=dataloader_val,
epoch=epoch,
- writer=writer,
data_split_i=data_split_i,
data_split_num=dataloader.data_split_num,
start_step=trainer.start_step,
@@ -210,10 +180,16 @@
torch.cuda.empty_cache()
+ time_escaped = (time.perf_counter() - time_slice_i) / 3600.0
+ logging.info(
+ f"rank: {local_rank}, "
+ f"time_escaped_epoch: {time_escaped:.3f} hours, "
+ f"estimated to finish {dataloader.data_split_num} data_slices, remaining: {(dataloader.data_split_num-data_split_i)*time_escaped:.3f} hours"
+ f"epoch: {((trainer.max_epoch - epoch - 1)*dataloader.data_split_num + dataloader.data_split_num-data_split_i)*time_escaped:.3f} hours\n"
+ )
+
trainer.start_data_split_i = 0
- trainer.validate_epoch(
- model=model, dataloader_val=dataloader_val, epoch=epoch + 1, writer=writer
- )
+ trainer.validate_epoch(model=model, dataloader_val=dataloader_val, epoch=epoch + 1)
scheduler.step()
trainer.step_in_epoch = 0
trainer.save_checkpoint(
@@ -232,7 +208,9 @@
trainer.train_loss_avg = 0.0
if trainer.rank == 0:
- average_checkpoints(trainer.output_dir, trainer.avg_nbest_model)
+ average_checkpoints(
+ trainer.output_dir, trainer.avg_nbest_model, use_deepspeed=trainer.use_deepspeed
+ )
trainer.close()
--
Gitblit v1.9.1