Merge pull request #4168 from abergeron/fix_cgemv_nan

theano/tensor/nnet/tests/test_abstract_conv.py

@@ -294,6 +294,11 @@ class TestCpuConv2d(BaseTestConv2d):
     def setUp(self):
         super(TestCpuConv2d, self).setUp()
         self.mode = theano.compile.mode.get_default_mode().excluding('conv_gemm')
+        self.opt_err = theano.config.on_opt_error
+        theano.config.on_opt_error = 'ignore'
+
+    def tearDown(self):
+        theano.config.on_opt_error = self.opt_err
 
     def tcase(self, i, f, s, b, flip, provide_shape):
         mode = self.mode

theano/tensor/tests/test_blas_c.py

@@ -130,6 +130,16 @@ class TestCGemv(TestCase, TestOptimizationMixin):
         # scalar
         self.a = tensor.tensor(dtype=dtype, broadcastable=())
 
+    def test_nan_beta_0(self):
+        f = theano.function([self.A, self.x, self.y, self.a],
+                            self.a*self.y + theano.dot(self.A, self.x),
+                            mode=self.mode)
+        Aval = numpy.ones((3, 1), dtype=self.dtype)
+        xval = numpy.ones((1,), dtype=self.dtype)
+        yval = float('NaN') * numpy.ones((3,), dtype=self.dtype)
+        zval = f(Aval, xval, yval, 0)
+        assert not numpy.isnan(zval).any()
+
     def test_optimizations_vm(self):
         ''' Test vector dot matrix '''
         f = theano.function([self.x, self.A],
@@ -140,7 +150,7 @@ class TestCGemv(TestCase, TestOptimizationMixin):
         self.assertFunctionContains0(f, tensor.dot)
         self.assertFunctionContains1(
             f,
-            CGemv(inplace=True, force_init_beta=True)
+            CGemv(inplace=True)
         )
 
         # Assert they produce the same output
@@ -161,7 +171,7 @@ class TestCGemv(TestCase, TestOptimizationMixin):
         self.assertFunctionContains0(f, tensor.dot)
         self.assertFunctionContains1(
             f,
-            CGemv(inplace=True, force_init_beta=True)
+            CGemv(inplace=True)
         )
 
         # Assert they produce the same output