From 48d34754a1a8c27c01ed673410dd71a19041e94c Mon Sep 17 00:00:00 2001
From: Bruce Wayne <harald.the.engineer@gmail.com>
Date: Thu, 24 Jul 2025 18:54:50 -0700
Subject: [PATCH] step one cleanup

---
 selfdrive/modeld/SConscript           | 6 +++---
 selfdrive/modeld/dmonitoringmodeld.py | 5 +++--
 selfdrive/modeld/modeld.py            | 8 ++++----
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/selfdrive/modeld/SConscript b/selfdrive/modeld/SConscript
index 0da3c24e19..13fcfc2525 100644
--- a/selfdrive/modeld/SConscript
+++ b/selfdrive/modeld/SConscript
@@ -50,9 +50,9 @@ def tg_compile(flags, model_name):
 # Compile small models
 for model_name in ['driving_vision', 'driving_policy', 'dmonitoring_model']:
   flags = {
-    'larch64': 'QCOM=1',
-    'Darwin': 'CPU=1 IMAGE=0 JIT=2',
-  }.get(arch, 'LLVM=1 LLVMOPT=1 BEAM=0 IMAGE=0 JIT=2')
+    'larch64': 'DEV=QCOM',
+    'Darwin': 'DEV=CPU IMAGE=0 JIT=2',
+  }.get(arch, 'DEV=LLVM=1 LLVMOPT=1 BEAM=0 IMAGE=0 JIT=2')
   tg_compile(flags, model_name)
 
 # Compile BIG model if USB GPU is available
diff --git a/selfdrive/modeld/dmonitoringmodeld.py b/selfdrive/modeld/dmonitoringmodeld.py
index 22d0057827..567831c948 100755
--- a/selfdrive/modeld/dmonitoringmodeld.py
+++ b/selfdrive/modeld/dmonitoringmodeld.py
@@ -5,9 +5,10 @@ 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'
+  TG_DEVICE = 'QCOM'
 else:
-  os.environ['LLVM'] = '1'
+  TG_DEVICE = 'LLVM'
+os.environ['DEV'] = TG_DEVICE
 import math
 import time
 import pickle
diff --git a/selfdrive/modeld/modeld.py b/selfdrive/modeld/modeld.py
index 6767040c60..59fe0584c8 100755
--- a/selfdrive/modeld/modeld.py
+++ b/selfdrive/modeld/modeld.py
@@ -3,14 +3,14 @@ import os
 from openpilot.system.hardware import TICI
 USBGPU = "USBGPU" in os.environ
 if USBGPU:
-  os.environ['AMD'] = '1'
+  TG_DEVICE = 'AMD'
   os.environ['AMD_IFACE'] = 'USB'
 elif TICI:
   from openpilot.selfdrive.modeld.runners.tinygrad_helpers import qcom_tensor_from_opencl_address
-  os.environ['QCOM'] = '1'
+  TG_DEVICE = 'QCOM'
 else:
-  os.environ['LLVM'] = '1'
-  os.environ['JIT'] = '2'
+  TG_DEVICE = 'LLVM'
+os.environ['DEV'] = TG_DEVICE
 from tinygrad.tensor import Tensor
 from tinygrad.dtype import dtypes
 import time