Skip to content

Commit

Permalink
ROS2 workspace and example nodes (opendr-eu#256)
Browse files Browse the repository at this point in the history
* ROS2 workspace with example pose estimation node and initial ros2_bridge package

* Add ROS2 object detection 2D, face detection and semantic segmentation nodes (opendr-eu#273)

* Added to and from ros boxes bridge methods

* Added object detection 2d ssd node according to ros1 node

* Added object detection 2d centernet node according to ros1 node

* Added to and from bounding box list bridge methods

* Added object detection 2d detr node according to ros1 node

* Fixed some issues with type conversions in bridge

* Added object detection 2d yolov3 node according to ros1 node

* Added face detection retinaface node according to ros1 node

* Added retinaface ros2 node in setup.py

* Added semantic segmenation bisenet ROS2 node according to ROS1 node

* Added additional checks in learner download methods to stop redownloading

* Improved ROS2 packages names and bridge import

* Tester moved

* Changed bridge import and fixed some nms stuff causing errors

* Changed bridge import and made all queues 1 to avoid delays

* Minor pep8 fix

* Another minor pep8 fix

* Added licence check skip for setup.pys

* Added licence check skip for test.pys

* Added appropriate docstring on existing bridge methods

* Removed unused commented line

* Finalized ROS2 pose estimation node with argparse

* Minor formatting

* Finalized ROS2 bisenet semantic segmentation node with argparse

* Improved docstring

* Minor comment addition

* Finalized ROS2 face detection retinaface node with argparse

* Minor improvements

* Finalized ROS2 object detection 2d yolov3 node with argparse

* Finalized ROS2 object detection 2d centernet node with argparse

* Finalized ROS2 object detection 2d detr node with argparse

* Finalized ROS2 object detection 2d ssd node with argparse

* Fixed typo in package.xml description

Co-authored-by: Stefania Pedrazzi <[email protected]>

Co-authored-by: Stefania Pedrazzi <[email protected]>

* Removed tester node

* Add ROS2 face recognition and fall detection nodes (opendr-eu#279)

* Fixed wrong argparse default values

* Some reordering for internal consistency and to/from face/face_id

* Initial version of ROS2 face recognition node

* Added annotated image publishing to ROS2 face recognition node

* Fixed face recognition node class name

* Fixed face recognition node class name in main

* Added ROS2 fall detection node

* Detr node now properly uses torch

* Fixed missing condition in publishing face reco image

* Updated ROS2 semseg bisenet node according to new ROS1 node

* Added lambda expression in argparse to handle passing of none value

* Minor optimization

* Added new ros2 cmake package for OpenDR custom messages

* Pose estimation ROS2 node now uses custom pose messages

* Bridge to/from pose methods now use new opendr pose message

* Moved opendr messages package to correct subdirectory (src)

* Face det: Added lambda expression in argparse to handle passing of none value and minor optimization

* Face reco: Added lambda expression in argparse to handle passing of none value

* Fall det: Added lambda expression in argparse to handle passing of none value and minor fixes in callback

* Obj det 2d: Added lambda expression in argparse to handle passing of none value and minor optimization

* Sem segm bisenet: Added lambda expression in argparse to handle passing of none value and reintroduced try/except

* Fall det: message now gets published only when there's a fallen pose present and each pose has its own id.

* Ros2 detr (opendr-eu#296)

* use same drawing function as other 2d object detectors

* create object_detection_2d_detr ros2 node

* Update projects/opendr_ws_2/src/opendr_perception/opendr_perception/object_detection_2d_detr_node.py

Co-authored-by: Kostas Tsampazis <[email protected]>

* Update projects/opendr_ws_2/src/opendr_perception/opendr_perception/object_detection_2d_detr_node.py

Co-authored-by: Kostas Tsampazis <[email protected]>

* Update projects/opendr_ws_2/src/opendr_perception/opendr_perception/object_detection_2d_detr_node.py

Co-authored-by: Kostas Tsampazis <[email protected]>

* Update projects/opendr_ws_2/src/opendr_perception/opendr_perception/object_detection_2d_detr_node.py

Co-authored-by: Kostas Tsampazis <[email protected]>

* Update projects/opendr_ws_2/src/opendr_perception/opendr_perception/object_detection_2d_detr_node.py

Co-authored-by: Kostas Tsampazis <[email protected]>

* Update projects/opendr_ws_2/src/opendr_perception/opendr_perception/object_detection_2d_detr_node.py

Co-authored-by: Kostas Tsampazis <[email protected]>

* format code

Co-authored-by: Kostas Tsampazis <[email protected]>

* Ros2 har (opendr-eu#323)

* Add ros2 video_activity_recognition_node

* Fix resizing inference issues

* Added missing bridge methods

* Added missing node entry point declaration in setup.py

* Fixed docstring and wrong default input topic

Co-authored-by: tsampazk <[email protected]>

* Initial version of main ROS2 README.md

* Updated contents based on newer ROS1 version

* Added initial ROS2 main READMEs

* Changed usb cam run command

* Work in progress adding setup instructions

* Complete setup and build instructions plus fixed links

* Minor fixes in introduction and line separators

* Commented out cv bridge installation

* ROS2 RGBD hand gestures recognition (opendr-eu#341)

* Add RGBD hand recogniton node

* Update RGB hand gesture recognition node

* Remove redundancy parameters

* Update projects/opendr_ws_2/src/opendr_perception/opendr_perception/rgbd_hand_gesture_recognition_node.py

Co-authored-by: Kostas Tsampazis <[email protected]>

Co-authored-by: Kostas Tsampazis <[email protected]>

* ROS2 implementation for human_model_generation module (opendr-eu#291)

* changes for ros2 in opendr_simulation code

* Update mesh_util.py

* Update human_model_generation_service.py

* Update human_model_generation_client.py

* Update bridge.py

* Update human_model_generation_service.py

* Update human_model_generation_client.py

* Update bridge.py

* Update human_model_generation_client.py

* Update human_model_generation_service.py

* Update bridge.py

* Update setup.py

* Update human_model_generation_client.py

* Update human_model_generation_service.py

* Update test_flake8.py

* Update test_flake8.py

* Update test_license.py

* Update setup.py

* Update test_license.py

* Update projects/opendr_ws_2/src/opendr_ros2_bridge/opendr_ros2_bridge/bridge.py

Co-authored-by: Kostas Tsampazis <[email protected]>

* Update projects/opendr_ws_2/src/opendr_interfaces/package.xml

Co-authored-by: Kostas Tsampazis <[email protected]>

* Update projects/opendr_ws_2/src/opendr_simulation/opendr_simulation/human_model_generation_service.py

Co-authored-by: Kostas Tsampazis <[email protected]>

* Update projects/opendr_ws_2/src/opendr_simulation/opendr_simulation/human_model_generation_client.py

Co-authored-by: Kostas Tsampazis <[email protected]>

* Update projects/opendr_ws_2/src/opendr_ros2_bridge/opendr_ros2_bridge/bridge.py

Co-authored-by: Kostas Tsampazis <[email protected]>

* Update projects/opendr_ws_2/src/opendr_simulation/opendr_simulation/human_model_generation_client.py

Co-authored-by: Kostas Tsampazis <[email protected]>

* Update projects/opendr_ws_2/src/opendr_simulation/opendr_simulation/human_model_generation_service.py

Co-authored-by: Kostas Tsampazis <[email protected]>

* Update projects/opendr_ws_2/src/opendr_interfaces/package.xml

Co-authored-by: Kostas Tsampazis <[email protected]>

* Update projects/opendr_ws_2/src/opendr_interfaces/srv/Mesh.srv

Co-authored-by: Kostas Tsampazis <[email protected]>

* Update projects/opendr_ws_2/src/opendr_simulation/opendr_simulation/human_model_generation_client.py

Co-authored-by: Kostas Tsampazis <[email protected]>

* Update projects/opendr_ws_2/src/opendr_simulation/opendr_simulation/human_model_generation_client.py

Co-authored-by: Kostas Tsampazis <[email protected]>

* Update projects/opendr_ws_2/src/opendr_ros2_bridge/opendr_ros2_bridge/bridge.py

Co-authored-by: Kostas Tsampazis <[email protected]>

* Update projects/opendr_ws_2/src/opendr_simulation/opendr_simulation/human_model_generation_service.py

Co-authored-by: Kostas Tsampazis <[email protected]>

* Update projects/opendr_ws_2/src/opendr_simulation/opendr_simulation/human_model_generation_service.py

Co-authored-by: Kostas Tsampazis <[email protected]>

* changes to ros2

* changes to ros2

* changes to ROS2 nodes

* changes to ROS2 nodes

* ROS2 changes

* ROS2 changes

* ROS2 changes

* ROS2 changes

* ROS2 changes

* ROS2 changes

* ROS2 changes

* ROS2 changes

* ROS2 changes

* ROS2 changes

* ROS2 changes

* Update projects/opendr_ws_2/src/opendr_simulation/opendr_simulation/human_model_generation_service.py

Co-authored-by: Kostas Tsampazis <[email protected]>

* Update projects/opendr_ws_2/src/opendr_simulation/opendr_simulation/human_model_generation_client.py

Co-authored-by: Kostas Tsampazis <[email protected]>

* Update bridge.py

* Update bridge.py

* Update projects/opendr_ws_2/src/opendr_simulation/opendr_simulation/human_model_generation_client.py

Co-authored-by: Kostas Tsampazis <[email protected]>

* Update dependencies.ini

* Update dependencies.ini

* Update mesh_util.py

* Update dependencies.ini

Co-authored-by: Kostas Tsampazis <[email protected]>

* Add ROS2 node for EfficientPS (opendr-eu#270)

* Update submodule

* Add ROS2 node

* Do not remove downloaded checkpoint file

* Conclude merge

* Fix PEP8 issue

* ROS2 adaptation wrt. ROS imp. on dev. branch

* fix: EfficientPS Learner  updated, ROS2 subscriber queue fixed, ros2 bridge import fixed

EfficientPS learner file is updated to the current changes in the develop branch. Queue parameter of the subscriber in the ROS2 script has adapted correctly, also implementation of the ROS2 bridge fixed.

* refactor: Resolved conflict in the setup.py of ROS2 implementation

* style: PEP8 fix

* fix: arguments, ROS2Bridge import and rclpy.init fixed

* style: PEP8 blank line fix

* fix: Fixed encoder and default image topic location

* fix: logging order and pep8 fixed

* style: pep8 fix

Co-authored-by: aselimc <[email protected]>
Co-authored-by: Ahmet Selim Çanakçı <[email protected]>

* ROS2 for heart anomaly detection (opendr-eu#337)

* Implement ROS2 for heart anomaly detection

* Remove redundant blank line

* Organize import libraries

* Change from ROS to ROS2 in docstring

* Update heart_anomaly_detection_node.py

Fix wrong initialized node name

* Update bridge.py

Update from single quotes to double quotes in docstring

* Change node name for consistency naming across ROS2 nodes

Co-authored-by: Kostas Tsampazis <[email protected]>

* Fixed wrong name in dependency

* ROS2 speech command recognition (opendr-eu#340)

* Implement ROS2 for speech command recognition

* Change default audio topic from /audio/audio to /audio

* Update bridge.py

Update from single quotes to double quotes in docstring

* Fix style

* Change node name for consistency across ROS2 nodes

* Update speech_command_recognition_node.py

Update blank lines in different positions

* PEP8 removed whitespace

Co-authored-by: Kostas Tsampazis <[email protected]>
Co-authored-by: tsampazk <[email protected]>

* ROS2 for audiovisual emotion recognition node (opendr-eu#342)

* Implement audiovisual emotion recognition node

* Update projects/opendr_ws_2/src/opendr_perception/opendr_perception/audiovisual_emotion_recognition_node.py

Co-authored-by: Kostas Tsampazis <[email protected]>

* Update projects/opendr_ws_2/src/opendr_perception/opendr_perception/audiovisual_emotion_recognition_node.py

Co-authored-by: Kostas Tsampazis <[email protected]>

Co-authored-by: Kostas Tsampazis <[email protected]>

* Skeleton_based_action_recognition ROS2 node (opendr-eu#344)

* skeleton_har ros2 node added

* ros2 node fixed

* Add skeleton based action recognition in setup.py

* Update projects/opendr_ws_2/src/opendr_perception/opendr_perception/skeleton_based_action_recognition_node.py

Co-authored-by: Kostas Tsampazis <[email protected]>

* Update projects/opendr_ws_2/src/opendr_perception/opendr_perception/skeleton_based_action_recognition_node.py

Co-authored-by: Kostas Tsampazis <[email protected]>

* Update projects/opendr_ws_2/src/opendr_perception/opendr_perception/skeleton_based_action_recognition_node.py

Co-authored-by: Kostas Tsampazis <[email protected]>

* Update projects/opendr_ws_2/src/opendr_perception/opendr_perception/skeleton_based_action_recognition_node.py

Co-authored-by: Kostas Tsampazis <[email protected]>

* Fixed extra newline at end of line

Co-authored-by: tsampazk <[email protected]>
Co-authored-by: Kostas Tsampazis <[email protected]>

* landmark_based_facial_expression_recognition ROS2 node (opendr-eu#345)

* landmark_fer ros2 node added

* ros2 node fixed

* Add landmark based facial expression recognition in setup.py

* Update projects/opendr_ws_2/src/opendr_perception/opendr_perception/landmark_based_facial_expression_recognition_node.py

Co-authored-by: Kostas Tsampazis <[email protected]>

* Update projects/opendr_ws_2/src/opendr_perception/opendr_perception/landmark_based_facial_expression_recognition_node.py

Co-authored-by: Kostas Tsampazis <[email protected]>

* Update projects/opendr_ws_2/src/opendr_perception/opendr_perception/landmark_based_facial_expression_recognition_node.py

Co-authored-by: Kostas Tsampazis <[email protected]>

Co-authored-by: tsampazk <[email protected]>
Co-authored-by: Kostas Tsampazis <[email protected]>

* Reformatted file

* Ros2 synthetic facial generation (opendr-eu#288)

* opendr_ws_ros2 synthetic facial image generation

* Delete projects/opendr_ws_2/src/ros2_bridge directory

delete directory

* delete unneccesary directory

* Update README.md

change to be correct the execution of the module

* Update package.xml

change to be correct

* Update setup.py

* Update package.xml

* Update package.xml

* prepared with test

* Update synthetic_facial_generation.py

* Update synthetic_facial_generation.py

* Update synthetic_facial_generation.py

* Update setup.py

* Update test_pep257.py

* Update test_flake8.py

* Update test_copyright.py

* Update mesh_util.py

* Update Dockerfile-cuda

Co-authored-by: Kostas Tsampazis <[email protected]>

* Update .github/workflows/tests_suite_develop.yml

Co-authored-by: Kostas Tsampazis <[email protected]>

* Update .github/workflows/tests_suite_develop.yml

Co-authored-by: Kostas Tsampazis <[email protected]>

* Update projects/opendr_ws_2/src/data_generation/package.xml

Co-authored-by: Kostas Tsampazis <[email protected]>

* Update test_copyright.py

* Update test_flake8.py

* Update test_pep257.py

* Update test_license.py

* Update projects/opendr_ws_2/src/data_generation/setup.py

Co-authored-by: Kostas Tsampazis <[email protected]>

* Update projects/opendr_ws_2/src/data_generation/setup.py

Co-authored-by: Kostas Tsampazis <[email protected]>

* Update projects/opendr_ws_2/src/data_generation/data_generation/synthetic_facial_generation.py

Co-authored-by: Kostas Tsampazis <[email protected]>

* Update projects/opendr_ws_2/src/data_generation/data_generation/synthetic_facial_generation.py

Co-authored-by: Kostas Tsampazis <[email protected]>

* Update projects/opendr_ws_2/src/data_generation/data_generation/synthetic_facial_generation.py

Co-authored-by: Kostas Tsampazis <[email protected]>

* Update projects/opendr_ws_2/src/data_generation/data_generation/synthetic_facial_generation.py

Co-authored-by: Kostas Tsampazis <[email protected]>

* Update projects/opendr_ws_2/src/data_generation/data_generation/synthetic_facial_generation.py

Co-authored-by: Kostas Tsampazis <[email protected]>

* Update projects/opendr_ws_2/src/data_generation/data_generation/synthetic_facial_generation.py

Co-authored-by: Kostas Tsampazis <[email protected]>

* Update projects/opendr_ws_2/src/data_generation/data_generation/synthetic_facial_generation.py

Co-authored-by: Kostas Tsampazis <[email protected]>

* Update package.xml

* Update synthetic_facial_generation.py

* Update .github/workflows/tests_suite_develop.yml

Co-authored-by: Kostas Tsampazis <[email protected]>

* Update synthetic_facial_generation.py

* Update synthetic_facial_generation.py

* ros2

* ros2

* ros2

* Update README.md

* Update synthetic_facial_generation.py

* Update synthetic_facial_generation.py

* Update synthetic_facial_generation.py

* Update synthetic_facial_generation.py

* Update test_copyright.py

* Update test_flake8.py

* Update test_pep257.py

* Update test_license.py

* Update test_license.py

* Update Dockerfile-cuda

Co-authored-by: Kostas Tsampazis <[email protected]>

* Update projects/opendr_ws_2/src/data_generation/data_generation/synthetic_facial_generation.py

Co-authored-by: Kostas Tsampazis <[email protected]>

* Update projects/opendr_ws_2/src/data_generation/data_generation/synthetic_facial_generation.py

Co-authored-by: Kostas Tsampazis <[email protected]>

* Update projects/opendr_ws_2/src/data_generation/data_generation/synthetic_facial_generation.py

Co-authored-by: Kostas Tsampazis <[email protected]>

* Update projects/opendr_ws_2/src/data_generation/data_generation/synthetic_facial_generation.py

Co-authored-by: Kostas Tsampazis <[email protected]>

* Update projects/opendr_ws_2/src/data_generation/data_generation/synthetic_facial_generation.py

Co-authored-by: Kostas Tsampazis <[email protected]>

* Update projects/opendr_ws_2/src/data_generation/test/test_copyright.py

Co-authored-by: Kostas Tsampazis <[email protected]>

* Update projects/opendr_ws_2/src/data_generation/test/test_flake8.py

Co-authored-by: Kostas Tsampazis <[email protected]>

* Update projects/opendr_ws_2/src/data_generation/test/test_pep257.py

Co-authored-by: Kostas Tsampazis <[email protected]>

* Update tests/test_license.py

Co-authored-by: Kostas Tsampazis <[email protected]>

* Update projects/opendr_ws_2/src/data_generation/data_generation/synthetic_facial_generation.py

Co-authored-by: Kostas Tsampazis <[email protected]>

* Update projects/opendr_ws_2/src/data_generation/data_generation/synthetic_facial_generation.py

Co-authored-by: Kostas Tsampazis <[email protected]>

* Update projects/opendr_ws_2/src/data_generation/data_generation/synthetic_facial_generation.py

Co-authored-by: Kostas Tsampazis <[email protected]>

* Update projects/opendr_ws_2/src/data_generation/data_generation/synthetic_facial_generation.py

Co-authored-by: Kostas Tsampazis <[email protected]>

* Update projects/opendr_ws_2/src/data_generation/data_generation/synthetic_facial_generation.py

Co-authored-by: Kostas Tsampazis <[email protected]>

* Update projects/opendr_ws_2/src/data_generation/data_generation/synthetic_facial_generation.py

Co-authored-by: Kostas Tsampazis <[email protected]>

* Update projects/opendr_ws_2/src/data_generation/data_generation/synthetic_facial_generation.py

Co-authored-by: Kostas Tsampazis <[email protected]>

* Update projects/opendr_ws_2/src/data_generation/data_generation/synthetic_facial_generation.py

Co-authored-by: Kostas Tsampazis <[email protected]>

* Update projects/opendr_ws_2/src/data_generation/data_generation/synthetic_facial_generation.py

Co-authored-by: Kostas Tsampazis <[email protected]>

* Update synthetic_facial_generation.py

* Update synthetic_facial_generation.py

* Update synthetic_facial_generation.py

* new updates

* updates

* Update bridge.py

* Update README.md

* Update data.py

* Update projects/opendr_ws_2/src/opendr_ros2_bridge/opendr_ros2_bridge/bridge.py

Co-authored-by: Kostas Tsampazis <[email protected]>

* Update projects/opendr_ws_2/src/opendr_ros2_bridge/opendr_ros2_bridge/bridge.py

Co-authored-by: Kostas Tsampazis <[email protected]>

* Update projects/opendr_ws_2/src/data_generation/data_generation/synthetic_facial_generation.py

Co-authored-by: Kostas Tsampazis <[email protected]>

Co-authored-by: Kostas Tsampazis <[email protected]>

* Ros2 gem (opendr-eu#295)

* use same drawing function as other object_detection_2d nodes

* Add gem ros2 node

* Apply suggestions from code review

Co-authored-by: Kostas Tsampazis <[email protected]>

* Rename node class to ObjectDetectionGemNode

* add argparse consistent with node args

* make arguments consistent

* tested gem ros and ros2 node

* fix pep8 errors

* apply changes requested by reviewer

Co-authored-by: Kostas Tsampazis <[email protected]>

* Renamed data generation package

* Renamed opendr_ros2_messages to _interfaces

* Fixed imports for opendr_ros2_interface

* Minor fixes across all existing nodes - brought up to speed with latest ROS1 nodes

* Added correct test_license skipped directories

* Renamed bridge package to opendr_bridge

* Fixed bridge dependency

* Fixed bridge dependency and imports in perception and simulation packages

* Fixed bridge dependency for simulation package

* Renamed opendr_ros2_interface to opendr_interface

* Fixed colcon build deprecation warnings

* Fixed bridge import in init

* Nanodet and yolov5 new ros2 nodes

* Fix class names for yolo nodes

* Convert to proper nanodet ros2 node

* Minor comment fix on yolo nodes

* Fixed node name in log info of nanodet node

* Upgrade pip prior to install in docker

* Update Dockerfile

* Revert

* Revert dependency change

* Some future ros1 fixes for ros2 yolov5 node

* Added new siamrpn node in setup.py

* Added initialization service for siamrpn node

* Initial SiamRPN ROS2 node

* New bridge methods for tracking siamrpn

* SiamRPN ROS2 node with built-in detector

* Removed unused imports

* Added missing description on siamrpn docstring

* Fixed siamrpn node name

* Minor fix in ros1 main readme

* Updated ROS2 main readme, consistent with ROS1

* Minor fix in ros1 readme

* Added ROS2 node diagram

* Updated ROS2 node readme introductory sections and pose estimation

* Updated whole ROS2 node readme for ROS2 specific stuff

* Updated default usb cam ROS2 topic

* Ros2 nodes for 3D Detection and 2D/3D tracking (opendr-eu#319)

* Add ros2 point cloud dataset node

* Fix point cloude dataset node args

* Update default dataset path

* Add voxel 3d detection node

* Add output topic to args

* Add tracking 3d node

* Add tracking 2d fairmot node

* Add deep sort ros2 node

* Fix style errors

* Fix C++ style error

* Add device parsing

* Move ros2 gitignore to global

* Fix image dataset conditions

* Fix docstrings

* Fix pc dataset comments and conditions

* Fix voxel 3d arguments and conditions

* Fix ab3dmot conditions

* Fix unused device var

* Fix deep sort conditions

* Fix fairmot conditions

* Fix ab3dmot docstrings

* Fix style errors

* Apply suggestions from code review

Co-authored-by: Kostas Tsampazis <[email protected]>

* Update projects/opendr_ws_2/src/opendr_perception/opendr_perception/object_tracking_2d_deep_sort_node.py

Co-authored-by: Kostas Tsampazis <[email protected]>

* Fix parameter names

* Fix deep sort inference

* Fix deep sort no detections fail

* Removed depend  on rclcpp for data generation package

* Fix bridge imports

* Fix interface import

* Minor fixes on voxel node based on ros1 voxel node

* Future fix for embedded devices

* Fixes from ros1

* Minor formatting

* Matched arguments with ros1

* Fixed node name

* Fixed docstring

* Some autoformatting

* Some fixes

* Various fixes to match ros1 node

* Fixes from ros1

* Autoformatting

* Some fixes from ros1

* Some fixes from ros1

Co-authored-by: Illia Oleksiienko <[email protected]>
Co-authored-by: Kostas Tsampazis <[email protected]>

* ROS2 node for e2e planner and environment upgrade to Webots R2022b (opendr-eu#358)

* ros1 planning package

* end to end planner node

* end to end planner ros2 node initiated

* updated gym environment

* planner updated with tests and environment

* ROS1 node for e2e planner

* Update readme and doc

* Delete end_to_end_planner.py

* Apply suggestions from code review

Co-authored-by: Kostas Tsampazis <[email protected]>

* Apply suggestions from code review

* change the world to Webots 2022b initiated

* apply suggestions from code review, update doc

* Update projects/opendr_ws/src/planning/scripts/end_to_end_planner.py

Co-authored-by: Kostas Tsampazis <[email protected]>

* Update e2e_planning_learner.py

* Update e2e_planning_learner.py

* Update UAV_depth_planning_env.py

* Update test_end_to_end_planning.py

* Update euler_quaternion_transformations.py

* Update obstacle_randomizer.py

* Update sys_utils.py

* Update dependencies.ini

* changes for test learner independent from Webots

* Webots world updated to R2022b

* ROS1 node fix for 2022b version

* ROS2 node for e2e planner

* ROS2 node for e2e planner

* cleanup

* end-to-end planning ros2 node webots world launcher

* disable ros-numpy package dependency

* license test

* cleanup

* Apply suggestions from code review

Co-authored-by: ad-daniel <[email protected]>

* Apply suggestions from code review

* Apply suggestions from code review - fix for webots-ros2 apt installation.

* fix driver name.

* fix docs Webots version

* Update src/opendr/planning/end_to_end_planning/__init__.py

Co-authored-by: ad-daniel <[email protected]>

Co-authored-by: Kostas Tsampazis <[email protected]>
Co-authored-by: ad-daniel <[email protected]>
Co-authored-by: ad-daniel <[email protected]>

* Added hr pose estimation entry in setup

* Fixed warning

* HR Pose Estimation ROS2 node

* Added hr pose estimation node entry

* Added hr pose estimation node entry in index

* Added missing dot

* Image-based facial emotion estimation ROS2 node (opendr-eu#346)

* ros2 node added

* pep8 style fixed

* Added new facial emotion estimation in setup.py

* Applied fixes from ros1 node

* ROS2 update

* Fixes for ROS2 facial emotion node

* Minor fix for float confidence casting in category

* Fixed setup.py entry for facial emotion estimation ROS2 node

Co-authored-by: tsampazk <[email protected]>

* test different imports for imports that break tests

* Revert old imports on learner

* Remove tools that get imported by learner with full path

* Added init files in facial emotion estimation algorithm directories

* Removed importing of stuff that are not used from outside the src of this tool

* Added another missing init

* Reintroduced wrongly removed import of datasets in init

* Fix panoptic segmentation

* Apply suggestions from code review

Co-authored-by: ad-daniel <[email protected]>

* Fixed node names in run commands

* Remove comment of additional installations

* Removed runtime section

* Removed additional skipped directory

* Some fixes in the audio node docs

* Fix audio_common_msgs for ROS2

* Added engine dependency in end_to_end_planning

* Added missing packages in packages.txt and rearranged them

* Revert "Fix audio_common_msgs for ROS2"

This reverts commit dae3cde.

* Undo audio fix

* Fixed planning bridge dependency name

* Fixed default audio argument for ros 2

* Added audio prerequisites information for default audio ros package

* Possible fix for single object tracking

* Minor docs typo

* Added note on landmark based facial reco about lack of pretrained model

* Remove logging of image shape

Co-authored-by: ad-daniel <[email protected]>
Co-authored-by: Stefania Pedrazzi <[email protected]>
Co-authored-by: Jelle <[email protected]>
Co-authored-by: Nikolaos Passalis <[email protected]>
Co-authored-by: Lukas Hedegaard <[email protected]>
Co-authored-by: Quoc Nguyen <[email protected]>
Co-authored-by: charsyme <[email protected]>
Co-authored-by: Niclas <[email protected]>
Co-authored-by: aselimc <[email protected]>
Co-authored-by: Ahmet Selim Çanakçı <[email protected]>
Co-authored-by: Negar Heidari <[email protected]>
Co-authored-by: ekakalet <[email protected]>
Co-authored-by: ad-daniel <[email protected]>
Co-authored-by: Illia Oleksiienko <[email protected]>
Co-authored-by: Illia Oleksiienko <[email protected]>
Co-authored-by: halil93ibrahim <[email protected]>
  • Loading branch information
17 people authored and Luca Marchionni committed Dec 23, 2022
1 parent 9150e7c commit d9fa326
Show file tree
Hide file tree
Showing 123 changed files with 10,339 additions and 947 deletions.
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -71,3 +71,9 @@ temp/
projects/opendr_ws/.catkin_workspace
projects/opendr_ws/devel/
projects/python/control/eagerx/eagerx_ws/

projects/opendr_ws_2/build
projects/opendr_ws_2/install
projects/opendr_ws_2/log
projects/opendr_ws_2/MOT
projects/opendr_ws_2/KITTI
9 changes: 7 additions & 2 deletions bin/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,18 @@ make install_runtime_dependencies
# Install additional ROS packages
if [[ ${ROS_DISTRO} == "noetic" || ${ROS_DISTRO} == "melodic" ]]; then
echo "Installing ROS dependencies"
sudo apt-get -y install ros-$ROS_DISTRO-vision-msgs ros-$ROS_DISTRO-geometry-msgs ros-$ROS_DISTRO-sensor-msgs ros-$ROS_DISTRO-audio-common-msgs ros-$ROS_DISTRO-usb-cam
sudo apt-get -y install ros-$ROS_DISTRO-vision-msgs ros-$ROS_DISTRO-geometry-msgs ros-$ROS_DISTRO-sensor-msgs ros-$ROS_DISTRO-audio-common-msgs ros-$ROS_DISTRO-usb-cam ros-$ROS_DISTRO-webots-ros
fi

# Install additional ROS2 packages
if [[ ${ROS_DISTRO} == "foxy" || ${ROS_DISTRO} == "humble" ]]; then
echo "Installing ROS2 dependencies"
sudo apt-get -y install ros-$ROS_DISTRO-usb-cam
sudo apt-get -y install ros-$ROS_DISTRO-usb-cam ros-$ROS_DISTRO-webots-ros2 python3-colcon-common-extensions ros-$ROS_DISTRO-vision-msgs
LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/ros/$ROS_DISTRO/lib/controller
cd $OPENDR_HOME/projects/opendr_ws_2/
git clone --depth 1 --branch ros2 https://github.com/ros-drivers/audio_common src/audio_common
rosdep install -i --from-path src/audio_common --rosdistro $ROS_DISTRO -y
cd $OPENDR_HOME
fi

# If working on GPU install GPU dependencies as needed
Expand Down
2 changes: 1 addition & 1 deletion docs/reference/end-to-end-planning.md
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ Parameters:
### Simulation environment setup

The environment is provided with a [world](../../src/opendr/planning/end_to_end_planning/envs/webots/worlds/train-no-dynamic-random-obstacles.wbt)
that needs to be opened with Webots version 2021a in order to demonstrate the end-to-end planner.
that needs to be opened with Webots version 2022b in order to demonstrate the end-to-end planner.

The environment includes an optional Ardupilot controlled quadrotor for simulating dynamics.
For the installation of Ardupilot instructions are available [here](https://github.com/ArduPilot/ardupilot).
Expand Down
Loading

0 comments on commit d9fa326

Please sign in to comment.