Merge branch 'tensor_mean_ndarray_crash'

theano/tensor/basic.py

@@ -2624,7 +2624,7 @@ def mean(input, axis = None, op = False):
         axis = [axis]
     for i in axis:
         s = s / shp[i]
-    if input.dtype.startswith('float'):
+    if str(input.dtype).startswith('float'):
         assert input.dtype == s.dtype
     return s
 

theano/tensor/elemwise.py

@@ -1021,6 +1021,8 @@ class CAReduce(Op):
         return input_dtype
 
     def make_node(self, input):
+        input = as_tensor_variable(input)
+
         if self.axis is not None:
             for axis in self.axis:
                 if axis >= input.type.ndim or (axis<0 and abs(axis)>input.type.ndim):

theano/tensor/tests/test_basic.py

@@ -2918,6 +2918,14 @@ class T_divimpl(unittest.TestCase):
         assert numpy.allclose(function([i, ii, d, f, c], true_div(ii,i))(5, 3, 7.0, 11.0, numpy.complex(5,3)),
                 (3./5.))
 
+
+class T_mean(unittest.TestCase):
+    def test_regression_mean_of_ndarray_failure(self):
+        try:
+            T.mean(numpy.zeros(1))
+        except AttributeError:
+            self.fail()
+
 # class T_abs(unittest.TestCase):
 #     def test_impl(self):
 #         t = as_tensor_variable(1.0)