From 7df54a838cfbdf449fd37c0bebc323116522a0fa Mon Sep 17 00:00:00 2001
From: dohe0342 <kimdohe1070@gmail.com>
Date: Tue, 20 Dec 2022 16:00:28 +0900
Subject: [PATCH] from local

---
 egs/librispeech/ASR/.run_v3.sh.swp            | Bin 12288 -> 12288 bytes
 .../.data2vec_encoder.py.swp                  | Bin 16384 -> 16384 bytes
 .../data2vec_encoder.py                       |  21 +++++++++---------
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/egs/librispeech/ASR/.run_v3.sh.swp b/egs/librispeech/ASR/.run_v3.sh.swp
index 25547da9d0ae836ae89ce7362621435302a8ffd6..a86e47ad135adb16d4e72e409117538e9f4d91f3 100644
GIT binary patch
delta 32
mcmZojXh;xGG6?hZRj|}EU;qLE28M*#g~>b9e{2+gsSf~-)(O@C

delta 32
mcmZojXh;xGG6?hZRj|}EU;qLE1_pWF1<3-5-#3cC)CT~B8VHmC

diff --git a/egs/librispeech/ASR/pruned_transducer_stateless_d2v_v2/.data2vec_encoder.py.swp b/egs/librispeech/ASR/pruned_transducer_stateless_d2v_v2/.data2vec_encoder.py.swp
index 24c01e4770417510d6fc8210840f56f8370b3c42..2bd2806350f3b1dfbf889d3a56193a9cfee77e2a 100644
GIT binary patch
delta 484
zcmXZYPbh<N0LJm>#WwRN+Z2t<Ybo1`<f4$|A}9YYiju=tJB;n!E)LpzaFolBiyKN5
zq7}!L6DLwQxM(iQ#h(LCe3hp@^<1CFbuHJmjspQJT?__38tOxqRIZQ|kkTe-&lNuE
zrAL&ohb)o^qY*xM;lXX4bch3NV+GS_$9=7|iXptzNKYu^8t2%DK^7C}z>i-Aefgyu
zoZ%E(*g!uXs-;a#VFWFB_epQqfr}(&F$@bAUdCVz%NWG~q6p&IBi-Q^XPy};Pst&Q
zDqK~u3{&VqJDTuTDZSzZ>oCY-9Ag+nH=6Oy$7OTbc4USlU1mID|ML_xk&@SpM(T>Y
z@yW`NO`Q2uE@3D1*JCot*n}_Rq!#i~nY&o83CCN_P`s@%mCh_Wc{@3ua&n2R^3GCU
J@w3w(`UMa-Sn>b>

delta 540
zcmYk&O(^7X7{Kvo%oq&AjHulaelxWrhksr!TQ-+1HFMddT)d>Azf7&c3^P+`W=kox
zr=L<nd!s!}>fdf|@{&+;z?O1yQx2rCPQH}#)aQAgo~NF}lg-+)S=+kDV~bf{&s~{&
zUPOlSNFI@x_Nu<jgInYtdsx9TG$s&6CH6~1rqP6pVv$pvU<(!&F@t`5#RuHDM6R%d
zHLT(%rqGK<xLuNw!y=BL3n4V34prDH6p29Lyg=j#zmP@>^>E_aDRPN@%;Fo`PysuR
z^F_9i!vbRHL3e()NGr{gL*zelm_sLAIJb*z;5U|#LK2_h!$&;u&wn_>F8*Q}8GYc-
zS+{`=rw#?ZCGki!VJcG;p?`d-(d_|;_8Vbc8LZXSL6@F1jE0xxTbStqb97v_y_V=m
zOhppPY>~J1OVyjkC*S))ba-?mKCT8M(Rjif(^J9f(o}P@ZzBF(`CC;W&|>|m@332s
HMq&9giT!5u

diff --git a/egs/librispeech/ASR/pruned_transducer_stateless_d2v_v2/data2vec_encoder.py b/egs/librispeech/ASR/pruned_transducer_stateless_d2v_v2/data2vec_encoder.py
index a4e33cba0..7a933dd1f 100644
--- a/egs/librispeech/ASR/pruned_transducer_stateless_d2v_v2/data2vec_encoder.py
+++ b/egs/librispeech/ASR/pruned_transducer_stateless_d2v_v2/data2vec_encoder.py
@@ -20,6 +20,15 @@ from encoder_interface import EncoderInterface
 from torch import Tensor, nn
 
 from icefall.utils import make_pad_mask, subsequent_chunk_mask
+try:
+    import fairseq
+    from data2vec_audio import *
+except Exception as e:
+    print("Error: FairSeq is not properly installed.")
+    print(
+        "Please install FairSeq: cd ${MAIN_ROOT}/tools && make fairseq.done"
+    )
+    raise e
 
 
 class FairSeqData2VecEncoder(EncoderInterface):
@@ -47,17 +56,7 @@ class FairSeqData2VecEncoder(EncoderInterface):
         assert check_argument_types()
         super().__init__()
 
-        if w2v_url != "":
-            try:
-                import fairseq
-                from data2vec_audio import *
-            except Exception as e:
-                print("Error: FairSeq is not properly installed.")
-                print(
-                    "Please install FairSeq: cd ${MAIN_ROOT}/tools && make fairseq.done"
-                )
-                raise e
-        
+                    
         '''
         if os.path.exists('/home/work/workspace/models/data2vec_model/audio_base_ls.pt'):
             self.w2v_model_path = '/home/work/workspace/models/data2vec_model/audio_base_ls.pt'