Merge pull request #40 from ragavvenkatesan/master

Syncing Dev
ragavvenkatesan · Mar 3, 2017 · 0dfa0c0 · 0dfa0c0
2 parents cc3afe8 + 0b1daf3
commit 0dfa0c0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -29,7 +29,7 @@
 import theano
 # import theano.sandbox.cuda
 
-theano.config = Mock(device='gpu')
+# theano.config = Mock(device='gpu')
 # theano.sandbox.cuda.cuda_enabled = True
 # theano.sandbox.cuda.dnn = Mock(dnn_available=lambda: True)
 # sys.modules['theano.sandbox.cuda.blas'] = Mock(GpuCorrMM=None)

diff --git a/yann/network.py b/yann/network.py
@@ -466,7 +466,7 @@ def _add_resultor(self, resultor_params = None, verbose = 2):
             }
 
         if not "id" in resultor_params.keys():
-            id = len(self.resultor) + 1
+            id = str(len(self.resultor) + 1)
             resultor_params["id"] = id
         else:
             id = resultor_params['id']
@@ -504,7 +504,7 @@ def _add_optimizer(self, optimizer_params, verbose = 2):
             verbose: Similar to what is found in the rest of the toolbox.
         """
         if not "id" in optimizer_params.keys():
-            id = len(self.optimizer) + 1
+            id = str(len(self.optimizer) + 1)
             optimizer_params["id"] = id
         else:
             id = optimizer_params['id']
@@ -522,7 +522,7 @@ def _add_datastream(self, dataset_params, verbose = 2):
             verbose: Similar to what is found in the rest of the toolbox.
         """
         if not "id" in dataset_params.keys():
-            id = len(self.datastream) + 1
+            id = str(len(self.datastream) + 1)
             dataset_params["id"] = id
         else:
             id = dataset_params['id']
@@ -2223,7 +2223,7 @@ def cook(self, verbose = 2, **kwargs):
             if verbose >= 3:
                 print("... datastream not provided, assuming " + self.last_datastream_created)
             datastream = self.last_datastream_created
-        else:
+        else:            
             if not datastream in self.datastream.keys():
                 raise Exception ("Datastream " + datastream + " not found.")
         self.cooked_datastream = self.datastream[datastream]
@@ -2770,8 +2770,7 @@ def get_params (self, verbose = 2):
                         print "... Collecting parameters of layer " + lyr                                
                     params_list.append(p.get_value(borrow = True))
                 params[lyr] = params_list
-
-        return params 
+        return params
 
 if __name__ == '__main__':
     pass