From 67486ff92d9f78bcd14865a8bb81de0b94ded075 Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Tue, 13 May 2025 16:59:35 -0700 Subject: [PATCH] bump tinygrad (#35208) * bump tinygrad * fix * why is mac different? * fix sim * relax that --- .gitmodules | 2 +- selfdrive/modeld/SConscript | 4 ++-- selfdrive/modeld/modeld.py | 5 +++-- selfdrive/test/test_onroad.py | 2 +- tinygrad_repo | 2 +- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.gitmodules b/.gitmodules index 54c7393986..ad6530de9a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -15,4 +15,4 @@ url = ../../commaai/teleoprtc [submodule "tinygrad"] path = tinygrad_repo - url = https://github.com/commaai/tinygrad.git + url = https://github.com/tinygrad/tinygrad.git diff --git a/selfdrive/modeld/SConscript b/selfdrive/modeld/SConscript index cecebfa18b..0704dd4704 100644 --- a/selfdrive/modeld/SConscript +++ b/selfdrive/modeld/SConscript @@ -43,9 +43,9 @@ pythonpath_string = 'PYTHONPATH="${PYTHONPATH}:' + env.Dir("#tinygrad_repo").abs if arch == 'larch64': device_string = 'QCOM=1' elif arch == 'Darwin': - device_string = 'CLANG=1 IMAGE=0' + device_string = 'CLANG=1 IMAGE=0 JIT=2' else: - device_string = 'LLVM=1 LLVMOPT=1 BEAM=0 IMAGE=0' + device_string = 'LLVM=1 LLVMOPT=1 BEAM=0 IMAGE=0 JIT=2' for model_name in ['driving_vision', 'driving_policy', 'dmonitoring_model']: fn = File(f"models/{model_name}").abspath diff --git a/selfdrive/modeld/modeld.py b/selfdrive/modeld/modeld.py index 5e1acdea0e..814bc7a999 100755 --- a/selfdrive/modeld/modeld.py +++ b/selfdrive/modeld/modeld.py @@ -1,13 +1,14 @@ #!/usr/bin/env python3 import os from openpilot.system.hardware import TICI -from tinygrad.tensor import Tensor -from tinygrad.dtype import dtypes if TICI: from openpilot.selfdrive.modeld.runners.tinygrad_helpers import qcom_tensor_from_opencl_address os.environ['QCOM'] = '1' else: os.environ['LLVM'] = '1' + os.environ['JIT'] = '2' +from tinygrad.tensor import Tensor +from tinygrad.dtype import dtypes import time import pickle import numpy as np diff --git a/selfdrive/test/test_onroad.py b/selfdrive/test/test_onroad.py index 4cd952219c..d0c725cacb 100644 --- a/selfdrive/test/test_onroad.py +++ b/selfdrive/test/test_onroad.py @@ -398,7 +398,7 @@ class TestOnroad: ("modelV2", 0.06, 0.040), # can miss cycles here and there, just important the avg frequency is 20Hz - ("driverStateV2", 0.2, 0.05), + ("driverStateV2", 0.3, 0.05), ] for (s, instant_max, avg_max) in cfgs: ts = [getattr(m, s).modelExecutionTime for m in self.msgs[s]] diff --git a/tinygrad_repo b/tinygrad_repo index 0e34f9082e..ddff9857b8 160000 --- a/tinygrad_repo +++ b/tinygrad_repo @@ -1 +1 @@ -Subproject commit 0e34f9082e9730b5df9c055b094a43e4565e413b +Subproject commit ddff9857b8527c16e5917eeec2dc55da69fa74d2