Skip to content
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

reshape and _new_like_me should respect matrix ordering #15

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

reshape and _new_like_me should respect matrix ordering #15

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
21 changes: 19 additions & 2 deletions pycuda/gpuarray.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,9 +355,15 @@ def _new_like_me(self, dtype=None):
else:
if dtype == self.dtype:
strides = self.strides

## respect old ordering
if self.flags.f_contiguous:
order="F"
else:
order="C"

return self.__class__(self.shape, dtype,
allocator=self.allocator, strides=strides)
allocator=self.allocator, strides=strides, order=order)

# operators ---------------------------------------------------------------
def mul_add(self, selffac, other, otherfac, add_timer=None, stream=None):
Expand Down Expand Up @@ -629,6 +635,16 @@ def reshape(self, *shape):
# TODO: add more error-checking, perhaps
if isinstance(shape[0], tuple) or isinstance(shape[0], list):
shape = tuple(shape[0])

# allow users to change ordering and respect
# the old ordering otherwise
if len(shape)==3:
order=shape[2]; shape=shape[0:2]
elif self.flags.f_contiguous:
order="F"
else:
order="C"

size = reduce(lambda x, y: x * y, shape, 1)
if size != self.size:
raise ValueError("total size of new array must be unchanged")
Expand All @@ -638,7 +654,8 @@ def reshape(self, *shape):
dtype=self.dtype,
allocator=self.allocator,
base=self,
gpudata=int(self.gpudata))
gpudata=int(self.gpudata),
order=order)

def ravel(self):
return self.reshape(self.size)
Expand Down