Merge branch 'master' of git@github.com:lisa-lab/DeepLearningTutorials

Author: pascanur

.gitignore

@@ -1,2 +1,4 @@
 code/mnist.pkl.gz
 html
+*.pyc
+*~

code/convolutional_mlp.py

@@ -25,7 +25,8 @@
 import theano.tensor as T
 import theano.sandbox.softsign
 import pylearn.datasets.MNIST
-from theano.tensor.signal import conv, downsample
+from theano.tensor.signal import downsample
+from theano.tensor.nnet import conv
 
 class LeNetConvPoolLayer(object):
     """WRITEME"""

code/test.py

@@ -0,0 +1,23 @@
+#import convolutional_mlp, dbn, logistic_cg, logistic_sgd, mlp, rbm, SdA_loops, SdA
+import convolutional_mlp, logistic_cg, logistic_sgd, mlp, SdA_loops, SdA
+from nose.plugins.skip import SkipTest
+#TODO: dbn, rbm, SdA, SdA_loops, convolutional_mlp
+def test_logistic_sgd():
+    logistic_sgd.sgd_optimization_mnist(n_iter=10)
+def test_logistic_cg():
+    logistic_cg.cg_optimization_mnist(n_iter=10)
+def test_mlp():
+    mlp.sgd_optimization_mnist(n_iter=5)
+def test_convolutional_mlp():
+    raise SkipTest('Implementation not finished')
+    convolutional_mlp.evaluate_lenet5(n_iter=5)
+def test_dbn():
+    raise SkipTest('Implementation not finished')
+def test_rbm():
+    raise SkipTest('Implementation not finished')
+def test_SdA_loops():
+    raise SkipTest('Implementation not finished')
+    SdA_loops.sgd_optimization_mnist()
+def test_SdA():
+    raise SkipTest('Implementation not finished')
+    SdA.sgd_optimization_mnist()

doc/lenet.txt

@@ -154,7 +154,7 @@ one of Figure 1. The input consists of 3 features maps (an RGB color image) of s
 
 .. code-block:: python
 
-        from theano.tensor.signal import conv
+        from theano.tensor.nnet import conv
         rng = numpy.random.RandomState(23455)
 
         # create type corresponding to 4D tensor