added rbm into the test.

nouiz · nouiz · commit 4e592ce9a6be · 2010-03-24T15:11:13.000-04:00
diff --git a/code/rbm.py b/code/rbm.py
@@ -6,7 +6,7 @@
 """
 
 
-import numpy, time, cPickle, gzip, PIL.Image
+import numpy, time, cPickle, gzip, sys, os, PIL.Image
 
 import theano
 import theano.tensor as T
@@ -281,7 +281,8 @@ def test_rbm(learning_rate=0.1, training_epochs = 15,
     #     Training the RBM          #
     #################################
     dirname = 'lr=%.5f'%learning_rate
-    os.makedirs(dirname)
+    if not os.path.exists(dirname):
+        os.makedirs(dirname)
     os.chdir(dirname)
 
     # it is ok for a theano function to have no output
@@ -317,7 +318,7 @@ def test_rbm(learning_rate=0.1, training_epochs = 15,
     end_time = time.clock()
 
     pretraining_time = (end_time - start_time) - plotting_time
-    print >> sys.stderr, ('The pretraining code for file '+os.path.split(__file__)[1]+' ran for %.2fm expected Xm our buildbot' % (pretraining_time/60.))
+    print >> sys.stderr, ('The pretraining code for file '+os.path.split(__file__)[1]+' ran for %.2fm expected 2.17m our buildbot' % (pretraining_time/60.))
 
   
     #################################
@@ -350,6 +351,9 @@ def test_rbm(learning_rate=0.1, training_epochs = 15,
     # until you plot at least `n_samples`
     n_samples = 10
     plot_every = 1000
+    
+    plotting_time = 0.
+    start_time=time.time()
 
     for idx in xrange(n_samples):
 
@@ -358,13 +362,20 @@ def test_rbm(learning_rate=0.1, training_epochs = 15,
             vis_mf, vis_sample = sample_fn()
 
         # construct image
+        plotting_start = time.clock()
         image = PIL.Image.fromarray(tile_raster_images( 
                                          X          = vis_mf,
                                          img_shape  = (28,28),
                                          tile_shape = (10,10),
                                          tile_spacing = (1,1) ) )
         print ' ... plotting sample ', idx
         image.save('sample_%i_step_%i.png'%(idx,idx*jdx))
+        plotting_stop = time.clock()
+        plotting_time += (plotting_stop - plotting_start)
+
+    end_time=time.time()
+    sampling_time = (end_time - start_time) - plotting_time
+    print >> sys.stderr, ('The sampling code for file '+os.path.split(__file__)[1]+' ran for %.2fm expected 1.57m in our buildbot' % (sampling_time/60.))
 
 if __name__ == '__main__':
     test_rbm()
diff --git a/code/test.py b/code/test.py
@@ -1,4 +1,4 @@
-import convolutional_mlp, logistic_cg, logistic_sgd, mlp, SdA, dA
+import convolutional_mlp, logistic_cg, logistic_sgd, mlp, SdA, dA, rbm
 from nose.plugins.skip import SkipTest
 import theano
 #TODO: rbm, DBN, deep
@@ -14,7 +14,7 @@ def test_convolutional_mlp():
 def test_dbn():
     raise SkipTest('Implementation not finished')
 def test_rbm():
-    raise SkipTest('Implementation not finished')
+    rbm.test_rbm(training_epochs=2)
 def test_dA():
     dA.test_dA(training_epochs = 2)
 def test_SdA():
