From d6431252dca314172ce2d0d945ff4d001af6a18f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B8=B8=E9=9B=81?= Date: Wed, 21 Feb 2024 19:39:16 +0800 Subject: [PATCH] update trainer --- .../bicif_paraformer/{infer.sh => demo.sh} | 0 .../conformer/{infer.sh => demo.sh} | 0 .../contextual_paraformer/{infer.sh => demo.sh} | 0 .../ct_transformer/{infer.sh => demo.sh} | 0 .../ct_transformer_streaming/{infer.sh => demo.sh} | 0 .../industrial_data_pretraining/emotion2vec/infer.sh | 12 ------------ .../fsmn_vad_streaming/{infer.sh => demo.sh} | 0 .../monotonic_aligner/{infer.sh => demo.sh} | 0 .../paraformer-zh-spk/{infer.sh => demo.sh} | 0 .../paraformer_streaming/{infer.sh => demo.sh} | 0 .../scama/{infer.sh => demo.sh} | 0 .../seaco_paraformer/{infer.sh => demo.sh} | 0 .../uniasr/{infer.sh => demo.sh} | 0 funasr/train_utils/trainer.py | 4 ++-- 14 files changed, 2 insertions(+), 14 deletions(-) rename examples/industrial_data_pretraining/bicif_paraformer/{infer.sh => demo.sh} (100%) rename examples/industrial_data_pretraining/conformer/{infer.sh => demo.sh} (100%) rename examples/industrial_data_pretraining/contextual_paraformer/{infer.sh => demo.sh} (100%) rename examples/industrial_data_pretraining/ct_transformer/{infer.sh => demo.sh} (100%) rename examples/industrial_data_pretraining/ct_transformer_streaming/{infer.sh => demo.sh} (100%) delete mode 100644 examples/industrial_data_pretraining/emotion2vec/infer.sh rename examples/industrial_data_pretraining/fsmn_vad_streaming/{infer.sh => demo.sh} (100%) rename examples/industrial_data_pretraining/monotonic_aligner/{infer.sh => demo.sh} (100%) rename examples/industrial_data_pretraining/paraformer-zh-spk/{infer.sh => demo.sh} (100%) rename examples/industrial_data_pretraining/paraformer_streaming/{infer.sh => demo.sh} (100%) rename examples/industrial_data_pretraining/scama/{infer.sh => demo.sh} (100%) rename examples/industrial_data_pretraining/seaco_paraformer/{infer.sh => demo.sh} (100%) rename examples/industrial_data_pretraining/uniasr/{infer.sh => demo.sh} (100%) diff --git a/examples/industrial_data_pretraining/bicif_paraformer/infer.sh b/examples/industrial_data_pretraining/bicif_paraformer/demo.sh similarity index 100% rename from examples/industrial_data_pretraining/bicif_paraformer/infer.sh rename to examples/industrial_data_pretraining/bicif_paraformer/demo.sh diff --git a/examples/industrial_data_pretraining/conformer/infer.sh b/examples/industrial_data_pretraining/conformer/demo.sh similarity index 100% rename from examples/industrial_data_pretraining/conformer/infer.sh rename to examples/industrial_data_pretraining/conformer/demo.sh diff --git a/examples/industrial_data_pretraining/contextual_paraformer/infer.sh b/examples/industrial_data_pretraining/contextual_paraformer/demo.sh similarity index 100% rename from examples/industrial_data_pretraining/contextual_paraformer/infer.sh rename to examples/industrial_data_pretraining/contextual_paraformer/demo.sh diff --git a/examples/industrial_data_pretraining/ct_transformer/infer.sh b/examples/industrial_data_pretraining/ct_transformer/demo.sh similarity index 100% rename from examples/industrial_data_pretraining/ct_transformer/infer.sh rename to examples/industrial_data_pretraining/ct_transformer/demo.sh diff --git a/examples/industrial_data_pretraining/ct_transformer_streaming/infer.sh b/examples/industrial_data_pretraining/ct_transformer_streaming/demo.sh similarity index 100% rename from examples/industrial_data_pretraining/ct_transformer_streaming/infer.sh rename to examples/industrial_data_pretraining/ct_transformer_streaming/demo.sh diff --git a/examples/industrial_data_pretraining/emotion2vec/infer.sh b/examples/industrial_data_pretraining/emotion2vec/infer.sh deleted file mode 100644 index df990b9ab..000000000 --- a/examples/industrial_data_pretraining/emotion2vec/infer.sh +++ /dev/null @@ -1,12 +0,0 @@ - -#model="damo/emotion2vec_base" -model="iic/emotion2vec_base_finetuned" -model_revision="v2.0.4" - -python funasr/bin/inference.py \ -+model=${model} \ -+model_revision=${model_revision} \ -+input="https://isv-data.oss-cn-hangzhou.aliyuncs.com/ics/MaaS/ASR/test_audio/asr_example_zh.wav" \ -+output_dir="./outputs/debug" \ -+extract_embedding=False \ -+device="cpu" \ diff --git a/examples/industrial_data_pretraining/fsmn_vad_streaming/infer.sh b/examples/industrial_data_pretraining/fsmn_vad_streaming/demo.sh similarity index 100% rename from examples/industrial_data_pretraining/fsmn_vad_streaming/infer.sh rename to examples/industrial_data_pretraining/fsmn_vad_streaming/demo.sh diff --git a/examples/industrial_data_pretraining/monotonic_aligner/infer.sh b/examples/industrial_data_pretraining/monotonic_aligner/demo.sh similarity index 100% rename from examples/industrial_data_pretraining/monotonic_aligner/infer.sh rename to examples/industrial_data_pretraining/monotonic_aligner/demo.sh diff --git a/examples/industrial_data_pretraining/paraformer-zh-spk/infer.sh b/examples/industrial_data_pretraining/paraformer-zh-spk/demo.sh similarity index 100% rename from examples/industrial_data_pretraining/paraformer-zh-spk/infer.sh rename to examples/industrial_data_pretraining/paraformer-zh-spk/demo.sh diff --git a/examples/industrial_data_pretraining/paraformer_streaming/infer.sh b/examples/industrial_data_pretraining/paraformer_streaming/demo.sh similarity index 100% rename from examples/industrial_data_pretraining/paraformer_streaming/infer.sh rename to examples/industrial_data_pretraining/paraformer_streaming/demo.sh diff --git a/examples/industrial_data_pretraining/scama/infer.sh b/examples/industrial_data_pretraining/scama/demo.sh similarity index 100% rename from examples/industrial_data_pretraining/scama/infer.sh rename to examples/industrial_data_pretraining/scama/demo.sh diff --git a/examples/industrial_data_pretraining/seaco_paraformer/infer.sh b/examples/industrial_data_pretraining/seaco_paraformer/demo.sh similarity index 100% rename from examples/industrial_data_pretraining/seaco_paraformer/infer.sh rename to examples/industrial_data_pretraining/seaco_paraformer/demo.sh diff --git a/examples/industrial_data_pretraining/uniasr/infer.sh b/examples/industrial_data_pretraining/uniasr/demo.sh similarity index 100% rename from examples/industrial_data_pretraining/uniasr/infer.sh rename to examples/industrial_data_pretraining/uniasr/demo.sh diff --git a/funasr/train_utils/trainer.py b/funasr/train_utils/trainer.py index 6a59f91a1..d175fbeb8 100644 --- a/funasr/train_utils/trainer.py +++ b/funasr/train_utils/trainer.py @@ -181,7 +181,7 @@ class Trainer: time2 = time.perf_counter() time_escaped = (time2 - time1)/3600.0 - print(f"\nrank: {self.local_rank}, time_escaped_epoch: {time_escaped:.3f} hours, estimated to finish {self.max_epoch} epoch: {(self.max_epoch-epoch)*time_escaped:.3f}\n") + print(f"\nrank: {self.local_rank}, time_escaped_epoch: {time_escaped:.3f} hours, estimated to finish {self.max_epoch} epoch: {(self.max_epoch-epoch)*time_escaped:.3f} hours\n") if self.rank == 0: average_checkpoints(self.output_dir, self.avg_nbest_model) @@ -293,7 +293,7 @@ class Trainer: f"{time_now}, " f"rank: {self.local_rank}, " f"epoch: {epoch}/{self.max_epoch}, " - f"step: {batch_idx+1}/{len(self.dataloader_train)}, total: {self.batch_total}, " + f"step: {batch_idx+1}/{len(self.dataloader_train)}, total step: {self.batch_total}, " f"(loss: {loss.detach().cpu().item():.3f}), " f"(lr: {lr:.3e}), " f"{[(k, round(v.cpu().item(), 3)) for k, v in stats.items()]}, "