Merge pull request #165 from nouiz/fix

theano/gof/toolbox.py

@@ -27,7 +27,8 @@ class History:
 
     def on_attach(self, env):
         if hasattr(env, 'checkpoint') or hasattr(env, 'revert'):
-            raise AlreadyThere("History feature is already present or in conflict with another plugin.")
+            raise AlreadyThere("History feature is already present or in"
+                               " conflict with another plugin.")
         self.history[env] = []
         env.checkpoint = lambda: len(self.history[env])
         env.revert = partial(self.revert, env)
@@ -41,7 +42,8 @@ class History:
         if self.history[env] is None:
             return
         h = self.history[env]
-        h.append(lambda: env.change_input(node, i, r, reason=("Revert", reason)))
+        h.append(lambda: env.change_input(node, i, r,
+                                          reason=("Revert", reason)))
 
     def revert(self, env, checkpoint):
         """
@@ -61,8 +63,10 @@ class Validator:
 
     def on_attach(self, env):
         if hasattr(env, 'validate'):
-            raise AlreadyThere("Validator feature is already present or in conflict with another plugin.")
+            raise AlreadyThere("Validator feature is already present or in"
+                               " conflict with another plugin.")
         env.validate = lambda: env.execute_callbacks('validate')
+
         def consistent():
             try:
                 env.validate()
@@ -83,7 +87,8 @@ class ReplaceValidate(History, Validator):
         Validator.on_attach(self, env)
         for attr in ('replace_validate', 'replace_all_validate'):
             if hasattr(env, attr):
-                raise AlreadyThere("ReplaceValidate feature is already present or in conflict with another plugin.")
+                raise AlreadyThere("ReplaceValidate feature is already present"
+                                   " or in conflict with another plugin.")
         env.replace_validate = partial(self.replace_validate, env)
         env.replace_all_validate = partial(self.replace_all_validate, env)
 
@@ -101,10 +106,16 @@ class ReplaceValidate(History, Validator):
         for r, new_r in replacements:
             try:
                 env.replace(r, new_r, reason=reason)
+                print reason
             except Exception, e:
-                if 'The type of the replacement must be the same' not in str(e) and 'does not belong to this Env' not in str(e):
-                    print >> sys.stderr, "<<!! BUG IN ENV.REPLACE OR A LISTENER !!>>", type(e), e, reason
-                env.revert(chk) # this might fail if the error is in a listener: (env.replace kinda needs better internal error handling)
+                if ('The type of the replacement must be the same' not in
+                    str(e) and 'does not belong to this Env' not in str(e)):
+                    out = sys.stderr
+                    print >> out, "<<!! BUG IN ENV.REPLACE OR A LISTENER !!>>",
+                    print >> out, type(e), e, reason
+                # this might fail if the error is in a listener:
+                # (env.replace kinda needs better internal error handling)
+                env.revert(chk)
                 raise
         try:
             env.validate()
@@ -122,14 +133,16 @@ class NodeFinder(dict, Bookkeeper):
         if self.env is not None:
             raise Exception("A NodeFinder instance can only serve one Env.")
         if hasattr(env, 'get_nodes'):
-            raise AlreadyThere("NodeFinder is already present or in conflict with another plugin.")
+            raise AlreadyThere("NodeFinder is already present or in conflict"
+                               " with another plugin.")
         self.env = env
         env.get_nodes = partial(self.query, env)
         Bookkeeper.on_attach(self, env)
 
     def on_detach(self, env):
         if self.env is not env:
-            raise Exception("This NodeFinder instance was not attached to the provided env.")
+            raise Exception("This NodeFinder instance was not attached to the"
+                            " provided env.")
         self.env = None
         del env.get_nodes
         Bookkeeper.on_detach(self, env)
@@ -137,7 +150,7 @@ class NodeFinder(dict, Bookkeeper):
     def on_import(self, env, node):
         try:
             self.setdefault(node.op, []).append(node)
-        except TypeError: #node.op is unhashable
+        except TypeError:  # node.op is unhashable
             return
         except Exception, e:
             print >> sys.stderr, 'OFFENDING node', type(node), type(node.op)
@@ -150,7 +163,7 @@ class NodeFinder(dict, Bookkeeper):
     def on_prune(self, env, node):
         try:
             nodes = self[node.op]
-        except TypeError: #node.op is unhashable
+        except TypeError:  # node.op is unhashable
             return
         nodes.remove(node)
         if not nodes:
@@ -160,14 +173,15 @@ class NodeFinder(dict, Bookkeeper):
         try:
             all = self.get(op, [])
         except TypeError:
-            raise TypeError("%s in unhashable and cannot be queried by the optimizer" % op)
+            raise TypeError("%s in unhashable and cannot be queried by the"
+                            " optimizer" % op)
         all = list(all)
         return all
 
 
 class PrintListener(object):
 
-    def __init__(self, active = True):
+    def __init__(self, active=True):
         self.active = active
 
     def on_attach(self, env):
@@ -188,7 +202,8 @@ class PrintListener(object):
 
     def on_change_input(self, env, node, i, r, new_r, reason=None):
         if self.active:
-            print "-- changing (%s.inputs[%s]) from %s to %s" % (node, i, r, new_r)
+            print "-- changing (%s.inputs[%s]) from %s to %s" % (
+                node, i, r, new_r)
 
 
 class PreserveNames:

theano/misc/check_blas.py

@@ -4,14 +4,16 @@
 #A,B,C matrix
 #a,b scalar
 
-s="""
+s = """
 result for shapes=(2000,2000) and iters=100
 GTX 470 7.22s
 GTX 285, 6.84s
 GTX 480 5.83s
 """
 
