From c898dfe150574f80937eeae5dae56e8bc3492723 Mon Sep 17 00:00:00 2001
From: chenyu <chenyu@fastmail.com>
Date: Mon, 13 Jul 2026 16:10:58 -0400
Subject: [PATCH] remove UOp.contiguous override [PR] (#17012)

also cleaned up max_shard_shape
---
 tinygrad/mixin/elementwise.py | 4 +++-
 tinygrad/uop/ops.py           | 9 +--------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/tinygrad/mixin/elementwise.py b/tinygrad/mixin/elementwise.py
index db865d964c..01cffa28d0 100644
--- a/tinygrad/mixin/elementwise.py
+++ b/tinygrad/mixin/elementwise.py
@@ -49,7 +49,9 @@ class ElementwiseMixin(CreationMixin):
     """
     Returns a contiguous tensor.
     """
-    return self._wrap_uop(self._uop.contiguous(**kwargs))
+    uop = self._uop
+    if uop.op is Ops.CONTIGUOUS or self.device is None or uop.has_buffer_identity(): return self._wrap_uop(uop)
+    return self._wrap_uop(uop.alu(Ops.CONTIGUOUS, **kwargs))
 
   def contiguous_backward(self) -> Self:
     """
diff --git a/tinygrad/uop/ops.py b/tinygrad/uop/ops.py
index 03ca73deec..39c556f835 100644
--- a/tinygrad/uop/ops.py
+++ b/tinygrad/uop/ops.py
@@ -446,9 +446,7 @@ class UOp(RandMixin, metaclass=UOpMetaClass):
     return tuple(x//len(self.device) if i == self.axis else x for i,x in enumerate(self.shape))
 
   @property
-  def max_shard_shape(self) -> tuple[int, ...]:
-    if not isinstance(self.device, tuple) or self.axis is None: return self.max_shape
-    return tuple(x//len(self.device) if i == self.axis else x for i,x in enumerate(self.max_shape))
+  def max_shard_shape(self) -> tuple[int, ...]: return to_max_shape(self.shard_shape)
 
   @functools.cached_property
   def ended_ranges(self) -> tuple[UOp, ...]:
@@ -622,11 +620,6 @@ class UOp(RandMixin, metaclass=UOpMetaClass):
     if isinstance(arg, Ops): arg = (arg, 0)
     return UOp(Ops.REDUCE, src=(self,)+src, arg=arg, **kwargs)
 
-  def contiguous(self, *args, **kwargs):
-    if self.op is Ops.CONTIGUOUS: return self
-    if self.device is None: return self
-    if self.has_buffer_identity(): return self
-    return UOp(Ops.CONTIGUOUS, src=(self,)+args, **kwargs)
   def bufferize(self, *args, **kwargs): return UOp(Ops.STAGE, src=(self,)+args, **kwargs)
   def allreduce(self, op, device:str|tuple[str, ...]):
     assert isinstance(self.device, tuple), f"allreduce must be on tuple {self.device} isn't"