Skip to content

roll: skip 0-size dim and reject duplicate dims #5

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
ikanquit wants to merge 1 commit into
base: master
Choose a base branch
from
Open

roll: skip 0-size dim and reject duplicate dims #5

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
6 changes: 4 additions & 2 deletions tinygrad/mixin/movement.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -522,9 +522,11 @@ def roll(self, shifts:int|tuple[int, ...], dims:int|tuple[int, ...]|None=None) -
if dims is None: return self.flatten().roll(shifts, 0).reshape(self.shape)
dims, shifts = tuple(self._resolve_dim(d) for d in make_tuple(dims, 1)), make_tuple(shifts, 1)
if len(dims) != len(shifts): raise RuntimeError(f"{len(dims)=} != {len(shifts)=}")
if len(set(dims)) != len(dims): raise RuntimeError(f"duplicate dims in roll: {dims=}")
shrink_arg: list[tuple[sint, sint]|None] = [None] * self.ndim
for d, s in zip(dims, shifts): shrink_arg[d] = (delta:=self.shape[d]-s%self.shape[d], delta+self.shape[d])
return self.repeat(*tuple(2 if i in dims else 1 for i in range(self.ndim))).shrink(tuple(shrink_arg))
for d, s in zip(dims, shifts):
if self.shape[d] != 0: shrink_arg[d] = (delta:=self.shape[d]-s%self.shape[d], delta+self.shape[d])
return self.repeat(*tuple(2 if i in dims and self.shape[i] != 0 else 1 for i in range(self.ndim))).shrink(tuple(shrink_arg))

# *** movement ops with expand ***

Expand Down