From 1eabbc2b68a80c2f21fcb852eff7c358734d9d71 Mon Sep 17 00:00:00 2001 From: DevTekVE Date: Tue, 21 Jan 2025 20:14:12 +0100 Subject: [PATCH] Refactor import paths to align with `openpilot` structure. Updated several import statements to use the `openpilot` namespace for better consistency and organization. This aligns the sunnypilot components more closely with the overall project structure. --- sunnypilot/modeld_20hz/fill_model_msg_20hz.py | 4 ++-- sunnypilot/modeld_20hz/model_runner.py | 2 +- sunnypilot/modeld_20hz/modeld.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sunnypilot/modeld_20hz/fill_model_msg_20hz.py b/sunnypilot/modeld_20hz/fill_model_msg_20hz.py index 881859c97e..693c8dd142 100644 --- a/sunnypilot/modeld_20hz/fill_model_msg_20hz.py +++ b/sunnypilot/modeld_20hz/fill_model_msg_20hz.py @@ -4,8 +4,8 @@ import capnp import numpy as np from openpilot.selfdrive.modeld.constants import ModelConstants, Plan -from selfdrive.controls.lib.drive_helpers import MIN_SPEED -from selfdrive.modeld.fill_model_msg import ConfidenceClass, fill_xyzt, fill_lane_line_meta, fill_xyz_poly, fill_xyvat, PublishState +from openpilot.selfdrive.controls.lib.drive_helpers import MIN_SPEED +from openpilot.selfdrive.modeld.fill_model_msg import ConfidenceClass, fill_xyzt, fill_lane_line_meta, fill_xyz_poly, fill_xyvat, PublishState SEND_RAW_PRED = os.getenv('SEND_RAW_PRED') diff --git a/sunnypilot/modeld_20hz/model_runner.py b/sunnypilot/modeld_20hz/model_runner.py index 4b4148f4ac..59d8912689 100644 --- a/sunnypilot/modeld_20hz/model_runner.py +++ b/sunnypilot/modeld_20hz/model_runner.py @@ -11,7 +11,7 @@ from openpilot.system.hardware import TICI from openpilot.system.hardware.hw import Paths from cereal import custom -from sunnypilot.models.helpers import get_active_bundle +from openpilot.sunnypilot.models.helpers import get_active_bundle # from tinygrad.tensor import Tensor diff --git a/sunnypilot/modeld_20hz/modeld.py b/sunnypilot/modeld_20hz/modeld.py index 17f279d6d4..3404e72fbb 100644 --- a/sunnypilot/modeld_20hz/modeld.py +++ b/sunnypilot/modeld_20hz/modeld.py @@ -24,7 +24,7 @@ from openpilot.selfdrive.modeld.parse_model_outputs import Parser from openpilot.selfdrive.modeld.fill_model_msg import fill_pose_msg, PublishState from openpilot.selfdrive.modeld.constants import ModelConstants from openpilot.selfdrive.modeld.models.commonmodel_pyx import DrivingModelFrame, CLContext -from sunnypilot.modeld_20hz.fill_model_msg_20hz import Meta20hz +from openpilot.sunnypilot.modeld_20hz.fill_model_msg_20hz import Meta20hz PROCESS_NAME = "selfdrive.modeld.modeld"