From 0d82cfd587fc9f8b0380f33b8ea760fd4ddad5bd Mon Sep 17 00:00:00 2001 From: George Hotz Date: Sat, 2 Jul 2022 23:07:59 -0700 Subject: [PATCH] huh, torch 1.12 broke it. remove unused requirements.txt and pin torch 1.11 --- requirements.txt | 14 -------------- setup.py | 2 +- tinygrad/llops/ops_torch.py | 7 ++++--- 3 files changed, 5 insertions(+), 18 deletions(-) delete mode 100644 requirements.txt diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index 2ba5dd18c3..0000000000 --- a/requirements.txt +++ /dev/null @@ -1,14 +0,0 @@ -numpy -pyopencl==2020.2.2 -pillow -# util deps -requests -# testing deps ---find-links https://download.pytorch.org/whl/torch_stable.html -torch==1.6.0+cpu -torchvision==0.7.0+cpu -pytest -tqdm -protobuf~=3.19.0 -onnx -onnx2torch diff --git a/setup.py b/setup.py index 270a3cbb09..7440821316 100644 --- a/setup.py +++ b/setup.py @@ -25,7 +25,7 @@ setup(name='tinygrad', 'gpu': ["pyopencl", "six"], 'testing': [ "pytest", - "torch", + "torch~=1.11.0", "tqdm", "protobuf~=3.19.0", "onnx", diff --git a/tinygrad/llops/ops_torch.py b/tinygrad/llops/ops_torch.py index 6f4951247d..d215b33fc4 100644 --- a/tinygrad/llops/ops_torch.py +++ b/tinygrad/llops/ops_torch.py @@ -10,14 +10,15 @@ class TorchBuffer(torch.Tensor): return super().__new__(cls, shape) else: return TorchBuffer(torch.zeros(shape)).to(device) - custompad = lambda x,padding: torch.nn.functional.pad(x, [item for sublist in padding[::-1] for item in sublist]) + + def custompad(x, padding): return torch.nn.functional.pad(x, [item for sublist in padding[::-1] for item in sublist]) + def getdtype(self): return np.float32 + @staticmethod def fromCPU(data): return TorchBuffer(torch.from_numpy(data).requires_grad_(False)).to(device) def toCPU(x): return x.cpu().numpy() - def getdtype(self): - return np.float32 unary_op, binary_op, reduce_op, movement_op = CPUBuffer.unary_op, CPUBuffer.binary_op, CPUBuffer.reduce_op, CPUBuffer.movement_op