Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Fix: Remove duplicate clean method calls #1096

Merged
merged 5 commits into from
Nov 6, 2024
Merged

Fix: Remove duplicate clean method calls #1096

merged 5 commits into from
Nov 6, 2024

Conversation

starrye
Copy link
Contributor

@starrye starrye commented Jul 3, 2024 •
edited by germanros1987
Loading

Description

Fixes #

Where has this been tested?

  • Platform(s): Ubuntu
  • Python version(s): 3.8
  • Unreal Engine version(s): 5
  • CARLA version: 0.9.15

Possible Drawbacks

Hello, when I added custom logic to CarlaDataProvider clean, I found that it was called many times. And I saw in Class ScenarioRunner _cleanup method calls the self.manager. cleanup () and CarlaDataProvider. cleanup (), Of the self.manager.cleanup () includes CarlaDataProvider.cleanup(), so can make CarlaDataProvider.cleanup() method is called three times, In fact, after stopping the operation in ScenarioManager.run_scenario(), self.cleanup()will be called immediately, which already containsCarlaDataProvider.cleanup(), So consider removing the redundant clean method call in the _cleanup method of the ScenarioRunner class

This change is Reviewable

@starrye
Copy link
Contributor Author

starrye commented Jul 3, 2024

@PabloVD please review

@starrye
Copy link
Contributor Author

starrye commented Nov 5, 2024

@PabloVD new commit please review Fix Atomic_behaviors AddActor Func

PabloVD
PabloVD approved these changes Nov 5, 2024
View reviewed changes
Copy link
Contributor

@PabloVD PabloVD left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewed 1 of 1 files at r1, 1 of 1 files at r2, all commit messages.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved (waiting on @starrye)

@PabloVD
Copy link
Contributor

PabloVD commented Nov 6, 2024

Looks ok to me, merged, thanks!

@PabloVD PabloVD merged commit 5832584 into carla-simulator:master Nov 6, 2024
1 of 4 checks passed
Daraan added a commit to Daraan/scenario_runner that referenced this pull request Mar 27, 2025
@Daraan @glopezdiest
further formatting
bc3525c 
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]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@PabloVD PabloVD PabloVD approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@starrye @PabloVD