Commit Graph

14653 Commits

Author SHA1 Message Date
DevTekVE 078e7c078a Merge remote-tracking branch 'origin/cp-sp' into cp-sp-model 2025-01-22 10:57:08 +01:00
Jason Wen 6ff91cdecf must be initialized prior can comm callback! 2025-01-21 21:12:11 -05:00
Jason Wen bb788fdd3a fix typing 2025-01-21 20:23:26 -05:00
DevTekVE c556ee1b53 Merge branch 'model-switcher-v2' into cp-sp-model 2025-01-21 23:36:27 +01:00
Jason Wen 3a00312759 must generate cp_sp! 2025-01-21 17:16:55 -05:00
DevTekVE 1a2614c461 "Add missing newline at end of file in __init__.py
Ensure proper formatting by adding a newline at the end of the file. This adheres to POSIX standards and improves compatibility with some tools and version control systems."
2025-01-21 23:14:04 +01:00
DevTekVE a4338ed94e Refactor variable names and adjust imports for clarity.
Renamed `len` to `length` to avoid conflict with the built-in function and improve readability. Reorganized imports in `fill_model_msg.py` for better structure and consistency.
2025-01-21 23:10:45 +01:00
DevTekVE 224adec3cc "Refactor modeld_20hz to modeld_v2 with cleanup"
Refactored `modeld_20hz` module to `modeld_v2` for improved clarity and consistency. Removed unused code and aligned imports across modules to reflect the new structure. Enhanced maintainability by restructuring model-related files and updating references accordingly.
2025-01-21 23:01:23 +01:00
DevTekVE f4dd3f6640 Add 20Hz metadata handling for model predictions
Introduce `Meta20hz` class for 20Hz-specific metadata and implement dynamic loading of meta model classes in `meta_helper.py`. Update `fill_model_msg.py` to use the new metadata structure, ensuring seamless integration with 20Hz models. Adjust imports in `model_runner.py` to align with project structure.
2025-01-21 23:01:23 +01:00
DevTekVE 17494eb5ce Refactor modeld to support 20Hz models and modularize runners
Replaced legacy runner logic with a unified ONNX and Tinygrad runner to support 20Hz models. Centralized model metadata management and optimized input preparation for adaptability. Updated curvature handling and output parsing for improved modularity and maintainability.
2025-01-21 23:01:23 +01:00
DevTekVE 1eabbc2b68 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.
2025-01-21 23:01:23 +01:00
DevTekVE 8cab601ad0 Add Meta20hz class for 20Hz model message handling.
Introduces a new Meta20hz class for filling 20Hz model messages, encapsulating functionality for curvature, lane lines, road edges, and more. Refactored `modeld.py` to utilize the new class, improving modularity and maintainability. Minor adjustments were made to initialize and handle model metadata.
2025-01-21 23:01:23 +01:00
DevTekVE 252703235f Add is20hz field to custom.capnp schema
Introduce a new boolean field `is20hz` to the `custom.capnp` schema. This allows the system to identify 20Hz-specific configurations or data processing. No changes to existing behavior are introduced for non-20Hz cases.
2025-01-21 23:01:23 +01:00
DevTekVE f7083593fe Remove unused import and fix import order in model_runner.py
This commit removes the unused 'dtypes' import from tinygrad.tensor and adjusts the import order for cleaner code. These changes enhance readability and maintain coding standards.
2025-01-21 23:01:23 +01:00
DevTekVE 0520b18490 Refactor model handling for 20Hz and introduce model runners
Introduce ModelRunner abstraction with TinygradRunner and ONNXRunner to streamline model handling for TICI and non-TICI hardware. Added support for dynamic input preparation and 20Hz models while simplifying the model parsing logic. This improves modularity, readability, and extensibility for future updates.
2025-01-21 23:01:23 +01:00
DevTekVE 75999ffdc8 Remove debug print statement in commonmodel.cc
The `printf` statement logging buffer movement details was removed as it is unnecessary for release builds. This helps streamline the code and avoid excessive console output during execution.
2025-01-21 23:01:22 +01:00
DevTekVE 51bf62c18d clean 2025-01-21 23:01:22 +01:00
DevTekVE 4bcb9fd78a Refactor modeld logic and remove unused 20Hz and smart inputs
Eliminated `ModelSmartInput`, `ModelSwitcher`, and `ModelState20Hz` classes, simplifying model state handling. Centralized model processing within a unified `ModelState` class and moved related code into `sunnypilot/modeld_20hz`. This improves maintainability by removing unused features and consolidating model execution logic, aligning with current system requirements.
2025-01-21 23:01:22 +01:00
DevTekVE 78d3c5370e Clean up formatting and fix minor style inconsistencies
Removed unnecessary blank lines and adjusted spacing to standardize code style across the file. These changes improve readability without altering functionality or logic.
2025-01-21 23:01:22 +01:00
DevTekVE 34d56b45bb Silence debug print statements and use cloudlog for warnings.
Commented out a debug print statement in `commonmodel.cc` to reduce noise. Replaced `print` statements with `cloudlog.warning` in `model_smart_input.py` for improved logging consistency and better integration with the logging system.
2025-01-21 23:01:22 +01:00
DevTekVE 526737f848 Refactor modeld to streamline feature handling logic
Simplified feature processing for both standard and "smart input" modes by consolidating logic into reusable methods. Updated variable naming, formatting, and spacing for consistency and readability. This refactor enhances maintainability and reduces redundancy in feature update operations.
2025-01-21 23:01:22 +01:00
DevTekVE 05a7d600af Add 20Hz model state, smart input, and model switcher classes
Introduce `ModelState20Hz`, `ModelSmartInput`, and `ModelSwitcher` for enhanced modularity and flexibility in modeld. Refactor `ModelState` to inherit from these new classes, enabling support for 20Hz processing and smart input initialization. Update associated files to handle the new buffer length parameter and metadata management.
2025-01-21 23:01:22 +01:00
DevTekVE fa3e861f2b Move numpy_inputs initialization to correct position
Repositioned the `numpy_inputs` initialization to align with the input shape processing logic. This ensures consistency in buffer management and clarifies the flow of code execution related to input handling.
2025-01-21 23:01:22 +01:00
DevTekVE 1ad6d00728 Fix spacing inconsistency in modeld.py
Added a missing newline for better code readability and consistency. This change has no impact on functionality but improves code formatting.
2025-01-21 23:01:22 +01:00
DevTekVE 7375b6a23b Rename variable len to length to avoid shadowing built-in.
Replaced the usage of `len` with `length` across the code to prevent conflicts with Python's built-in `len` function. This improves code clarity and reduces potential errors or misunderstandings in variable usage.
2025-01-21 23:01:22 +01:00
DevTekVE 79e44dbc6e Add buffer length parameter for enhanced frame handling
Introduce a configurable `buffer_length` parameter to `DrivingModelFrame` to support dynamic buffer sizes, enabling better handling of different frame rates like 20Hz. Updates include necessary adjustments in buffer initialization, copying logic, and related model inputs for improved compatibility and flexibility.
2025-01-21 23:01:21 +01:00
Jason Wen ca11e59739 need to pass this too 2025-01-21 16:10:35 -05:00
Jason Wen 3328a3030e tests fixed 2025-01-21 16:02:10 -05:00
Jason Wen efa21794ed fix tests 2025-01-21 15:52:15 -05:00
Jason Wen f6b45ee0d9 missed arg 2025-01-21 15:43:21 -05:00
Jason Wen eaf3cba22e deprecate CarParams.sunnypilotFlags to CarParamsSP.flags 2025-01-21 15:36:06 -05:00
Jason Wen 98440456a8 pass stock car params to sp set car params 2025-01-21 15:18:02 -05:00
Jason Wen 140f3a1b0e pass stock car params to sp set car params 2025-01-21 14:57:58 -05:00
Jason Wen 7c64eeff5a no need for process replay 2025-01-21 14:40:44 -05:00
Jason Wen 313b8fb853 fix more test 2025-01-21 14:28:35 -05:00
Jason Wen 2d68108d05 rename 2025-01-21 13:33:40 -05:00
Jason Wen 2855a62229 only for car params sp 2025-01-21 13:13:06 -05:00
Jason Wen df71ad639a Reapply "Reapply "fix""
This reverts commit 42f09f955c.
2025-01-21 13:11:50 -05:00
Jason Wen 719600c19e Reapply "Reapply "fix data type""
This reverts commit 670a384333.
2025-01-21 13:11:50 -05:00
Jason Wen e8593f89c6 Revert "no longer"
This reverts commit 66ee1ba151.
2025-01-21 13:11:49 -05:00
Jason Wen 66ee1ba151 no longer 2025-01-21 12:47:21 -05:00
Jason Wen 670a384333 Revert "Reapply "fix data type""
This reverts commit 5e95752fd5.
2025-01-21 12:47:11 -05:00
Jason Wen 42f09f955c Revert "Reapply "fix""
This reverts commit 1871919b63.
2025-01-21 12:47:08 -05:00
Jason Wen 1871919b63 Reapply "fix"
This reverts commit 9cbce9968a.
2025-01-21 12:46:09 -05:00
Jason Wen 5e95752fd5 Reapply "fix data type"
This reverts commit dbf1b8583f.
2025-01-21 12:46:07 -05:00
Jason Wen f8f87e39b0 no more lagging 2025-01-21 12:42:05 -05:00
Jason Wen f1550cb4cd more 2025-01-21 12:30:49 -05:00
Jason Wen e625ab3c28 missed 2025-01-21 12:27:28 -05:00
Jason Wen dbf1b8583f Revert "fix data type"
This reverts commit 02355f44df.
2025-01-21 12:26:09 -05:00
Jason Wen 9cbce9968a Revert "fix"
This reverts commit 74723d7fb2.
2025-01-21 12:26:07 -05:00