-import os, sys, time
+import os
+import sys
+import time
 
 import numpy
 import theano
@@ -20,61 +22,67 @@ import theano.tensor as T
 from theano.gof.python25 import any
 
 
-shapes=(2000,2000)
+shapes = (2000, 2000)
 iters = 10
 
 
 def execute(execute=True, verbose=True):
 
-    a=theano.shared(numpy.ones(shapes, dtype=theano.config.floatX))
-    b=theano.shared(numpy.ones(shapes, dtype=theano.config.floatX))
-    c=theano.shared(numpy.ones(shapes, dtype=theano.config.floatX))
+    a = theano.shared(numpy.ones(shapes, dtype=theano.config.floatX))
+    b = theano.shared(numpy.ones(shapes, dtype=theano.config.floatX))
+    c = theano.shared(numpy.ones(shapes, dtype=theano.config.floatX))
 
-    f=theano.function([],updates={c:0.4*c+.8*T.dot(a,b)})
+    f = theano.function([], updates={c: 0.4 * c + .8 * T.dot(a, b)})
 
     if verbose:
         print 'Some theano flags:'
-        print '    blas.ldflags=',theano.config.blas.ldflags
-        print '    compiledir=',theano.config.compiledir
-        print '    floatX=',theano.config.floatX
+        print '    blas.ldflags=', theano.config.blas.ldflags
+        print '    compiledir=', theano.config.compiledir
+        print '    floatX=', theano.config.floatX
         print 'Some env flags:'
-        print '    MKL_NUM_THREADS=',os.getenv('MKL_NUM_THREADS')
-        print '    OMP_NUM_THREADS=',os.getenv('OMP_NUM_THREADS')
-        print '    GOTO_NUM_THREADS=',os.getenv('GOTO_NUM_THREADS')
+        print '    MKL_NUM_THREADS=', os.getenv('MKL_NUM_THREADS')
+        print '    OMP_NUM_THREADS=', os.getenv('OMP_NUM_THREADS')
+        print '    GOTO_NUM_THREADS=', os.getenv('GOTO_NUM_THREADS')
         print
-        print 'Numpy config:(used when the theano flags "blas.ldflags" is empty)'
-        numpy.show_config();
-        print 'Numpy dot module:',numpy.dot.__module__;
-        print 'Numpy file location that was loaded:',numpy.__file__;
-        print 'Numpy version:',numpy.__version__
+        print ('Numpy config: (used when the theano flags'
+               ' "blas.ldflags" is empty)')
+        numpy.show_config()
+        print 'Numpy dot module:', numpy.dot.__module__
+        print 'Numpy file location that was loaded:', numpy.__file__
+        print 'Numpy version:', numpy.__version__
         print
