Fix contiguous check

cupy · Jul 26, 2017 · 93cdee0 · 93cdee0
1 parent cd45523
commit 93cdee0
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/cupy/core/core.pyx b/cupy/core/core.pyx
@@ -1549,10 +1549,13 @@ cdef class ndarray:
                 arr.dtype, self.dtype))
         if self.shape != arr.shape:
             raise ValueError('Shape mismatch')
-        if not self._c_contiguous:
+        if self._c_contiguous:
+            arr = numpy.ascontiguousarray(arr)
+        elif self._f_contiguous:
+            arr = numpy.asfortranarray(arr)
+        else:
             raise RuntimeError('Cannot set to non-contiguous array')
 
-        arr = numpy.ascontiguousarray(arr)
         ptr = arr.ctypes.get_as_parameter()
         if stream is None:
             self.data.copy_from_host(ptr, self.nbytes)