From d80ac2fd2df4e7fb8a28acfa512bb11472b5cc99 Mon Sep 17 00:00:00 2001
From: liugz18 <57401541+liugz18@users.noreply.github.com>
Date: 星期四, 18 七月 2024 21:34:55 +0800
Subject: [PATCH] Rename 'res' in line 514 to avoid with naming conflict with line 365

---
 funasr/models/emotion2vec/audio.py |   13 +++----------
 1 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/funasr/models/emotion2vec/audio.py b/funasr/models/emotion2vec/audio.py
index d21500b..2609573 100644
--- a/funasr/models/emotion2vec/audio.py
+++ b/funasr/models/emotion2vec/audio.py
@@ -22,7 +22,6 @@
 
 class AudioEncoder(ModalitySpecificEncoder):
 
-
     def __init__(
         self,
         modality_cfg,
@@ -91,9 +90,7 @@
         )
 
         decoder = (
-            Decoder1d(modality_cfg.decoder, embed_dim)
-            if modality_cfg.decoder is not None
-            else None
+            Decoder1d(modality_cfg.decoder, embed_dim) if modality_cfg.decoder is not None else None
         )
 
         alibi_bias_fn = partial(get_alibi_bias, alibi_biases=alibi_biases)
@@ -144,13 +141,9 @@
                         output_lengths - 1,
                     )
                 ] = 1
-                padding_mask = (
-                    1 - padding_mask.flip([-1]).cumsum(-1).flip([-1])
-                ).bool()
+                padding_mask = (1 - padding_mask.flip([-1]).cumsum(-1).flip([-1])).bool()
             else:
-                padding_mask = torch.zeros(
-                    x.shape[:2], dtype=torch.bool, device=x.device
-                )
+                padding_mask = torch.zeros(x.shape[:2], dtype=torch.bool, device=x.device)
 
         return padding_mask
 

--
Gitblit v1.9.1