Merge pull request #26 from ragavvenkatesan/dev

pushing python 2 dump

pantry/tutorials/lenet.py

@@ -143,6 +143,9 @@ def lenet5 ( dataset= None, verbose = 1 ):
 
     net.test(verbose = verbose)
 
+    from yann.utils.pickle import pickle
+    pickle(net, 'network.pkl')
+
 # Advaned version of the CNN
 def lenet_maxout ( dataset= None, verbose = 1 ):             
     """

yann/network.py

@@ -2599,6 +2599,21 @@ def test(self, show_progress = True, verbose = 2):
             if verbose >= 2:
                 print(".. Mean testing error : " + str(testing_accuracy))
 
+    def deactivate_layer (self, id, verbose = 2):
+        """
+        This method will remove a layer's parameters from the active_layer dictionary.
+
+        Args:
+            id: Layer which you want to de activate.
+            verbose: as usual.
+
+        Notes:
+            If the network was cooked, it would have to be re-cooked after deactivation.
+        """
+        for param in self.dropout_layers[id].params:
+            if param in self.active_params:
+                self.active_params.remove(param)
+
     def get_params (self, verbose = 2):
         """
         This method returns a dictionary of layer weights and bias in numpy format.

yann/utils/dataset.py

@@ -14,9 +14,9 @@
 
 import numpy
 import scipy.io
-#import cPickle
-#for python3 compatability
-import pickle as cPickle
+import cPickle
+# for python3 compatability
+# import pickle as cPickle
 import imp
 
 from image import *