-        if any( [x.op.__class__.__name__=='Gemm' for x in f.maker.env.toposort()]):
+        if any([x.op.__class__.__name__ == 'Gemm' for x in
+                f.maker.env.toposort()]):
             print 'Used the cpu'
-        elif any( [x.op.__class__.__name__=='GpuGemm' for x in f.maker.env.toposort()]):
+        elif any([x.op.__class__.__name__ == 'GpuGemm' for x in
+                  f.maker.env.toposort()]):
             print 'Used the gpu'
         else:
             print 'ERROR, not able to tell if theano used the cpu or the gpu'
             print f.maker.env.toposort()
-    t0=0
-    t1=-1
+    t0 = 0
+    t1 = -1
 
     if execute:
-        t0=time.time()
+        t0 = time.time()
         for i in range(iters):
             f()
-        t1=time.time()
+        t1 = time.time()
     if verbose and execute:
         print
-        print 'This execution time took %.2fs'%(t1-t0)
+        print 'This execution time took %.2fs' % (t1 - t0)
         print
-        print 'Try to run this script a few times. Experience show that the first time is not as fast as followings call. The difference is not big, but consistent.'
-    return t1-t0
+        print ('Try to run this script a few times. Experience show that'
+               ' the first time is not as fast as followings call. The'
+               ' difference is not big, but consistent.')
+    return t1 - t0
 
 
 def jobman_job(state, channel):
     execute()
     return channel.COMPLETE
 
+
 def test():
     execute()
 
@@ -92,11 +100,15 @@ if __name__ == "__main__":
 
     if verbose:
         print """
-        Some results that you can compare against. They were 10 executions of gemm in float64 with matrices of shape 2000x2000.
-
-        CPU tested: Xeon E5345(2.33Ghz, 8M L2 cache, 1333Mhz FSB), Xeon E5430(2.66Ghz, 12M L2 cache, 1333Mhz FSB),
-                    Xeon E5450(3Ghz, 12M L2 cache, 1333Mhz FSB), Xeon X5560(2.8Ghz, 12M L2 cache, 6.4GT/s QPI, hyper-threads enabled?)
-                    Core 2 E8500, Core i7 930(2.8Ghz, hyper-threads enabled), Core i7 950(3.07GHz, hyper-threads enabled)
+        Some results that you can compare against. They were 10 executions
+        of gemm in float64 with matrices of shape 2000x2000.
+
+        CPU tested: Xeon E5345(2.33Ghz, 8M L2 cache, 1333Mhz FSB),
+                    Xeon E5430(2.66Ghz, 12M L2 cache, 1333Mhz FSB),
+                    Xeon E5450(3Ghz, 12M L2 cache, 1333Mhz FSB),
+                    Xeon X5560(2.8Ghz, 12M L2 cache, hyper-threads?)
+                    Core 2 E8500, Core i7 930(2.8Ghz, hyper-threads enabled),
+                    Core i7 950(3.07GHz, hyper-threads enabled)
                     Xeon X5550(2.67GHz, 8M l2 cache?, hyper-threads enabled)
 
 
@@ -132,7 +144,8 @@ if __name__ == "__main__":
         goto2 1.13/16                                                     3.16s
 
         Test time in float32 with cuda 3.0.14
-        (cuda version 3.2RC and up are supposed to have faster gemm on the GTX4?? card)
+        (cuda version 3.2RC and up have a faster gemm on the Fermi/GTX[45]??
+
         gpu/cuda version
         GTX580/3.2        0.20s
         GTX480/3.2        0.24s
@@ -149,6 +162,7 @@ if __name__ == "__main__":
         """
 
         print
-        print "We timed",iters,"executions of gemm with matrix of shapes",shapes
+        print "We timed", iters,
+        print "executions of gemm with matrix of shapes", shapes
     else:
         print t

theano/misc/check_blas_many.sh

@@ -11,7 +11,7 @@ TIME_PREFIX=time
 VAR=OMP_NUM_THREADS
 echo "numpy gemm take="
 THEANO_FLAGS=blas.ldflags= $TIME_PREFIX python misc/check_blas.py --quiet
-for i in 1 2 4 8:
+for i in 1 2 4 8
 do
   export $VAR=$i
   x=`$TIME_PREFIX python misc/check_blas.py --quiet`