Merge branch 'master' of tuck.ath.cx:src/pyopencl

doc/source/array.rst

@@ -113,7 +113,7 @@ Constructing :class:`Array` Instances
 
     A synonym for the :class:`Array` constructor.
 
-.. function:: zeros(context, queue, shape, dtype, allocator=None)
+.. function:: zeros(context, queue, shape, dtype, order="C", allocator=None)
 
     Same as :func:`empty`, but the :class:`Array` is zero-initialized before
     being returned.

pyopencl/array.py

@@ -520,7 +520,7 @@ def to_device(context, queue, ary, allocator=None, async=False):
 
 empty = Array
 
-def zeros(context, queue, shape, dtype, allocator=None):
+def zeros(context, queue, shape, dtype, order="C", allocator=None):
     """Returns an array of the given shape and dtype filled with 0's."""
 
     result = Array(context, shape, dtype,