From ef67d7ff5d24bbfd58b33fd9d0a15d88f5a7c166 Mon Sep 17 00:00:00 2001 From: George Hotz Date: Wed, 15 Nov 2023 15:24:09 -0800 Subject: [PATCH] shapetracker whitespace --- tinygrad/shape/shapetracker.py | 19 +++++-------------- tinygrad/shape/view.py | 1 - 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/tinygrad/shape/shapetracker.py b/tinygrad/shape/shapetracker.py index d78a092f04..ee4c591211 100644 --- a/tinygrad/shape/shapetracker.py +++ b/tinygrad/shape/shapetracker.py @@ -188,20 +188,11 @@ class ShapeTracker: # *** under this line are the movement ops *** - def pad(self, arg: Tuple[Tuple[int, int], ...]) -> ShapeTracker: - return ShapeTracker(self.views[0:-1] + (self.views[-1].pad(arg), )) - - def shrink(self, arg: Tuple[Tuple[sint, sint], ...]) -> ShapeTracker: - return ShapeTracker(self.views[0:-1] + (self.views[-1].shrink(arg), )) - - def expand(self, new_shape: Tuple[sint, ...]) -> ShapeTracker: - return ShapeTracker(self.views[0:-1] + (self.views[-1].expand(new_shape), )) - - def permute(self, axis: Tuple[int, ...]) -> ShapeTracker: - return ShapeTracker(self.views[0:-1] + (self.views[-1].permute(axis), )) - - def stride(self, mul: Tuple[int, ...]) -> ShapeTracker: - return ShapeTracker(self.views[0:-1] + (self.views[-1].stride(mul), )) + def pad(self, arg: Tuple[Tuple[int, int], ...]) -> ShapeTracker: return ShapeTracker(self.views[0:-1] + (self.views[-1].pad(arg), )) + def shrink(self, arg: Tuple[Tuple[sint, sint], ...]) -> ShapeTracker: return ShapeTracker(self.views[0:-1] + (self.views[-1].shrink(arg), )) + def expand(self, new_shape: Tuple[sint, ...]) -> ShapeTracker: return ShapeTracker(self.views[0:-1] + (self.views[-1].expand(new_shape), )) + def permute(self, axis: Tuple[int, ...]) -> ShapeTracker: return ShapeTracker(self.views[0:-1] + (self.views[-1].permute(axis), )) + def stride(self, mul: Tuple[int, ...]) -> ShapeTracker: return ShapeTracker(self.views[0:-1] + (self.views[-1].stride(mul), )) def reshape(self, new_shape: Tuple[sint, ...]) -> ShapeTracker: new_view = self.views[-1].reshape(new_shape) diff --git a/tinygrad/shape/view.py b/tinygrad/shape/view.py index 795ee9b019..92e770c6d0 100644 --- a/tinygrad/shape/view.py +++ b/tinygrad/shape/view.py @@ -131,5 +131,4 @@ class View: return View.create(new_shape, new_strides_tuple, self.offset, new_mask_tuple) # TODO: bring the merge_views logic here for more caching - return None