Skip to content

Fix zeros_like/ones_like/empty_like for scalar and array_like inputs #505

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cycsmail wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix zeros_like/ones_like/empty_like for scalar and array_like inputs #505

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 16 additions & 7 deletions pycuda/gpuarray.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1317,6 +1317,12 @@ def ones(shape, dtype=np.float64, allocator=drv.mem_alloc, order="C"):

def _array_like_helper(other_ary, dtype, order):
"""Set order, strides, dtype as in numpy's zero_like. """
if isinstance(other_ary, GPUArray):
allocator = other_ary.allocator
else:
# mirror numpy, which accepts array_like (e.g. scalar) inputs
other_ary = np.asarray(other_ary)
allocator = drv.mem_alloc
strides = None
if order == "A":
if other_ary.flags.f_contiguous and not other_ary.flags.c_contiguous:
Expand All @@ -1340,30 +1346,33 @@ def _array_like_helper(other_ary, dtype, order):
raise ValueError("Unsupported order: %r" % order)
if dtype is None:
dtype = other_ary.dtype
return dtype, order, strides
return other_ary, allocator, dtype, order, strides


def empty_like(other_ary, dtype=None, order="K"):
dtype, order, strides = _array_like_helper(other_ary, dtype, order)
other_ary, allocator, dtype, order, strides = _array_like_helper(
other_ary, dtype, order)
return GPUArray(
other_ary.shape, dtype, other_ary.allocator, order=order, strides=strides
other_ary.shape, dtype, allocator, order=order, strides=strides
)


def zeros_like(other_ary, dtype=None, order="K"):
dtype, order, strides = _array_like_helper(other_ary, dtype, order)
other_ary, allocator, dtype, order, strides = _array_like_helper(
other_ary, dtype, order)
result = GPUArray(
other_ary.shape, dtype, other_ary.allocator, order=order, strides=strides
other_ary.shape, dtype, allocator, order=order, strides=strides
)
zero = np.zeros((), result.dtype)
result.fill(zero)
return result


def ones_like(other_ary, dtype=None, order="K"):
dtype, order, strides = _array_like_helper(other_ary, dtype, order)
other_ary, allocator, dtype, order, strides = _array_like_helper(
other_ary, dtype, order)
result = GPUArray(
other_ary.shape, dtype, other_ary.allocator, order=order, strides=strides
other_ary.shape, dtype, allocator, order=order, strides=strides
)
one = np.ones((), result.dtype)
result.fill(one)
Expand Down
7 changes: 7 additions & 0 deletions test/test_gpuarray.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1606,6 +1606,13 @@ def test_zeros_like_etc(self):
assert new_z.dtype == np.complex64
assert new_z.shape == arr.shape

# scalar / array_like (non-GPUArray) input, see issue #389
for scalar in [42.0, np.float32(42)]:
ref = np.asarray(scalar)
new_z = func(scalar)
assert new_z.shape == ref.shape
assert new_z.dtype == ref.dtype

def test_logical_and_or(self):
rng = np.random.default_rng(seed=0)
for op in ["logical_and", "logical_or"]:
Expand Down
Loading