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

LSTM update and update timming.

Author: nouiz

Diff for: code/lstm.py

@@ -569,7 +569,7 @@ def train_lstm(
                 f_update(lrate)
 
                 if numpy.isnan(cost) or numpy.isinf(cost):
-                    print 'NaN detected'
+                    print 'bad cost detected: ', cost
                     return 1., 1., 1.
 
                 if numpy.mod(uidx, dispFreq) == 0:
@@ -595,7 +595,7 @@ def train_lstm(
 
                     history_errs.append([valid_err, test_err])
 
-                    if (uidx == 0 or
+                    if (best_p is None or
                         valid_err <= numpy.array(history_errs)[:,
                                                                0].min()):
 

Diff for: code/test.py

@@ -87,7 +87,7 @@ def speed():
     # 7.1-2 (python 2.7.2, mkl unknow). BLAS with only 1 thread.
 
     expected_times_64 = numpy.asarray([9.8, 22.0, 76.1, 73.7, 116.4,
-                                       346.9, 355.0, 558.1, 130.4, 50.8, 113.6])
+                                       346.9, 355.0, 558.1, 130.4, 23.2, 106])
     expected_times_32 = numpy.asarray([8.1, 17.9, 42.5, 66.5, 71,
                                        191.2, 199.0, 432.8, 119.5, 36.9, 78.0])
 
@@ -110,7 +110,7 @@ def speed():
 
     expected_times_gpu = numpy.asarray([3.0, 7.55523491, 18.99226785,
                                         5.8, 20.0,
-                                        11.8, 18.2, 280.1, 132.8, 38.8, 10.5])
+                                        11.2, 17.2, 257.7, 118.8, 34.2, 8.7])
     expected_times_64 = [s for idx, s in enumerate(expected_times_64)
                          if to_exec[idx]]
     expected_times_32 = [s for idx, s in enumerate(expected_times_32)