From 6433d0e8014356fede81c9b4bfeb291c6cca8446 Mon Sep 17 00:00:00 2001
From: dohe0342 <kimdohe1070@gmail.com>
Date: Sat, 28 Jan 2023 02:37:56 +0900
Subject: [PATCH] from local

---
 .../.conformer_randomcombine.py.swp           | Bin 98304 -> 98304 bytes
 .../conformer_randomcombine.py                |  45 +-----------------
 2 files changed, 1 insertion(+), 44 deletions(-)

diff --git a/egs/librispeech/ASR/pruned_transducer_stateless_gtrans/.conformer_randomcombine.py.swp b/egs/librispeech/ASR/pruned_transducer_stateless_gtrans/.conformer_randomcombine.py.swp
index a3f55c1e9f271cd0f05f4b3d11cb31d9ff7e3e47..ce2b4814b3030528bfd8d6b5cc37fd22ae7b7c46 100644
GIT binary patch
delta 974
zcmaLVUr1A77{~GFopa4>^QafLNIjXYMp9xFt^ZCDLxeJMQqW=QMgI`j#C8*B5+p=j
z#7m9{l7gVf{xQnxN)SYX6e|e4>7wka@<Q^a3;P~*;Z-kucHXn++0JubeyNlvmGYEy
zRJR>%Hp4rrg=L7$=YQ%ninhEc2^%V?j~nGm={TR!%uOS)(>InUa%t^yYfu*+8L-di
zi!>pO96X}xboAjI8c~5se%S{T@4O<tD8s}Wk&D=fagRt30$9iu`Hhcwf|GFLsavES
zE)3^LnOw^eIfDr1Tq3toho4I1z204WOS?LY^#RM!RaV<7C)fv3v0`;CyZ_gtOu9BB
zifr|N*LM0^vHXPTNI>tkCiLBi=`~lDo;lr|8EvX}ANo=tvIyt=8G30s_Y1g>9&{jv
zQh4#fFOo!qKT~_m?N2`|R9-z4^Q7O}sxm!nt5#iHSEReGlJu0Vii@&Ob*@Qs`$03I
zEi35MHu+cA%%qN4mCpACOaGFWEy|TeYh=+<xrRN)g!?&RXWr=YxbmHuW-)~k^rH(^
zD8n?fjv|3deD;alK@<V_@M<0JgnF1L$2^gm!32hIIbUo!#ikJ<Y=FWX85_qSdJ#he
zyAZ-QC<tcB;5Rs#%-{j8qZ^0e$1k!uiRZYAvk0NoYl{@HaUnx!@1X@XFfmDZZPefg
zfqjSzXu%&s`xS#|KmdZ5WVZ`@U}B2XeT*A$PI?~{1jFh6xEe@j;%cj&j;tSf9anFB
Fe*wEvyn_G$

delta 2364
zcmbu>UuaWj7{~GFX#Z(jo7QQRi5{`6wbiyKZBtW`CPRughz?vFYin9(t#PT%AA2D<
zlkKL?ff`;VtZd#Wh*(f5&Iw~>6hWB681!O_c%y<BirR}^ZS0$zRfTg3J$T>~a>Dt&
zCwZUe<bBiWqI9~*y{{>>eTVLAXc7*WNa^*-FINBMzV7z9w5{qB*BWiHiu2k%k#Qv(
z%M+T&`32^sTUDihG<C34WE);D7Wo04m{}xp4_ELln(?qiWE2J-6pNg|KKRjrRk&Rw
zGK`g&Dij%l8^0BZe2Hb4TqrV#rFgzTR?F{vok{$P+*dn?L-+tsRcqj!x*T*D*3{I9
zs8@k@bu8>we{^kD6~T3j^#6~D3I_EunLXv=Y-L1Smh~sJVx`X%s*0KA`4jV#@|hLy
zoVgB_tWQP;hlV5jYm)=f0}cJr*unm8!{}XK7wtbfkO&Wt9Ept_N#;I!JFYnt;f;3T
zCTqB<SFhK5YzC;e8Ng@B`<%o#S>l_V#M><KHYahfCGK?+Z?(i*oy1!#@fIiXW=p);
zN!(+Jd*+I7u&KLE)8*r$Vx9WuMx)`WGn>>VYwbC+<=#9O1JTF<J>TMkiQ$o0`0&V(
zzGaJUc-rM{Th8ZsskOPgwQBZ{i(R){OXjHCttE5RuGW&x*>CeJnb|P;lI<}Xy-q4-
znAM*BC!3>U-uCyemvz$SUoY#7&H48-zZo+pJU?TtMq`VU88aU*)fN1(l3s3Uf79)(
z0_tqQJ8?PKUEm8X5g9{njbw$(A1^9Ie#TyGKt0yr0oUEf-CSlOu&Z!M=H+MEtCd=b
z>IocvXE};>hSa^T<KOiC)Tb4=Qq_z)&H|geN4I$k8E3pJ_zH3CK?r`-;x+e}#*a9S
zk73|(IV&Nyp$vD*L{8#3YVeFD`vx*NgZ-tFk|1w<aNz~N@-A*+4BsJvKD412PgvLg
z!~`y44BsPxI70Xo9jL}~{KNYH2-lE87#&z!k`nowO~8GO;S|zHq8e40Vq<Ut8Fb(!
zn}ZAJ#Y#M6gD{0CcB2?K*(jVu93NqteZeJU;KwTb%dC%Qzm998H?s*XQeHOu{N%O`
U>>3(0S}W{PJHu7#m%Xn404Jw`EdT%j

diff --git a/egs/librispeech/ASR/pruned_transducer_stateless_gtrans/conformer_randomcombine.py b/egs/librispeech/ASR/pruned_transducer_stateless_gtrans/conformer_randomcombine.py
index 85e25cda3..8c4e5f94b 100644
--- a/egs/librispeech/ASR/pruned_transducer_stateless_gtrans/conformer_randomcombine.py
+++ b/egs/librispeech/ASR/pruned_transducer_stateless_gtrans/conformer_randomcombine.py
@@ -213,56 +213,13 @@ class Conformer(EncoderInterface):
         x = x.permute(1, 0, 2)  # (T, N, C) ->(N, T, C)
          
         layer_outputs = [x.permute(1, 0, 2) for x in layer_outputs]
-        '''
-        if self.group_num == 4:
-            x = self.layer_norm(1/4*(self.sigmoid(self.alpha[0])*layer_outputs[2] + \
-                                     self.sigmoid(self.alpha[1])*layer_outputs[5] + \
-                                     self.sigmoid(self.alpha[2])*layer_outputs[8] + \
-                                     self.sigmoid(self.alpha[3])*layer_outputs[11]
-                                    )
-                                )
-        elif self.group_num == 6:
-            x = self.layer_norm(1/6*(self.sigmoid(self.alpha[0])*layer_outputs[1] + \
-                                     self.sigmoid(self.alpha[1])*layer_outputs[3] + \
-                                     self.sigmoid(self.alpha[2])*layer_outputs[5] + \
-                                     self.sigmoid(self.alpha[3])*layer_outputs[7] + \
-                                     self.sigmoid(self.alpha[4])*layer_outputs[9] + \
-                                     self.sigmoid(self.alpha[5])*layer_outputs[11]
-                                    )
-                                )
-
-        elif self.group_num == 12:
-            x = self.layer_norm(1/12*(self.sigmoid(self.alpha[0])*layer_outputs[0] + \
-                                     self.sigmoid(self.alpha[1])*layer_outputs[1] + \
-                                     self.sigmoid(self.alpha[2])*layer_outputs[2] + \
-                                     self.sigmoid(self.alpha[3])*layer_outputs[3] + \
-                                     self.sigmoid(self.alpha[4])*layer_outputs[4] + \
-                                     self.sigmoid(self.alpha[5])*layer_outputs[5] + \
-                                     self.sigmoid(self.alpha[6])*layer_outputs[6] + \
-                                     self.sigmoid(self.alpha[7])*layer_outputs[7] + \
-                                     self.sigmoid(self.alpha[8])*layer_outputs[8] + \
-                                     self.sigmoid(self.alpha[9])*layer_outputs[9] + \
-                                     self.sigmoid(self.alpha[10])*layer_outputs[10] + \
-                                     self.sigmoid(self.alpha[11])*layer_outputs[11]
-                                    )
-                                )
-        '''
-
+        
         if self.group_num != 0:
             x = 0
             for enum, alpha in enumerate(self.alpha):
                 x += self.sigmoid(alpha) * layer_outputs[(enum+1)*self.group_layer_num-1]
             x = self.layer_norm(x/self.group_num)
 
-        '''
-        layer_outputs = [x.permute(1, 0, 2) for x in layer_outputs]
-
-        x = 0
-        for enum, alpha in enumerate(self.alpha):
-            x += self.sigmoid(alpha*layer_outputs[(enum+1)*self.group_layer_num-1])
-
-        x = self.layer_norm(x/self.group_num)
-        '''
         return x, lengths
 
     @torch.jit.export