update

shatealaboxiaowang · Jul 27, 2018 · 175cf80 · 175cf80
1 parent 092f098
commit 175cf80
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 10 deletions.
diff --git a/data_io.py b/data_io.py
@@ -47,8 +47,7 @@ def read_conf():
  options.cnn_use_batchnorm=Config.get('cnn', 'cnn_use_batchnorm')
  options.cnn_act=Config.get('cnn', 'cnn_act')
  options.cnn_drop=Config.get('cnn', 'cnn_drop')
- options.cnn_init_first=Config.get('cnn', 'cnn_init_first')
- options.cnn_init_gain=Config.get('cnn', 'cnn_init_gain')
+
 
  #[dnn]
  options.fc_lay=Config.get('dnn', 'fc_lay')
@@ -75,8 +74,6 @@ def read_conf():
  options.N_epochs=Config.get('optimization', 'N_epochs')
  options.N_batches=Config.get('optimization', 'N_batches')
  options.N_eval_epoch=Config.get('optimization', 'N_eval_epoch')
- options.reg_factor=Config.get('optimization', 'reg_factor')
- options.fact_amp=Config.get('optimization', 'fact_amp')
  options.seed=Config.get('optimization', 'seed')
 
  return options

diff --git a/data_io.pyc b/data_io.pyc
diff --git a/dnn_models.py b/dnn_models.py
@@ -234,8 +234,6 @@ def __init__(self,options):
        self.cnn_len_filt=options['cnn_len_filt']
        self.cnn_max_pool_len=options['cnn_max_pool_len']
 
-       self.cnn_init_first=options['cnn_init_first']
-       self.cnn_init_gain=options['cnn_init_gain']
 
        self.cnn_act=options['cnn_act']
        self.cnn_drop=options['cnn_drop']

diff --git a/dnn_models.pyc b/dnn_models.pyc
diff --git a/exp/SincNet_TIMIT/model_raw.pkl b/exp/SincNet_TIMIT/model_raw.pkl
diff --git a/exp/SincNet_TIMIT/res.res b/exp/SincNet_TIMIT/res.res
@@ -0,0 +1,2 @@
+epoch 0, loss_tr=6.324174 err_tr=0.997500 loss_te=6.295551 err_te=0.997505 err_te_snt=0.997836
+epoch 25, loss_tr=3.206195 err_tr=0.748750 loss_te=3.695170 err_te=0.814129 err_te_snt=0.409812
diff --git a/speaker_id.py b/speaker_id.py
@@ -158,9 +158,7 @@ def create_batches_rnd(batch_size,data_folder,wav_lst,N_snt,wlen,lab_dict,fact_a
           'cnn_use_laynorm':cnn_use_laynorm,
           'cnn_use_batchnorm':cnn_use_batchnorm,
           'cnn_act': cnn_act,
-          'cnn_drop':cnn_drop,
-          'cnn_init_first':cnn_init_first,
-          'cnn_init_gain':cnn_init_gain,          
+          'cnn_drop':cnn_drop,          
           }
 
 CNN_net=CNN(CNN_arch)
@@ -226,7 +224,7 @@ def create_batches_rnd(batch_size,data_folder,wav_lst,N_snt,wlen,lab_dict,fact_a
 
   for i in range(N_batches):
 
-    [inp,lab]=create_batches_rnd(batch_size,data_folder,wav_lst_tr,snt_tr,wlen,lab_dict,fact_amp)
+    [inp,lab]=create_batches_rnd(batch_size,data_folder,wav_lst_tr,snt_tr,wlen,lab_dict,0.2)
     pout=DNN2_net(DNN1_net(CNN_net(inp)))
 
     pred=torch.max(pout,dim=1)[1]
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		epoch 0, loss_tr=6.324174 err_tr=0.997500 loss_te=6.295551 err_te=0.997505 err_te_snt=0.997836
		epoch 25, loss_tr=3.206195 err_tr=0.748750 loss_te=3.695170 err_te=0.814129 err_te_snt=0.409812