BatchedDot: negate contiguity test for less confusion

theano/tensor/basic.py

@@ -3537,13 +3537,13 @@ class BatchedDot(Op):
         _z, = out
         fail = sub["fail"]
 
-        # generate condition to detect noncontiguous arrays
-        def not_contiguous(var, ndim):
+        # generate contiguity condition
+        def contiguous(var, ndim):
             strides = "PyArray_STRIDES(%s)" % var
-            return " || ".join([
-                " || ".join("{strides}[{i}] < 1 || {strides}[{i}] % type_size"
+            return " && ".join([
+                " && ".join("{strides}[{i}] > 0 && {strides}[{i}] % type_size == 0"
                             .format(strides=strides, i=i) for i in range(ndim)),
-                "(%s)" % " && ".join("{strides}[{i}] != type_size"
+                "(%s)" % " || ".join("{strides}[{i}] == type_size"
                                      .format(strides=strides, i=i) for i in range(ndim)),
             ])
 
@@ -3560,9 +3560,9 @@ class BatchedDot(Op):
         z_shape_correct = " && ".join("PyArray_DIMS(%s)[%i] == %s"
                                       % (_z, i, dim) for i, dim in enumerate(z_dims))
         z_shape = ", ".join(z_dims)
-        z_not_contiguous = not_contiguous(_z, z_ndim)
+        z_contiguous = contiguous(_z, z_ndim)
         allocate = """
-            if ((NULL == %(_z)s) || !(%(z_shape_correct)s)  || (%(z_not_contiguous)s))
+            if (NULL == %(_z)s || !(%(z_shape_correct)s)  || !(%(z_contiguous)s))
             {
                 npy_intp dims[%(z_ndim)s] = {%(z_shape)s};
                 Py_XDECREF(%(_z)s);
@@ -3579,9 +3579,9 @@ class BatchedDot(Op):
         # code to reallocate inputs contiguously if necessary
         contiguate = []
         for var, ndim in [(_x, x_ndim), (_y, y_ndim)]:
-            _not_contiguous = not_contiguous(var, ndim)
+            _contiguous = contiguous(var, ndim)
             contiguate.append("""
-                if (%(_not_contiguous)s) {
+                if (!(%(_contiguous)s)) {
                     PyArrayObject * _copy = (PyArrayObject *) PyArray_Copy(%(var)s);
                     if (!_copy)
                         %(fail)s