merge

scripts/docgen.py

 
 import sys
 import os
+import shutil
 import inspect
 
 from epydoc import docintrospecter 
@@ -98,13 +99,36 @@ if __name__ == '__main__':
     if options['--all'] or options['--epydoc']:
         from epydoc.cli import cli
         sys.path[0:0] = throot
+
+        #Generate HTML doc
+        #os.system("epydoc --config doc/api/epydoc.conf -o html/api")
         sys.argv[:] = ['', '--config', '%s/doc/api/epydoc.conf' % throot, '-o', 'api']
         cli()
-#        os.system("epydoc --config doc/api/epydoc.conf -o html/api")
+
+        # Generate PDF doc
+        # TODO
 
     if options['--all'] or options['--rst']:
         import sphinx
         sys.path[0:0] = [os.path.join(throot, 'doc')]
         sphinx.main(['', '-E', os.path.join(throot, 'doc'), '.'])
 
+        # Generate latex file in a temp directory
+        import tempfile
+        workdir = tempfile.mkdtemp()
+        sphinx.main(['', '-E', '-b', 'latex',
+            os.path.join(throot, 'doc'), workdir])
+        # Compile to PDF
+        currentdir = os.getcwd()
+        os.chdir(workdir)
+        os.system('make')
+        try:
+            shutil.copy(os.path.join(workdir, 'theano.pdf'), currentdir)
+            os.chdir(currentdir)
+            shutil.rmtree(workdir)
+        except OSError, e:
+            print 'OSError:', e
+
+
+
 

theano/compile/function_module.py

@@ -288,8 +288,12 @@ class Function(object):
         # if we are allowing garbage collection, remove the input and output reference from the internal
         # storage cells
         if getattr(self.fn, 'allow_gc', False):
-            for x in self.output_storage:
-                x.storage[0] = None  #WARNING: This circumvents the 'readonly' attribute in x
+            assert len(self.output_storage) == len(self.maker.env.outputs)
+            for o_container, o_result in zip(self.output_storage, self.maker.env.outputs):
+                if o_result.owner is not None:
+                    # this node is the result of computation
+                    # WARNING: This circumvents the 'readonly' attribute in x
+                    o_container.storage[0] = None
 
         # Update the inputs that have an update function
         for input, storage in reversed(zip(self.maker.expanded_inputs, self.input_storage)):

theano/tensor/elemwise.py

@@ -160,6 +160,8 @@ class DimShuffle(Op):
     def perform(self, node, (input, ), (storage, )):
         # drop
         res = input
+        if type(res) != numpy.ndarray:
+            raise TypeError(res)
         shape = list(res.shape)
         for drop in reversed(self.drop):
             shape.pop(drop)
@@ -178,7 +180,7 @@ class DimShuffle(Op):
         if not self.inplace:
             res = numpy.copy(res)
 
-        storage[0] = res
+        storage[0] = numpy.asarray(res) #asarray puts scalars back into array
 
     def c_code(self, node, name, (input,), (res,), sub):
         def statements(lst):