diff --git a/sunnypilot/modeld/runners/runmodel_pyx.pyx b/sunnypilot/modeld/runners/runmodel_pyx.pyx index e224b1e4f2..d2b4485944 100644 --- a/sunnypilot/modeld/runners/runmodel_pyx.pyx +++ b/sunnypilot/modeld/runners/runmodel_pyx.pyx @@ -4,7 +4,7 @@ from libcpp.string cimport string from .runmodel cimport USE_CPU_RUNTIME, USE_GPU_RUNTIME, USE_DSP_RUNTIME -from sunnypilot.modeld.models.commonmodel_pyx cimport CLMem +from openpilot.sunnypilot.modeld.models.commonmodel_pyx cimport CLMem class Runtime: CPU = USE_CPU_RUNTIME diff --git a/sunnypilot/modeld/runners/snpemodel_pyx.pyx b/sunnypilot/modeld/runners/snpemodel_pyx.pyx index d1f24d1ead..056ba9d4fe 100644 --- a/sunnypilot/modeld/runners/snpemodel_pyx.pyx +++ b/sunnypilot/modeld/runners/snpemodel_pyx.pyx @@ -6,9 +6,9 @@ from libcpp cimport bool from libcpp.string cimport string from .snpemodel cimport SNPEModel as cppSNPEModel -from sunnypilot.modeld.models.commonmodel_pyx cimport CLContext -from sunnypilot.modeld.runners.runmodel_pyx cimport RunModel -from sunnypilot.modeld.runners.runmodel cimport RunModel as cppRunModel +from openpilot.sunnypilot.modeld.models.commonmodel_pyx cimport CLContext +from openpilot.sunnypilot.modeld.runners.runmodel_pyx cimport RunModel +from openpilot.sunnypilot.modeld.runners.runmodel cimport RunModel as cppRunModel os.environ['ADSP_LIBRARY_PATH'] = "/data/pythonpath/third_party/snpe/dsp/" diff --git a/sunnypilot/modeld/runners/thneedmodel_pyx.pyx b/sunnypilot/modeld/runners/thneedmodel_pyx.pyx index 49de8344c0..eaabc4a776 100644 --- a/sunnypilot/modeld/runners/thneedmodel_pyx.pyx +++ b/sunnypilot/modeld/runners/thneedmodel_pyx.pyx @@ -5,9 +5,9 @@ from libcpp cimport bool from libcpp.string cimport string from .thneedmodel cimport ThneedModel as cppThneedModel -from sunnypilot.modeld.models.commonmodel_pyx cimport CLContext -from sunnypilot.modeld.runners.runmodel_pyx cimport RunModel -from sunnypilot.modeld.runners.runmodel cimport RunModel as cppRunModel +from openpilot.sunnypilot.modeld.models.commonmodel_pyx cimport CLContext +from openpilot.sunnypilot.modeld.runners.runmodel_pyx cimport RunModel +from openpilot.sunnypilot.modeld.runners.runmodel cimport RunModel as cppRunModel cdef class ThneedModel(RunModel): def __cinit__(self, string path, float[:] output, int runtime, bool use_tf8, CLContext context): diff --git a/sunnypilot/models/fetcher.py b/sunnypilot/models/fetcher.py index 0c14315ff8..1e451a7e3e 100644 --- a/sunnypilot/models/fetcher.py +++ b/sunnypilot/models/fetcher.py @@ -11,7 +11,7 @@ import requests from requests.exceptions import (SSLError, RequestException, HTTPError) from openpilot.common.params import Params from openpilot.common.swaglog import cloudlog -from sunnypilot.models.helpers import is_bundle_version_compatible +from openpilot.sunnypilot.models.helpers import is_bundle_version_compatible from cereal import custom diff --git a/sunnypilot/models/manager.py b/sunnypilot/models/manager.py index a3ce046a33..c236643a06 100644 --- a/sunnypilot/models/manager.py +++ b/sunnypilot/models/manager.py @@ -16,8 +16,8 @@ from openpilot.common.swaglog import cloudlog from openpilot.system.hardware.hw import Paths from cereal import messaging, custom -from sunnypilot.models.fetcher import ModelFetcher -from sunnypilot.models.helpers import verify_file, get_active_bundle +from openpilot.sunnypilot.models.fetcher import ModelFetcher +from openpilot.sunnypilot.models.helpers import verify_file, get_active_bundle class ModelManagerSP: diff --git a/sunnypilot/models/tests/test_tinygrad_ref.py b/sunnypilot/models/tests/test_tinygrad_ref.py index c4f98a2cb6..3e60ab5308 100644 --- a/sunnypilot/models/tests/test_tinygrad_ref.py +++ b/sunnypilot/models/tests/test_tinygrad_ref.py @@ -1,7 +1,7 @@ import requests -from sunnypilot.models.tinygrad_ref import get_tinygrad_ref -from sunnypilot.models.fetcher import ModelFetcher +from openpilot.sunnypilot.models.tinygrad_ref import get_tinygrad_ref +from openpilot.sunnypilot.models.fetcher import ModelFetcher def fetch_tinygrad_ref(): diff --git a/sunnypilot/selfdrive/car/interfaces.py b/sunnypilot/selfdrive/car/interfaces.py index 2cfbd1eec8..b534b7e37e 100644 --- a/sunnypilot/selfdrive/car/interfaces.py +++ b/sunnypilot/selfdrive/car/interfaces.py @@ -15,7 +15,7 @@ from openpilot.sunnypilot.selfdrive.controls.lib.speed_limit.helpers import set_ import openpilot.system.sentry as sentry -from sunnypilot.sunnylink.statsd import STATSLOGSP +from openpilot.sunnypilot.sunnylink.statsd import STATSLOGSP def log_fingerprint(CP: structs.CarParams) -> None: diff --git a/sunnypilot/sunnylink/athena/sunnylinkd.py b/sunnypilot/sunnylink/athena/sunnylinkd.py index 911739c312..1e3713c7ef 100755 --- a/sunnypilot/sunnylink/athena/sunnylinkd.py +++ b/sunnypilot/sunnylink/athena/sunnylinkd.py @@ -23,8 +23,8 @@ from websocket import (ABNF, WebSocket, WebSocketException, WebSocketTimeoutExce create_connection, WebSocketConnectionClosedException) import cereal.messaging as messaging -from sunnypilot.sunnylink.api import SunnylinkApi -from sunnypilot.sunnylink.utils import sunnylink_need_register, sunnylink_ready, get_param_as_byte, save_param_from_base64_encoded_string +from openpilot.sunnypilot.sunnylink.api import SunnylinkApi +from openpilot.sunnypilot.sunnylink.utils import sunnylink_need_register, sunnylink_ready, get_param_as_byte, save_param_from_base64_encoded_string SUNNYLINK_ATHENA_HOST = os.getenv('SUNNYLINK_ATHENA_HOST', 'wss://ws.stg.api.sunnypilot.ai') HANDLER_THREADS = int(os.getenv('HANDLER_THREADS', "4")) diff --git a/sunnypilot/sunnylink/backups/manager.py b/sunnypilot/sunnylink/backups/manager.py index e52b547afe..1b3c623fc4 100644 --- a/sunnypilot/sunnylink/backups/manager.py +++ b/sunnypilot/sunnylink/backups/manager.py @@ -18,9 +18,9 @@ from openpilot.common.swaglog import cloudlog from openpilot.system.version import get_version from cereal import messaging, custom -from sunnypilot.sunnylink.api import SunnylinkApi -from sunnypilot.sunnylink.backups.utils import decrypt_compressed_data, encrypt_compress_data, SnakeCaseEncoder -from sunnypilot.sunnylink.utils import get_param_as_byte, save_param_from_base64_encoded_string +from openpilot.sunnypilot.sunnylink.api import SunnylinkApi +from openpilot.sunnypilot.sunnylink.backups.utils import decrypt_compressed_data, encrypt_compress_data, SnakeCaseEncoder +from openpilot.sunnypilot.sunnylink.utils import get_param_as_byte, save_param_from_base64_encoded_string class OperationType(Enum): diff --git a/sunnypilot/sunnylink/backups/utils.py b/sunnypilot/sunnylink/backups/utils.py index bcf7ea8ebb..1734a7efcf 100644 --- a/sunnypilot/sunnylink/backups/utils.py +++ b/sunnypilot/sunnylink/backups/utils.py @@ -16,7 +16,7 @@ from cryptography.hazmat.backends import default_backend from cryptography.hazmat.primitives import serialization from cryptography.hazmat.primitives.asymmetric import rsa -from sunnypilot.sunnylink.backups.AESCipher import AESCipher +from openpilot.sunnypilot.sunnylink.backups.AESCipher import AESCipher from openpilot.system.hardware.hw import Paths diff --git a/sunnypilot/sunnylink/registration_manager.py b/sunnypilot/sunnylink/registration_manager.py index 805d2482db..1b822e5c2d 100755 --- a/sunnypilot/sunnylink/registration_manager.py +++ b/sunnypilot/sunnylink/registration_manager.py @@ -6,7 +6,7 @@ from openpilot.common.realtime import Ratekeeper from openpilot.common.swaglog import cloudlog from cereal import log, messaging -from sunnypilot.sunnylink.utils import register_sunnylink +from openpilot.sunnypilot.sunnylink.utils import register_sunnylink NetworkType = log.DeviceState.NetworkType diff --git a/sunnypilot/sunnylink/uploader.py b/sunnypilot/sunnylink/uploader.py index 117fbdc159..90c897f982 100755 --- a/sunnypilot/sunnylink/uploader.py +++ b/sunnypilot/sunnylink/uploader.py @@ -11,7 +11,7 @@ from collections.abc import Iterator from cereal import log import cereal.messaging as messaging -from sunnypilot.sunnylink.api import SunnylinkApi +from openpilot.sunnypilot.sunnylink.api import SunnylinkApi from openpilot.common.file_helpers import get_upload_stream from openpilot.common.params import Params from openpilot.common.realtime import set_core_affinity diff --git a/sunnypilot/sunnylink/utils.py b/sunnypilot/sunnylink/utils.py index e86a795170..fb3938d702 100644 --- a/sunnypilot/sunnylink/utils.py +++ b/sunnypilot/sunnylink/utils.py @@ -1,7 +1,7 @@ import base64 import gzip import json -from sunnypilot.sunnylink.api import SunnylinkApi, UNREGISTERED_SUNNYLINK_DONGLE_ID +from openpilot.sunnypilot.sunnylink.api import SunnylinkApi, UNREGISTERED_SUNNYLINK_DONGLE_ID from openpilot.common.params import Params, ParamKeyType from openpilot.system.version import is_prebuilt diff --git a/system/manager/process_config.py b/system/manager/process_config.py index b2afbd5bb3..7e4edc6863 100644 --- a/system/manager/process_config.py +++ b/system/manager/process_config.py @@ -10,8 +10,8 @@ from openpilot.system.hardware.hw import Paths from openpilot.sunnypilot.mapd.mapd_manager import MAPD_PATH -from sunnypilot.models.helpers import get_active_model_runner -from sunnypilot.sunnylink.utils import sunnylink_need_register, sunnylink_ready, use_sunnylink_uploader +from openpilot.sunnypilot.models.helpers import get_active_model_runner +from openpilot.sunnypilot.sunnylink.utils import sunnylink_need_register, sunnylink_ready, use_sunnylink_uploader WEBCAM = os.getenv("USE_WEBCAM") is not None