From 7fe40f6e7f2289e79b2e8f59375165f1e9f0e4f9 Mon Sep 17 00:00:00 2001 From: firestar5683 <168790843+firestar5683@users.noreply.github.com> Date: Tue, 30 Sep 2025 14:26:14 -0500 Subject: [PATCH] Update --- frogpilot/common/frogpilot_variables.py | 2 +- frogpilot/tinygrad_modeld/tinygrad_modeld.py | 16 ++++++++++++---- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/frogpilot/common/frogpilot_variables.py b/frogpilot/common/frogpilot_variables.py index f20eb304f..827706e1c 100644 --- a/frogpilot/common/frogpilot_variables.py +++ b/frogpilot/common/frogpilot_variables.py @@ -75,7 +75,7 @@ MAPD_PATH = Path("/data/media/0/osm/mapd") MAPS_PATH = Path("/data/media/0/osm/offline") NNFF_MODELS_PATH = Path(BASEDIR) / "frogpilot/assets/nnff_models" -DEFAULT_MODEL = "firehose" +DEFAULT_MODEL = "bd2" DEFAULT_MODEL_NAME = "Firehose (Default) 👀📡" DEFAULT_MODEL_VERSION = "v11" diff --git a/frogpilot/tinygrad_modeld/tinygrad_modeld.py b/frogpilot/tinygrad_modeld/tinygrad_modeld.py index fee67f985..6e62b5587 100755 --- a/frogpilot/tinygrad_modeld/tinygrad_modeld.py +++ b/frogpilot/tinygrad_modeld/tinygrad_modeld.py @@ -94,10 +94,18 @@ class ModelState: cloudlog.warning(f"ModelVersion parameter not available: {e}") model_dir = MODELS_PATH - VISION_PKL_PATH = model_dir / f"{model_id}_driving_vision_tinygrad.pkl" - POLICY_PKL_PATH = model_dir / f"{model_id}_driving_policy_tinygrad.pkl" - VISION_METADATA_PATH = model_dir / f"{model_id}_driving_vision_metadata.pkl" - POLICY_METADATA_PATH = model_dir / f"{model_id}_driving_policy_metadata.pkl" + # For the default "bd2" model, use built-in files from the models directory + if model_id == "bd2": + models_dir = Path(__file__).parent / "models" + VISION_PKL_PATH = models_dir / "driving_vision_tinygrad.pkl" + POLICY_PKL_PATH = models_dir / "driving_policy_tinygrad.pkl" + VISION_METADATA_PATH = models_dir / "driving_vision_metadata.pkl" + POLICY_METADATA_PATH = models_dir / "driving_policy_metadata.pkl" + else: + VISION_PKL_PATH = model_dir / f"{model_id}_driving_vision_tinygrad.pkl" + POLICY_PKL_PATH = model_dir / f"{model_id}_driving_policy_tinygrad.pkl" + VISION_METADATA_PATH = model_dir / f"{model_id}_driving_vision_metadata.pkl" + POLICY_METADATA_PATH = model_dir / f"{model_id}_driving_policy_metadata.pkl" # If ModelVersion is not set or not available, try to determine it from available model data if not model_version: