Merge pull request lisa-lab#131 from nouiz/master2

abergeron · abergeron · commit 50b5010208aa · 2016-02-08T12:10:27.000-05:00
Master2
diff --git a/.travis.yml b/.travis.yml
@@ -23,7 +23,7 @@ env:
   - PART="test.py:test_logistic_sgd test.py:test_logistic_cg test.py:test_mlp test.py:test_convolutional_mlp test.py:test_dA"
   - PART="test.py:test_SdA test.py:test_lstm"
   - PART="test.py:test_dbn"
-  - PART="test.py:test_rbm test.py:test_rnnrbm"
+  - PART="test.py:test_rbm test.py:test_rnnrbm test.py:test_rnnslu"
   - PART="-e test.py"
 
 #i7-2600K CPU @ 3.40GHz
diff --git a/code/rnnslu.py b/code/rnnslu.py
@@ -126,11 +126,14 @@ def get_perf(filename, folder):
                             stdout=subprocess.PIPE)
 
     stdout, _ = proc.communicate(''.join(open(filename).readlines()))
+    out = None
     for line in stdout.split('\n'):
         if 'accuracy' in line:
             out = line.split()
             break
-
+    # To help debug
+    if out is None:
+        print stdout.split('\n')
     precision = float(out[6][:-2])
     recall = float(out[8][:-2])
     f1score = float(out[10])
diff --git a/code/test.py b/code/test.py
@@ -15,10 +15,6 @@
 import lstm
 
 
-def test_rnnslu():
-    rnnslu.main()
-
-
 def test_logistic_sgd():
     logistic_sgd.sgd_optimization_mnist(n_epochs=10)
 
@@ -62,6 +58,26 @@ def test_rnnrbm():
     rnnrbm.test_rnnrbm(num_epochs=1)
 
 
+def test_rnnslu():
+    s = {'fold': 3,
+         # 5 folds 0,1,2,3,4
+         'data': 'atis',
+         'lr': 0.0970806646812754,
+         'verbose': 1,
+         'decay': True,
+         # decay on the learning rate if improvement stops
+         'win': 7,
+         # number of words in the context window
+         'nhidden': 200,
+         # number of hidden units
+         'seed': 345,
+         'emb_dimension': 50,
+         # dimension of word embedding
+         'nepochs': 1, # CHANGED
+         'savemodel': False}
+    rnnslu.main(s)
+
+
 def test_lstm():
     lstm.train_lstm(max_epochs=1, test_size=1000, saveto='')
 
