|
|
|
import numpy as np
|
|
|
|
import random
|
|
|
|
|
|
|
|
import cereal.messaging as messaging
|
|
|
|
from msgq.visionipc import VisionIpcServer, VisionStreamType
|
|
|
|
from opendbc.car.car_helpers import get_demo_car_params
|
|
|
|
from openpilot.common.params import Params
|
|
|
|
from openpilot.common.transformations.camera import DEVICE_CAMERAS
|
|
|
|
from openpilot.common.realtime import DT_MDL
|
selfdrive/car: ban cereal and capnp (#33208)
* ban cereal and msgq
* common too
* do toyota/values.py
* do all fingerprints
* example without builder
* this still works, but no type checking anymore
* stash
* wtf, how does this work
* okay actually not bad
* safe
* epic!
* stash data_structures.py
* some clean up
* hell yeah
* clean up old file
* add to delete
* delete
This reverts commit 90239b7797ace31ee647a2fdbd67e0c3faa98dcf.
* switch more CarParams stuff over
remove unused
* fix car tests by removing cereal! mypy forgets about dataclass if we wrap it :(
* fix this too
* fix this too
* remove more cereal and add some good hyundai tests
* bunch more typing
* override default with 20hz radar
* temp capnp converter helper
* more lateralTuning
* small union replicator is better than what i was trying, and fixes mypy dynamic typing issues
* can keep all this the same now!
* type ret: CarParams, add more missing structs, revert lateralTuning changes (smaller diff!)
* revert more
* get first enum automatically, but ofc mypy doesn't pick up the new metaclass so can't use :(
would have been `CarParams.NetworkLocation()`
* Revert "get first enum automatically, but ofc mypy doesn't pick up the new metaclass so can't use :("
This reverts commit bb28b228becba932052d2fc5a4389784027435b1.
* remove cereal from car_helpers (TODO: caching)
* remove a bunch of temp lines
* use dataclass_transform!
* remove some car.CarParams from the interfaces
* remove rest of car.CarParams from the interfaces
* same which() API
* sort
* from cereal/cache from fingerprinting!
* more typing
* dataclass to capnp helper for CarParams, cached it since it's kinda slow
* (partial) fix process replay fingerprintig for new API
* latcontrollers take capnp
* forgot this
* fix test_models
* fix unit tests
* not here
* VehicleModel and controller still takes capnp CP since they get it from Params()
* fix modeld test
* more fix
* need to namespace to structs, since CarState is both class and struct
* this was never in the base class?!
* clean that up again
* fix import error
fix import error
* cmts and more structs
* remove some more cereal from toyota + convert CarState to capnp
* bruh this was wrong
* replace more cereal
* EventName is one of the last things...
* replace a bunch more cereal.car
* missing imports
* more
* can fix this typing now
* proper toyota+others CS typing!
* mypy can detect return type of CS.update() now
* fix redeclaration of cruise_buttons type
* mypy is only complaining about events now
* temp fix
* add carControl struct
* replace CarControl
i hope there's no circular imports in hyundai's CC
* fine now
* lol this was wrong too
* fix crash
* include my failed attempts at recursively converting to dataclass (doesn't implicitly convert types/recursively :( )
but attrs does, maybe will switch in the future
* clean up
* try out attr.s for its converter (doesn't work recursively yet, but interesting!)
* Revert "try out attr.s for its converter (doesn't work recursively yet, but interesting!)"
This reverts commit ff2434f7bbd45a4d4bfb21f7d6712d1f1c3bcde9.
* test processes doesn't fail anymore (on toyota)!
* fix honda crash
* stash
* Revert "stash"
This reverts commit c1762af4e776790e4ad1322ad4ce0610157346e0.
* remove a bunch more cereal!
* LET'S GOOO
* fix these tests
* and these
* and that
* stash, something is wrong with hyundai enable
* Revert "stash, something is wrong with hyundai enable"
This reverts commit 39cf327def258e2959fe23cd7a550a858f6d8f03.
* forgot these
* remove cereal from fw_versions
* Revert "remove cereal from fw_versions"
This reverts commit 232b37cd409b55d04b1afc90d4a80c49e710eb56.
* remove rest of the cereal exceptions!
* fix that
* add typing to radard since I didn't realize RI.update() switched from cereal to structs
* and here too!
* add TODO for slots
* needed CS to be capnp, fix comparisons, and type hint car_specific so it's easier to catch type issues (capnp isn't detected by mypy :( )
* remove the struct converter
* save ~4-5% CPU at 100hz, we don't modify after so no need to deepcopy
btw pickle.loads(pickle.dumps()) is faster by ~1% CPU
* deepcopy -> copy: we can technically make a reference, but copy is almost free and less error-prone
saves ~1% CPU
* add non-copying asdict function
* should save ~3% CPU (still 4% above baseline)
* fix that, no dict support
* ~27% decrease in time for 20k iterations on 3X (3.37857 -> 2.4821s)
* give a better name
* fix
* dont support none, capitalize
* sheesh, this called type() on every field
* remove CS.events, clean up
* bump card %
* this was a bug on master!
* add a which enum
* default to pid
* revert
* update refs
* not needed, but consistent
* just Ecu
* don't need to do this in this pr
* clean up
* no cast
* consistent typing
* rm
* fix
* can do this if we're desperate for the last few %
* Revert "can do this if we're desperate for the last few %"
This reverts commit 18e11ac7883a0a56583750b1cc5a2b13011e7299.
* type this
* don't need to convert carControl
* i guess don't support set either
* fix CP type hint
* simplify that
1 year ago
|
|
|
from openpilot.selfdrive.car.card import convert_to_capnp
|
|
|
|
from openpilot.system.manager.process_config import managed_processes
|
|
|
|
from openpilot.selfdrive.test.process_replay.vision_meta import meta_from_camera_state
|
|
|
|
|
|
|
|
CAM = DEVICE_CAMERAS[("tici", "ar0231")].fcam
|
|
|
|
IMG = np.zeros(int(CAM.width*CAM.height*(3/2)), dtype=np.uint8)
|
|
|
|
IMG_BYTES = IMG.flatten().tobytes()
|
|
|
|
|
|
|
|
|
|
|
|
class TestModeld:
|
|
|
|
|
|
|
|
def setup_method(self):
|
|
|
|
self.vipc_server = VisionIpcServer("camerad")
|
|
|
|
self.vipc_server.create_buffers(VisionStreamType.VISION_STREAM_ROAD, 40, False, CAM.width, CAM.height)
|
|
|
|
self.vipc_server.create_buffers(VisionStreamType.VISION_STREAM_DRIVER, 40, False, CAM.width, CAM.height)
|
|
|
|
self.vipc_server.create_buffers(VisionStreamType.VISION_STREAM_WIDE_ROAD, 40, False, CAM.width, CAM.height)
|
|
|
|
self.vipc_server.start_listener()
|
selfdrive/car: ban cereal and capnp (#33208)
* ban cereal and msgq
* common too
* do toyota/values.py
* do all fingerprints
* example without builder
* this still works, but no type checking anymore
* stash
* wtf, how does this work
* okay actually not bad
* safe
* epic!
* stash data_structures.py
* some clean up
* hell yeah
* clean up old file
* add to delete
* delete
This reverts commit 90239b7797ace31ee647a2fdbd67e0c3faa98dcf.
* switch more CarParams stuff over
remove unused
* fix car tests by removing cereal! mypy forgets about dataclass if we wrap it :(
* fix this too
* fix this too
* remove more cereal and add some good hyundai tests
* bunch more typing
* override default with 20hz radar
* temp capnp converter helper
* more lateralTuning
* small union replicator is better than what i was trying, and fixes mypy dynamic typing issues
* can keep all this the same now!
* type ret: CarParams, add more missing structs, revert lateralTuning changes (smaller diff!)
* revert more
* get first enum automatically, but ofc mypy doesn't pick up the new metaclass so can't use :(
would have been `CarParams.NetworkLocation()`
* Revert "get first enum automatically, but ofc mypy doesn't pick up the new metaclass so can't use :("
This reverts commit bb28b228becba932052d2fc5a4389784027435b1.
* remove cereal from car_helpers (TODO: caching)
* remove a bunch of temp lines
* use dataclass_transform!
* remove some car.CarParams from the interfaces
* remove rest of car.CarParams from the interfaces
* same which() API
* sort
* from cereal/cache from fingerprinting!
* more typing
* dataclass to capnp helper for CarParams, cached it since it's kinda slow
* (partial) fix process replay fingerprintig for new API
* latcontrollers take capnp
* forgot this
* fix test_models
* fix unit tests
* not here
* VehicleModel and controller still takes capnp CP since they get it from Params()
* fix modeld test
* more fix
* need to namespace to structs, since CarState is both class and struct
* this was never in the base class?!
* clean that up again
* fix import error
fix import error
* cmts and more structs
* remove some more cereal from toyota + convert CarState to capnp
* bruh this was wrong
* replace more cereal
* EventName is one of the last things...
* replace a bunch more cereal.car
* missing imports
* more
* can fix this typing now
* proper toyota+others CS typing!
* mypy can detect return type of CS.update() now
* fix redeclaration of cruise_buttons type
* mypy is only complaining about events now
* temp fix
* add carControl struct
* replace CarControl
i hope there's no circular imports in hyundai's CC
* fine now
* lol this was wrong too
* fix crash
* include my failed attempts at recursively converting to dataclass (doesn't implicitly convert types/recursively :( )
but attrs does, maybe will switch in the future
* clean up
* try out attr.s for its converter (doesn't work recursively yet, but interesting!)
* Revert "try out attr.s for its converter (doesn't work recursively yet, but interesting!)"
This reverts commit ff2434f7bbd45a4d4bfb21f7d6712d1f1c3bcde9.
* test processes doesn't fail anymore (on toyota)!
* fix honda crash
* stash
* Revert "stash"
This reverts commit c1762af4e776790e4ad1322ad4ce0610157346e0.
* remove a bunch more cereal!
* LET'S GOOO
* fix these tests
* and these
* and that
* stash, something is wrong with hyundai enable
* Revert "stash, something is wrong with hyundai enable"
This reverts commit 39cf327def258e2959fe23cd7a550a858f6d8f03.
* forgot these
* remove cereal from fw_versions
* Revert "remove cereal from fw_versions"
This reverts commit 232b37cd409b55d04b1afc90d4a80c49e710eb56.
* remove rest of the cereal exceptions!
* fix that
* add typing to radard since I didn't realize RI.update() switched from cereal to structs
* and here too!
* add TODO for slots
* needed CS to be capnp, fix comparisons, and type hint car_specific so it's easier to catch type issues (capnp isn't detected by mypy :( )
* remove the struct converter
* save ~4-5% CPU at 100hz, we don't modify after so no need to deepcopy
btw pickle.loads(pickle.dumps()) is faster by ~1% CPU
* deepcopy -> copy: we can technically make a reference, but copy is almost free and less error-prone
saves ~1% CPU
* add non-copying asdict function
* should save ~3% CPU (still 4% above baseline)
* fix that, no dict support
* ~27% decrease in time for 20k iterations on 3X (3.37857 -> 2.4821s)
* give a better name
* fix
* dont support none, capitalize
* sheesh, this called type() on every field
* remove CS.events, clean up
* bump card %
* this was a bug on master!
* add a which enum
* default to pid
* revert
* update refs
* not needed, but consistent
* just Ecu
* don't need to do this in this pr
* clean up
* no cast
* consistent typing
* rm
* fix
* can do this if we're desperate for the last few %
* Revert "can do this if we're desperate for the last few %"
This reverts commit 18e11ac7883a0a56583750b1cc5a2b13011e7299.
* type this
* don't need to convert carControl
* i guess don't support set either
* fix CP type hint
* simplify that
1 year ago
|
|
|
Params().put("CarParams", convert_to_capnp(get_demo_car_params()).to_bytes())
|
|
|
|
|
|
|
|
self.sm = messaging.SubMaster(['modelV2', 'cameraOdometry'])
|
|
|
|
self.pm = messaging.PubMaster(['roadCameraState', 'wideRoadCameraState', 'liveCalibration'])
|
|
|
|
|
|
|
|
managed_processes['modeld'].start()
|
|
|
|
self.pm.wait_for_readers_to_update("roadCameraState", 10)
|
|
|
|
|
|
|
|
def teardown_method(self):
|
|
|
|
managed_processes['modeld'].stop()
|
|
|
|
del self.vipc_server
|
|
|
|
|
|
|
|
def _send_frames(self, frame_id, cams=None):
|
|
|
|
if cams is None:
|
|
|
|
cams = ('roadCameraState', 'wideRoadCameraState')
|
|
|
|
|
|
|
|
cs = None
|
|
|
|
for cam in cams:
|
|
|
|
msg = messaging.new_message(cam)
|
|
|
|
cs = getattr(msg, cam)
|
|
|
|
cs.frameId = frame_id
|
|
|
|
cs.timestampSof = int((frame_id * DT_MDL) * 1e9)
|
|
|
|
cs.timestampEof = int(cs.timestampSof + (DT_MDL * 1e9))
|
|
|
|
cam_meta = meta_from_camera_state(cam)
|
|
|
|
|
|
|
|
self.pm.send(msg.which(), msg)
|
|
|
|
self.vipc_server.send(cam_meta.stream, IMG_BYTES, cs.frameId,
|
|
|
|
cs.timestampSof, cs.timestampEof)
|
|
|
|
return cs
|
|
|
|
|
|
|
|
def _wait(self):
|
|
|
|
self.sm.update(5000)
|
|
|
|
if self.sm['modelV2'].frameId != self.sm['cameraOdometry'].frameId:
|
|
|
|
self.sm.update(1000)
|
|
|
|
|
|
|
|
def test_modeld(self):
|
|
|
|
for n in range(1, 500):
|
|
|
|
cs = self._send_frames(n)
|
|
|
|
self._wait()
|
|
|
|
|
|
|
|
mdl = self.sm['modelV2']
|
|
|
|
assert mdl.frameId == n
|
|
|
|
assert mdl.frameIdExtra == n
|
|
|
|
assert mdl.timestampEof == cs.timestampEof
|
|
|
|
assert mdl.frameAge == 0
|
|
|
|
assert mdl.frameDropPerc == 0
|
|
|
|
|
|
|
|
odo = self.sm['cameraOdometry']
|
|
|
|
assert odo.frameId == n
|
|
|
|
assert odo.timestampEof == cs.timestampEof
|
|
|
|
|
|
|
|
def test_dropped_frames(self):
|
|
|
|
"""
|
|
|
|
modeld should only run on consecutive road frames
|
|
|
|
"""
|
|
|
|
frame_id = -1
|
|
|
|
road_frames = list()
|
|
|
|
for n in range(1, 50):
|
|
|
|
if (random.random() < 0.1) and n > 3:
|
|
|
|
cams = random.choice([(), ('wideRoadCameraState', )])
|
|
|
|
self._send_frames(n, cams)
|
|
|
|
else:
|
|
|
|
self._send_frames(n)
|
|
|
|
road_frames.append(n)
|
|
|
|
self._wait()
|
|
|
|
|
|
|
|
if len(road_frames) < 3 or road_frames[-1] - road_frames[-2] == 1:
|
|
|
|
frame_id = road_frames[-1]
|
|
|
|
|
|
|
|
mdl = self.sm['modelV2']
|
|
|
|
odo = self.sm['cameraOdometry']
|
|
|
|
assert mdl.frameId == frame_id
|
|
|
|
assert mdl.frameIdExtra == frame_id
|
|
|
|
assert odo.frameId == frame_id
|
|
|
|
if n != frame_id:
|
|
|
|
assert not self.sm.updated['modelV2']
|
|
|
|
assert not self.sm.updated['cameraOdometry']
|