From 6ca0b838d48106030984eacf204e8f1f2f05985b Mon Sep 17 00:00:00 2001
From: 游雁 <zhifu.gzf@alibaba-inc.com>
Date: 星期四, 13 六月 2024 16:07:49 +0800
Subject: [PATCH] decoding

---
 funasr/models/llm_asr/model.py |   29 ++++++++++++++++++-----------
 1 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/funasr/models/llm_asr/model.py b/funasr/models/llm_asr/model.py
index 14837b9..85351b7 100644
--- a/funasr/models/llm_asr/model.py
+++ b/funasr/models/llm_asr/model.py
@@ -21,6 +21,8 @@
 from funasr.train_utils.device_funcs import to_device
 import traceback
 
+dtype_map = {"bf16": torch.bfloat16, "fp16": torch.float16, "fp32": torch.float32}
+
 
 @tables.register("model_classes", "LLMASR")
 class LLMASR(nn.Module):
@@ -408,18 +410,20 @@
             audio_encoder_output_size = audio_encoder.output_size()
         freeze = audio_encoder_conf.get("freeze", True)
         freeze_layer_num = int(audio_encoder_conf.get("freeze_layer_num", -1))
-        if freeze_layer_num > 0:
-            freeze_layer_num = range(freeze_layer_num)
+        # if freeze_layer_num > 0:
+        #     freeze_layer_num = range(freeze_layer_num)
 
         if freeze:
             for name, param in audio_encoder.named_parameters():
-                if isinstance(freeze_layer_num, (list, tuple)):
+                if freeze_layer_num > 0:
                     idx = re.search(r"\.\d+\.", name)
                     if idx is not None:
                         beg, end = idx.regs[0]
                         layer_id = int(name[beg + 1 : end - 1])
-                        if layer_id in freeze_layer_num:
+                        if layer_id < freeze_layer_num:
                             param.requires_grad = False
+                    else:
+                        param.requires_grad = False
                 else:
                     param.requires_grad = False
 
@@ -447,6 +451,7 @@
             model.eval()
         self.llm = model
         llm_dim = model.get_input_embeddings().weight.shape[-1]
+        self.llm_dtype = llm_conf.get("llm_dtype", "fp32")
 
         # adaptor
         adaptor_class = tables.adaptor_classes.get(audio_adaptor)
@@ -525,12 +530,15 @@
                     batch_idx, :min_len, :
                 ]
 
-        labels_ids[labels_ids == -1] = -100
-
-        model_outputs = self.llm(
-            inputs_embeds=inputs_embeds, attention_mask=attention_mask, labels=labels_ids
-        )
-        loss = model_outputs.loss
+        with torch.cuda.amp.autocast(
+            enabled=True if self.llm_dtype != "fp32" else False, dtype=dtype_map[self.llm_dtype]
+        ):
+            labels_ids[labels_ids == -1] = -100
+            attention_mask[attention_mask < 0] = 0
+            model_outputs = self.llm(
+                inputs_embeds=inputs_embeds, attention_mask=attention_mask, labels=labels_ids
+            )
+            loss = model_outputs.loss
 
         stats = {}
         with torch.no_grad():
@@ -735,7 +743,6 @@
             llm_dtype = "fp16" if kwargs.get("fp16", False) else llm_dtype
             llm_dtype = "bf16" if kwargs.get("bf16", False) else llm_dtype
 
-        dtype_map = {"bf16": torch.bfloat16, "fp16": torch.float16, "fp32": torch.float32}
         with torch.cuda.amp.autocast(
             enabled=True if llm_dtype != "fp32" else False, dtype=dtype_map[llm_dtype]
         ):

--
Gitblit v1.9.1