Merge pull request #1132 from nouiz/misc2

theano/misc/check_blas.py

@@ -205,6 +205,8 @@ if __name__ == "__main__":
         C2075/4.2         0.25s
         GTX285/4.2        0.452s #cuda 3.0 seam faster? driver version?
 
+        GTX460/4.0        0.45s
+
         GTX580/3.2        0.203s
         GTX680/3.2        0.218s
         GTX480/3.2        0.237s

theano/sandbox/cuda/basic_ops.py

@@ -59,7 +59,9 @@ class HostFromGpu(GpuOp):
 
     def make_node(self, x):
         if not isinstance(x.type, CudaNdarrayType):
-            raise TypeError(x)
+            raise TypeError("Expected a Theano variable with type "
+                            "CudaNdarrayType. Got %s with type %s" % (x,
+                                                                      x.type))
         return Apply(self, [x], [tensor.TensorType(dtype=x.dtype,
                                     broadcastable=x.broadcastable)()])
 
@@ -113,7 +115,9 @@ class GpuFromHost(GpuOp):
 
     def make_node(self, x):
         if not isinstance(x.type, tensor.TensorType):
-            raise TypeError(x)
+            raise TypeError("Expected a Theano variable with type "
+                            "TensorType. Got %s with type %s" % (x,
+                                                                 x.type))
         return Apply(self, [x], [CudaNdarrayType(broadcastable=x.broadcastable,
                                                  dtype=x.dtype)()])
 

theano/tests/test_determinism.py

@@ -6,16 +6,17 @@ import numpy as np
 import theano
 from theano.printing import var_descriptor
 from cStringIO import StringIO
+from nose.plugins.skip import SkipTest
+
 from theano import config
 from theano import shared
 
+
 def sharedX(x, name=None):
     x = np.cast[config.floatX](x)
     return shared(x, name)
 
 
-
-
 def test_determinism_1():
 
     # Tests that repeatedly running a script that compiles and
@@ -24,7 +25,12 @@ def test_determinism_1():
     # change.
     # This specific script is capable of catching a bug where
     # FunctionGraph.toposort was non-deterministic.
-    def run(replay, log = None):
+    try:
+        import hashlib
+    except ImportError:
+        raise SkipTest('python version too old to do this test')
+
+    def run(replay, log=None):
 
         if not replay:
             log = StringIO()
@@ -32,7 +38,6 @@ def test_determinism_1():
             log = StringIO(log)
         record = Record(replay=replay, file_object=log)
 
-
         disturb_mem.disturb_mem()
 
         mode = RecordMode(record=record)
@@ -53,19 +58,20 @@ def test_determinism_1():
                 v_range.max(),
                 ]):
             disturb_mem.disturb_mem()
-            s = sharedX(0., name='s_'+str(i))
+            s = sharedX(0., name='s_' + str(i))
             updates.append((s, val))
 
-        for var in theano.gof.graph.ancestors(update for var, update in updates):
+        for var in theano.gof.graph.ancestors(update for _, update in updates):
             if var.name is not None and var.name is not 'b':
                 if var.name[0] != 's' or len(var.name) != 2:
                     var.name = None
 
         for key in channels:
             updates.append((s, channels[key]))
-        f = theano.function([], mode=mode, updates=updates, on_unused_input='ignore', name='f')
+        f = theano.function([], mode=mode, updates=updates,
+                            on_unused_input='ignore', name='f')
         for output in f.maker.fgraph.outputs:
-            mode.record.handle_line(var_descriptor(output)+'\n')
+            mode.record.handle_line(var_descriptor(output) + '\n')
         disturb_mem.disturb_mem()
         f()