Merge pull request #2705 from carriepl/test_buildbot_tests

theano/printing.py

@@ -956,9 +956,9 @@ def pydotprint_variables(vars,
     try:
         import pydot as pd
     except ImportError:
-        str = ("Failed to import pydot. You must install pydot for " +
+        err = ("Failed to import pydot. You must install pydot for " +
                "`pydotprint_variables` to work.")
-        print str
+        print err
         return
     g = pd.Dot()
     my_list = {}

theano/sandbox/cuda/tests/test_opt.py

@@ -19,6 +19,8 @@ import theano.sandbox.cuda as cuda
 if not cuda.cuda_available:
     raise SkipTest('Optional package cuda disabled')
 
+import theano.sandbox.cuda.cula as cula
+
 from theano.sandbox.cuda import basic_ops
 from theano.sandbox.cuda.type import CudaNdarrayType
 from theano.scalar.basic_scipy import erfinv
@@ -537,6 +539,10 @@ def test_erfinvgpu():
 
 
 def test_local_gpu_solve():
+
+    if not cula.cula_available:
+        raise SkipTest('Optional dependency CULA not available')
+
     numpy.random.seed(1)
 
     def cmp(a_shp, b_shp):