disable CBLAS optimizations for scipy blas tests

theano/tensor/blas_c.py

@@ -444,13 +444,13 @@ def make_c_gemv_destructive(node):
 # Optimizers
 ####### ####### #######
 
-blas_optdb.register('c_blas',
+blas_optdb.register('use_c_blas',
     EquilibriumOptimizer([
         use_c_ger,
         use_c_gemv,
         ],
         max_use_ratio=5),
-    20, 'fast_run')
+    20, 'fast_run', 'c_blas')
 print 'BLAS_OPTDB'
 print blas_optdb
 
@@ -461,4 +461,4 @@ optdb.register('c_blas_destructive',
                 make_c_gemv_destructive,
             ],
             max_use_ratio=5),
-        70.0, 'fast_run', 'inplace')
+        70.0, 'fast_run', 'inplace', 'c_blas')

theano/tensor/tests/test_blas_scipy.py

@@ -9,7 +9,9 @@ from test_blas import TestCase, TestOptimizationMixin, gemm_no_inplace
 class TestScipyGer(TestCase, TestOptimizationMixin):
 
     def setUp(self):
-        self.mode = theano.compile.get_default_mode().including('fast_run')
+        self.mode = theano.compile.get_default_mode()
+        self.mode = self.mode.including('fast_run')
+        self.mode = self.mode.excluding('c_blas')  # c_blas trumps scipy Ops
         dtype = self.dtype = 'float64'  # optimization isn't dtype-dependent
         self.A = tensor.tensor(dtype=dtype, broadcastable=(False, False))
         self.a = tensor.tensor(dtype=dtype, broadcastable=())
@@ -21,6 +23,7 @@ class TestScipyGer(TestCase, TestOptimizationMixin):
         if not theano.tensor.blas_scipy.optimizations_enabled:
             self.SkipTest()
 
+
     def function(self, inputs, outputs):
         return theano.function(inputs, outputs, self.mode)