-
Notifications
You must be signed in to change notification settings - Fork 375
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix dead actor accumulation in CDP #1091
Fix dead actor accumulation in CDP #1091
Conversation
Returns bool if actor was in the pool, else otherwise
f47ab67
to
7b935b7
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Reviewed 9 of 9 files at r1, all commit messages.
Reviewable status:complete! all files reviewed, all discussions resolved (waiting on @Daraan)
I'll check this in more detail over the next week to make sure of all the details but this is a great PR, thanks you very much. |
I am confident that it should work. If the actor is registered, which all should be, they will be destroyed by |
remove extra lines (carla-simulator#1074) Add misc type default blueprint (carla-simulator#1064) Co-authored-by: Pablo Villanueva-Domingo <[email protected]> Fix: wrong initial transform when using request_new_batch_actors (carla-simulator#1068) (carla-simulator#1075) See: carla-simulator#1068 Co-authored-by: Daraan <[email protected]> Update atomic_trigger_conditions.py (carla-simulator#946) In the StandStill() class, change the EPSILON, 0.001 Implement variable frame rate (carla-simulator#1005) Replaced class variable frame_rate with an argument provided on the CLI. Co-authored-by: glopezdiest <[email protected]> Workflow improvements and code quality passing (carla-simulator#1052) * CI: Checkout v4 and unit tests name correction * Small tweaks to ensure Code Quality passes --------- Co-authored-by: glopezdiest <[email protected]> Fixed metrics wheel parser (carla-simulator#1076) Co-authored-by: glopezdiest <[email protected]> [Feature] Blueprint-based spawn_actor function for CarlaDataProvider (carla-simulator#1071) * blueprint-based spawn_actor function for CDP * Auto-Option to decide tracking * Updated changelog * spawned actors are tracked if they are Vehicle | Walker * Updated spawn_actor description --------- Co-authored-by: glopezdiest <[email protected]> Hotfix: missing AttachmentType in the carla mock module for unittest (carla-simulator#1077) * blueprint-based spawn_actor function for CDP * Auto-Option to decide tracking * Updated changelog * spawned actors are tracked if they are Vehicle | Walker * Updated spawn_actor description * Added missing AttachmentType for carla mock --------- Co-authored-by: glopezdiest <[email protected]> Backward compatible upgrade to fix deprecation warnings concerning LooseVersion and pkg_resources for Python3.8+ (carla-simulator#1058) * upgraded version checking to fix deprecation warnings Removed usage of pgk_resources and distutils.version.LooseVersion * < python3.8 backward compatible version checking * Compacter version checking. --------- Co-authored-by: glopezdiest <[email protected]> Replace deprecated python 3.8 code and add missing __init__.py files for proper python module recognition (carla-simulator#1053) Co-authored-by: glopezdiest <[email protected]> add support for scientific notation parsing while running OpenSCENARIO files (carla-simulator#1023) Co-authored-by: glopezdiest <[email protected]> Update osc2_scenario_configuration.py (carla-simulator#1040) Add super.__init__() to class OSC2ScenarioConfiguration to prevent error "AttributeError: 'OSC2ScenarioConfiguration' object has no attribute 'route'" when running scenario_runner.py with --openscenario2 parameter Co-authored-by: glopezdiest <[email protected]> Remove version redundancy (carla-simulator#1081) Update minimum CARLA version to 0.9.14 (carla-simulator#1082) * Remove version redundancy * Merge branch 'master' of https://github.com/carla-simulator/scenario_runner * Update minimum CARLA version Type-hint comments for CarlaDataProvider (carla-simulator#1066) * Type-hint comments for CarlaDataProvider * Suppress Any import warning * Removed None values, increased type-coverage Added log agent [fix]rename compound_symbol.py (carla-simulator#1089) Fixed a typo in openscenario_parser.py (carla-simulator#1118) * Fixed a typo There was a typo in function "get_traffic_light_from_osc_name", which was accessing "CCarlaDataProvider" insted of "CarlaDataProvider". * Delete the unneeded file Fix: Remove duplicate clean method calls (carla-simulator#1096) * [fix]rename compound_symbol.py * [fix]Remove duplicate clean method calls * Fix Atomic_behaviors AddActor Func No return status Link documentation in README (carla-simulator#1129) Include 0.9.14 carla release as compatible with scenario runner 0.9.13 (carla-simulator#1130) * Link documentation in README * Include 0.9.14 carla release as compatible with scenario runner 0.9.13 * Merge branch 'master' into docs_in_readme Added a missing element to the blackboard (carla-simulator#1141) Co-authored-by: glopezdiest <[email protected]> Replaced deprecated is_intersection with is_junction (carla-simulator#1114) Co-authored-by: glopezdiest <[email protected]> CDP request_new_actor new optional argument. (carla-simulator#1113) spawn_point can be ommited when random_location=True Co-authored-by: glopezdiest <[email protected]> Faster information retrieval if actor key is present (carla-simulator#1098) Co-authored-by: glopezdiest <[email protected]> Don't depend on distutils (carla-simulator#1121) distutils are no longer available in Python 3.12. Therefore, we copy the strtobool function from distutils to our own module. This is in line with https://peps.python.org/pep-0632/#migration-advice. Co-authored-by: glopezdiest <[email protected]> Fix dead actor accumulation in CDP (carla-simulator#1091) * Slightly more informative function Returns bool if actor was in the pool, else otherwise * Fix accumulation of dead actors in CDP actor pool * Dead actor cleaning in CDP._actor_*_maps --------- Co-authored-by: glopezdiest <[email protected]>
I realized that in the
CarlaDataProvider._carla_actor_pool
more and more dead actors accumulated over time when scenarios run. The reason is that actors are created over the CDP and are added to the pool, however, they are not destroyed over the CDP.I think I located most of the locations where this is the case - however I think there is still at least one missing.
As a side result it the
remove_actor_by_id
function is now also slightly more informative. If the return value isNone
the users needs to take care of the destruction.I also propose an update to the
CarlaDataProvider._actor_[velocity, location, transform]_map
, while this new code is in itself more expensive it was in the long run still faster as the sizes were overall smaller. Of course, just talking about a few ms.Tested on
This change is