From ef9c392c5bb72bee337ba56300ab6db41cb9cd29 Mon Sep 17 00:00:00 2001
From: dohe0342 <kimdohe1070@gmail.com>
Date: Sat, 25 Feb 2023 15:51:57 +0900
Subject: [PATCH] from local

---
 .../ASR/conformer_ctc2/.transformer.py.swp    | Bin 53248 -> 57344 bytes
 .../ASR/conformer_ctc2/transformer.py         |   7 +++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/egs/librispeech/ASR/conformer_ctc2/.transformer.py.swp b/egs/librispeech/ASR/conformer_ctc2/.transformer.py.swp
index 9e8ab3ca9feffadf4eb5f5096586c3a8959d4a1e..9311babfdd7da6fdb4893f5ae6a97e6c4d3c3c86 100644
GIT binary patch
delta 720
zcmYk(O-K}B9LMqhIHNo2t~-lC2hnB^L6C_A3cb)FV>de)A!J)E=By%QyY0>zNwpr8
z1jXkdgh3FA9WrS=Y1!MQ2u-3>5WXEe=p`|`i1n2$eBi@8GY`+hJilM}Bfa~LKAvZ3
zex+L-TA8|O?GFXy?>M#ltoLqPZNV3|Q62bJByz2o@0LiJ3N^IkCU|>*6n0kHa2_X7
z1q+Mpn#2<fAcM<jz-d(DN1@0p`q70tgz(!G`HoL`iXqfv%O~>LCpnpA@(Nuzj05;m
zATojsYO$R!at~2Nun)_INFVOwA`W6s=TMBpMJ;Nul*c77fCzqRBBQvgvFVPcw82v4
zzhZgL)nU!+xNyW&;rHQVsdU1Lr<$Eg+ex$}okTi*J(<afy*t`l?R3J;rf<ZPSvQq+
zkN;osUdGP2xn@UXf%7-`*`2)q)v*v1na4*=U<5sA!cmmN#A=DiSA4)EM$wK4d|0RF
zDfHqN8c~NZf&r3!>n8<75kU>ssq-<0a1Iq%rM@wAVw1{VV;X&k!GMlAYI}&Yh~f~|
vXlo45a0yK?F<roolT>HpCkbridz!IgsF|>-tU+UM+$T&m^{!Ywj|Kh!zPNvk

delta 361
zcmWmAKP&@r7{>AUdgrcxf}ey)S<cA9Agm+?5(9>kh#0OX2E9gm7Lv9$Hto+Mk?1I4
zkRGNE5)w6t&JzDNv&8Oe_&nR2C(m2CGb?rTDyEE-HdW5Z=xx;>ovW4ZYTIqN)>!A1
zh+G?l63OVE1+UypiPUk1LxkACEYkQ%ioBtP3moGByV%4qY&<4J8rZ`eCea5IUvZHa
z>|-1bZ2US>mWCtZVHruh+Y}+d1a3P-$|zwTgLtq+?s0@Q#NpuE6uCrz90rg^E5<!W
z@yYxf{J$YGbZt6aZI9^Zp}1BxOP?;O=w$IJp<h3`dJBHIQwZFw@8z?8VSOuKEK1Z|
HoeBQ{zxzaa

diff --git a/egs/librispeech/ASR/conformer_ctc2/transformer.py b/egs/librispeech/ASR/conformer_ctc2/transformer.py
index 737bd9e05..d172fadf8 100644
--- a/egs/librispeech/ASR/conformer_ctc2/transformer.py
+++ b/egs/librispeech/ASR/conformer_ctc2/transformer.py
@@ -322,8 +322,11 @@ class Transformer(nn.Module):
         pred_pad = self.decoder_output_layer(pred_pad)  # (N, T, C)
 
         decoder_loss = self.decoder_criterion(pred_pad, ys_out_pad)
-
-        return decoder_loss
+        
+        if return_output:
+            return pred_pad, decoder_loss
+        else:
+            return decoder_loss
 
     @torch.jit.export
     def decoder_nll(