Skip to content

Commit

Permalink
Merge master into develop (opendr-eu#440)
Browse files Browse the repository at this point in the history
* Add zenodo DOI badge (#396)

* Update README.md (#406)

* Update README.md

* Update projects/python/simulation/SMPL+D_human_models/README.md

Co-authored-by: Kostas Tsampazis <27914645+tsampazk@users.noreply.github.com>

* Update README.md

* Update README.md

---------

Co-authored-by: Kostas Tsampazis <27914645+tsampazk@users.noreply.github.com>

* facial expression recognition demo update (FPS added)  (#405)

* added FPS to webcam demo

* Update projects/python/perception/facial_expression_recognition/image_based_facial_emotion_estimation/inference_demo.py

Co-authored-by: Kostas Tsampazis <27914645+tsampazk@users.noreply.github.com>

* added FPS to webcam demo

* Fix demo

* PEP8 fixes

---------

Co-authored-by: Kostas Tsampazis <27914645+tsampazk@users.noreply.github.com>
Co-authored-by: ad-daniel <daniel.dias@epfl.ch>
Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>

* Merge `develop` into `master` (#412)

* Fix branch references

* Lightweight OpenPose tool fixes and improvements (#392)

* Rearranged the demo imports

* Minor fixes and improvements in lw openpose learner

* Minor fixes and improvements in the readme

* Fixed typo

Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>

* Wave detection demo based on pose estimation (#394)

* Initial version of wave detection method

* Renamed wave detection demo

* Updated demos readme for wave det

* Minor fix in webcam demo

* Tidy-up, docstring and argparse

* Minor improvements

* Nanodet C API. Onnx and Libtorch (JIT) modules implementations and Libtorch Installation. (#352)

* Onnx and Jit tracing-scripting implementation with python and c api inference. Docs and tests have changed acordingly

* Implementation of libtorch and torch vision installation as part of tool installation.

* add licence and file name corection

* style, inconclusive cppcheck fixes.

* Fixes for C API initilization errors

* Deleting no used code

* macos cppcheck -> C style fixes

* macos cppcheck -c style fixes

* c-style pointer delceration fixes

* c-style pointer delceration fixes

* cpp casting casting fixes

* bug fixes

* Update projects/python/perception/object_detection_2d/nanodet/export_torchscript.py

Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>

* Update install_torch_c_api.sh

* Update dependencies/install_torch_c_api.sh

Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>

* Update include/nanodet_c.h

Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>

* Update include/nanodet_c.h

Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>

* Update include/nanodet_c.h

Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>

* Update include/nanodet_c.h

Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>

* Update include/opendr_utils.h

Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>

* Update include/target.h

Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>

* Update docs/reference/nanodet.md

Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>

* Update docs/reference/nanodet.md

Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>

* Update nanodet.md

* Update docs/reference/nanodet.md

Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>

* Update docs/reference/nanodet.md

Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>

* Update docs/reference/nanodet.md

Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>

* Update docs/reference/nanodet.md

Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>

* Update docs/reference/nanodet.md

Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>

* Update nanodet.md

* Update docs/reference/nanodet.md

Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>

* Update docs/reference/nanodet.md

Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>

* Update Makefile

* Update docs/reference/nanodet.md

Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>

* Update docs/reference/nanodet.md

Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>

* Update nanodet.md

* Update projects/c_api/Makefile

Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>

* Update projects/python/perception/object_detection_2d/nanodet/README.md

Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>

* Update eval_demo.py

* Update projects/python/perception/object_detection_2d/nanodet/export_onnx.py

Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>

* Update projects/python/perception/object_detection_2d/nanodet/README.md

Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>

* Update projects/python/perception/object_detection_2d/nanodet/README.md

Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>

* installing libtorch and vision with respect to CUDA of the user

* better explanations of variables in optimization runtimes

* small typing fixes

* Fix dependency

* Update dependencies.ini

deleting torchmetrics

* update docs for new data structures and utilities of c api

* new source, samples, utilities and test for onnx C API. The new scripts are implemente the feed forward of almost all the onnx models that python api is provided.

* bug fixes in onnx exporting.

* Revert "update docs for new data structures and utilities of c api"

This reverts commit 467c1f1e661462de46dd88a1762b23cbfaf7f4c8.

* Revert "bug fixes in onnx exporting."

This reverts commit fcd4f9c3a09d70deb51eec83ad1d469c7290ae27.

* Revert "Revert "bug fixes in onnx exporting.""

This reverts commit 953a193aa9a99522ac6069814a4b50f6837c0fac.

* Revert "new source, samples, utilities and test for onnx C API. The new scripts are implemente the feed forward of almost all the onnx models that python api is provided."

This reverts commit 617572d5d6d3e5d02004ece522f7d224d050bd61.

* Revert "bug fixes in onnx exporting."

This reverts commit fcd4f9c3a09d70deb51eec83ad1d469c7290ae27.

* revert last commits, change files for cpp styles as wiki says and better directory construction for easier navigation and new tools implementation.

* change function name to be uniform with the others

* doc for c nanodet

* Added small Json parser and installation script for easier navigation and universal use for future c api

* Update projects/c_api/README.md

Co-authored-by: Nikolaos Passalis <passalis@users.noreply.github.com>

* Update dependencies/install_torch_c_api.sh

Co-authored-by: Nikolaos Passalis <passalis@users.noreply.github.com>

* Update dependencies/install_torch_c_api.sh

Co-authored-by: Nikolaos Passalis <passalis@users.noreply.github.com>

* Update install_torch_c_api.sh

not need for specified vision version in sh

* Update download_torch.py

not need for environment variables to be passed

* Update utilities.py

delete additional print from debugging

* Fixes

* Fixes of suggestions
Combine optimizations and inference in one script

* Fixes of suggestions
Add more JSON parser capabilities
Fix face recognition threshold not readed from JSON

* Fixes of suggestions
Delete not used loggers.

* Fixes of suggestions

* added json parser in utilities

* unnecessary use of filesystem, easier implementation in embeded

* default directory for saves change to `temp`

* change to warnings errors and exceptions

* Transfer warnings for jit and ort simultaneously loaded from _load to infer.

* Change naming style. All .cpp files have only CPP style naming and .c files have CPP style naming in CPP functions and C style in everything else.

* license test update

* Apply suggestions from code review

Co-authored-by: Kostas Tsampazis <27914645+tsampazk@users.noreply.github.com>

* Apply suggestions from code review

* fixe bug to find cuda

* add automatic random colors

* better implementation of optimize

* add XMLBaseDataset option

* train bug fix

* train bug fix

* tipo fix

* add changes and some better namings

Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>
Co-authored-by: ad-daniel <daniel.dias@epfl.ch>
Co-authored-by: Nikolaos Passalis <passalis@users.noreply.github.com>
Co-authored-by: Kostas Tsampazis <27914645+tsampazk@users.noreply.github.com>

* Yolov5 training (#401)

* yolov5 dataset conversion for external training

* yolov5 dataset conversion for external training

* C api implementations (#383)

* Onnx and Jit tracing-scripting implementation with python and c api inference. Docs and tests have changed acordingly

* Implementation of libtorch and torch vision installation as part of tool installation.

* add licence and file name corection

* style, inconclusive cppcheck fixes.

* Fixes for C API initilization errors

* Deleting no used code

* macos cppcheck -> C style fixes

* macos cppcheck -c style fixes

* c-style pointer delceration fixes

* c-style pointer delceration fixes

* cpp casting casting fixes

* bug fixes

* Update projects/python/perception/object_detection_2d/nanodet/export_torchscript.py

Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>

* Update install_torch_c_api.sh

* Update dependencies/install_torch_c_api.sh

Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>

* Update include/nanodet_c.h

Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>

* Update include/nanodet_c.h

Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>

* Update include/nanodet_c.h

Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>

* Update include/nanodet_c.h

Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>

* Update include/opendr_utils.h

Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>

* Update include/target.h

Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>

* Update docs/reference/nanodet.md

Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>

* Update docs/reference/nanodet.md

Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>

* Update nanodet.md

* Update docs/reference/nanodet.md

Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>

* Update docs/reference/nanodet.md

Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>

* Update docs/reference/nanodet.md

Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>

* Update docs/reference/nanodet.md

Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>

* Update docs/reference/nanodet.md

Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>

* Update nanodet.md

* Update docs/reference/nanodet.md

Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>

* Update docs/reference/nanodet.md

Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>

* Update Makefile

* Update docs/reference/nanodet.md

Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>

* Update docs/reference/nanodet.md

Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>

* Update nanodet.md

* Update projects/c_api/Makefile

Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>

* Update projects/python/perception/object_detection_2d/nanodet/README.md

Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>

* Update eval_demo.py

* Update projects/python/perception/object_detection_2d/nanodet/export_onnx.py

Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>

* Update projects/python/perception/object_detection_2d/nanodet/README.md

Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>

* Update projects/python/perception/object_detection_2d/nanodet/README.md

Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>

* installing libtorch and vision with respect to CUDA of the user

* better explanations of variables in optimization runtimes

* small typing fixes

* Fix dependency

* Update dependencies.ini

deleting torchmetrics

* update docs for new data structures and utilities of c api

* new source, samples, utilities and test for onnx C API. The new scripts are implemente the feed forward of almost all the onnx models that python api is provided.

* bug fixes in onnx exporting.

* Revert "update docs for new data structures and utilities of c api"

This reverts commit 467c1f1e661462de46dd88a1762b23cbfaf7f4c8.

* Revert "bug fixes in onnx exporting."

This reverts commit fcd4f9c3a09d70deb51eec83ad1d469c7290ae27.

* Revert "Revert "bug fixes in onnx exporting.""

This reverts commit 953a193aa9a99522ac6069814a4b50f6837c0fac.

* Revert "new source, samples, utilities and test for onnx C API. The new scripts are implemente the feed forward of almost all the onnx models that python api is provided."

This reverts commit 617572d5d6d3e5d02004ece522f7d224d050bd61.

* Revert "bug fixes in onnx exporting."

This reverts commit fcd4f9c3a09d70deb51eec83ad1d469c7290ae27.

* revert last commits, change files for cpp styles as wiki says and better directory construction for easier navigation and new tools implementation.

* new c tools, test, samples

* change function name to be uniform with the others

* doc for c nanodet

* Added small Json parser and installation script for easier navigation and universal use for future c api

* C api docs and updated headers

* new jsonParser added

* Update projects/c_api/README.md

Co-authored-by: Nikolaos Passalis <passalis@users.noreply.github.com>

* Update dependencies/install_torch_c_api.sh

Co-authored-by: Nikolaos Passalis <passalis@users.noreply.github.com>

* Update dependencies/install_torch_c_api.sh

Co-authored-by: Nikolaos Passalis <passalis@users.noreply.github.com>

* Update install_torch_c_api.sh

not need for specified vision version in sh

* Update download_torch.py

not need for environment variables to be passed

* name changes for CPP format

* make files for all tools

* new data structures and json parsers. Bug fixed in json that could not take values other than strings.

* Bug fixed in json that could not take values other than strings.

* Small fixes

* Small fixes of python code for onnx optimization

* fix stile for macos tests

* Fixed cppcheck error

* changes requests in PR

* Download image and initialized tensor with image in open pose.

* Update utilities.py

delete additional print from debugging

* suggestion fixes

* update read me

* delete not used dependency to run smoothly in embed

* reformat naming for CPP style in all tools

* delete unwanted files

* rename parameters

* licence changes to 2023

* fixes in naming parameters

* update docs

* update docs

* clangFormat fix

* clangFormat fix

* Update CHANGELOG.md

* change all opendr* variable names to OpenDR* to be consistent with python api

change all utilities to load from the corresponding json files to be consistent with python api

* change all opendr* variable names to OpenDR* to be consistent with python api

change all utilities to load from the corresponding json files to be consistent with python api

* change all opendr* variable names to OpenDR* to be consistent with python api

add json parser functionality for booleans

* change the Nanodet demo to use the default parameters so this readme is unnecessary

* change the directories structure of C API to be consistent with Python API

* typo and bug fixes in onnx optimizations

* macos cppcheck fixes

* Deleted empty doc file

* bug fix

* Apply suggestions from code review

Co-authored-by: Kostas Tsampazis <27914645+tsampazk@users.noreply.github.com>

* Apply suggestions from code review

---------

Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>
Co-authored-by: ad-daniel <daniel.dias@epfl.ch>
Co-authored-by: Nikolaos Passalis <passalis@users.noreply.github.com>
Co-authored-by: Kostas Tsampazis <27914645+tsampazk@users.noreply.github.com>

* New feature: LiDAR-based panoptic segmentation - EfficientLPS (#359)

* Initial Commit.

* Implemented MMDet interface for SemanticKitti Dataset.
Implemented and tested fit() method of EfficientLpsLearner.

* Implemented and tested infer() and visualize() for EfficientLpsLearner.
Moved example_usage.py to its final location.

* Fixed stuff_id in loading pipeline for inference (EfficientLpsLearner.pcl_to_mmdet()).
Improved function signature in example_usage.py for better readability.

* Fixed bug in singlegpu_sample.py configuration.

* Re-Added EfficientLPS submodule.

* Corrected typo in docstring.

* Changed copyright notice to 2022.
Added EfficientLPS submodule to skipped directories in test_license.py.

* Cleaned singlegpu_sample config.

* Type hints and docstrings.

* Typo.

* Added numpy, just in case.

* Finished evaluation methods.

* Docstrings and type hints.

* Added ROS Node

* Updated TODOs

* Added type hint compatibility for pathlib's Path where required.
Minor bug fixes.

* Added UnitTests.

* Added iterator interfaces and unittest for them.

* Commented out semantic kitti dataset iterator interface test.

* Finished ROS Node.

* Finished READMEs.

* Fixed bibtex and added Daniel Büscher to authors.

* Updated to latest commit of EfficientLPS.

* Verified model and test_data downloads.
Cleaned TODOs.

* feat: Fixed mmdet2 conflicts, learner, and added tests

Fixed semantic_kitti.py and efficient_lps_learner.py for mmdet2 conflicts. Also fixed test_efficent_lps.py and added the correct configuration file for semantic_kitti dataset

* feat: changed location for efficentlps submodule into opendr branch

* feat: Changed install.sh for docker environment, will be reverted later

* feat: Updated install.sh for docker container environment

* style: ROS_DISTRO export changed

* feat: Adapted ROS node for EfficientLPS

* install.sh reverted back to normal

* removed eagerx module (deprecated)

* refactor: Renamed model key for semantickitti dataset

* feat: Adding feature for ros pointcloud2 publisher

* feat: Added example usage for EfficientLPS

Added example_usage.py for EfficientLPS and README file.

* feat: Add point cloud 2 publisher

* docs: Fix README files for example usage for both PS & LPS

\

* docs: Adjusted README docs for ROS nodes and learner references

* bridge_update

* [WIP] commit by Niclas

* update submodules

* feat: ROS nodes for PointCloud2 publisher and EfficientLPS ready for testing

* style: Fix for PEP style

* style: Changed the rosmessage of pc2 publisher

* style: pep8 fixes

* pep8 test skip for EfficientLPS added

* Revert changes on install.sh

* Fixed documentation for EfficientLPS node

* remove misplaced example_usage

* style: fixing typo in the comments

* docs: fixing readme file of panoptic segmentation

* Deleting nuscenes

* Adjust dependencies

* Deleting NuScenes from the learner

* style: styling fix for the LPS learner

* style: fix pep8

* fix: deleted nuscenes remainings

* fix: fix test typo

* fix: style and url fix for download method

* Add license to PC2 publisher

* fix: fix the clang format test, skip EfficientLPS

* revert activate.sh

* Rename heading

* feat: Added prepare_data for semantic_kitti.py

* docs: Update README for semantic kitti prepare data function

* style: fix pep8

* fix: Changing copying the files from move to speed up

* docs: Update Performance Evaluation

* refactor: Removing uncessary dependencies and repeating imports to fix pep8

* docs: Fix for conflicting files

* fix: Fixing the readme in the opendr_ws

* refactor: Fixed licenses due to new year

* refactor: Fix license date

* docs: EfficientLPS.md changes wrt. review

* docs: Add PointCloud2 bridge methods to 'opendr_ros_bridge.md'

* docs: Fix documentation in 'projects/opendr_ws/src/opendr_perception/README.md'

* test: Deleted not used test

* fix: Fixed ROS Nodes args and dataset file check for PCL2 and EfficientLPS

* docs: Update ROS nodes README.md according new PCL2 args

* feat: Add argument option to demo for EfficientLPS

* fix pep8

* fix: Removed "awful hack", original repo from 'EfficientLPS' should be updated

* feat: Add link to demo in index.md and update submodule

* docs: Update README.md for ros nodes (perception -> opendr_perception)

* Add changelog entry

* feat: ROS documentation improved and some fixes on ros nodes

* feat: Fix unused numpy import

* docs: Fix wrong revert and add necessary changes

* style(efficientLPS): change the variable name to convenient one

* fix(efficientLPS): Small argument input naming fix

* docs: Fix documentation of EfficientPS arguments

* style(efficientLPS): fix style pep8

* docs(efficientLPS): Quick fixes on documentation

* Empty Commit

* feat(efficientLPS): Add test data download option to PointCloud2 Publisher Node

* feat(efficientLPS): Add prepare data for the EfficientLPS learner

* style(efficientLPS): Fix pep8

* docs(efficientLPS): Add the test data support to documentation, delete the debug lines

* refactor(efficientLPS): Change the naming of the output topic of EfficientLPS

---------

Co-authored-by: Jose Arce y de la Borbolla <joseab10@gmail.com>
Co-authored-by: aselimc <voedisch_local@informatik.uni-freiburg.de>
Co-authored-by: Niclas <49001036+vniclas@users.noreply.github.com>
Co-authored-by: Niclas Vödisch <voedisch@cs.uni-freiburg.de>

* ROS1 and ROS2 nodes for CoSTGCN (#387)

* ROS2 workspace with example pose estimation node and initial ros2_bridge package

* Add ROS2 object detection 2D, face detection and semantic segmentation nodes (#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 <stefaniapedrazzi@users.noreply.github.com>

Co-authored-by: Stefania Pedrazzi <stefaniapedrazzi@users.noreply.github.com>

* Removed tester node

* Add ROS2 face recognition and fall detection nodes (#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 (#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 <27914645+tsampazk@users.noreply.github.com>

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

Co-authored-by: Kostas Tsampazis <27914645+tsampazk@users.noreply.github.com>

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

Co-authored-by: Kostas Tsampazis <27914645+tsampazk@users.noreply.github.com>

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

Co-authored-by: Kostas Tsampazis <27914645+tsampazk@users.noreply.github.com>

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

Co-authored-by: Kostas Tsampazis <27914645+tsampazk@users.noreply.github.com>

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

Co-authored-by: Kostas Tsampazis <27914645+tsampazk@users.noreply.github.com>

* format code

Co-authored-by: Kostas Tsampazis <27914645+tsampazk@users.noreply.github.com>

* Ros2 har (#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 <tsampaka@csd.auth.gr>

* 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 (#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 <27914645+tsampazk@users.noreply.github.com>

Co-authored-by: Kostas Tsampazis <27914645+tsampazk@users.noreply.github.com>

* ROS2 implementation for human_model_generation module (#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 <27914645+tsampazk@users.noreply.github.com>

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

Co-authored-by: Kostas Tsampazis <27914645+tsampazk@users.noreply.github.com>

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

Co-authored-by: Kostas Tsampazis <27914645+tsampazk@users.noreply.github.com>

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

Co-authored-by: Kostas Tsampazis <27914645+tsampazk@users.noreply.github.com>

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

Co-authored-by: Kostas Tsampazis <27914645+tsampazk@users.noreply.github.com>

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

Co-authored-by: Kostas Tsampazis <27914645+tsampazk@users.noreply.github.com>

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

Co-authored-by: Kostas Tsampazis <27914645+tsampazk@users.noreply.github.com>

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

Co-authored-by: Kostas Tsampazis <27914645+tsampazk@users.noreply.github.com>

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

Co-authored-by: Kostas Tsampazis <27914645+tsampazk@users.noreply.github.com>

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

Co-authored-by: Kostas Tsampazis <27914645+tsampazk@users.noreply.github.com>

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

Co-authored-by: Kostas Tsampazis <27914645+tsampazk@users.noreply.github.com>

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

Co-authored-by: Kostas Tsampazis <27914645+tsampazk@users.noreply.github.com>

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

Co-authored-by: Kostas Tsampazis <27914645+tsampazk@users.noreply.github.com>

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

Co-authored-by: Kostas Tsampazis <27914645+tsampazk@users.noreply.github.com>

* 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 <27914645+tsampazk@users.noreply.github.com>

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

Co-authored-by: Kostas Tsampazis <27914645+tsampazk@users.noreply.github.com>

* 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 <27914645+tsampazk@users.noreply.github.com>

* Update dependencies.ini

* Update dependencies.ini

* Update mesh_util.py

* Update dependencies.ini

Co-authored-by: Kostas Tsampazis <27914645+tsampazk@users.noreply.github.com>

* Add ROS2 node for EfficientPS (#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 <canakcia@cs.uni-freiburg.de>
Co-authored-by: Ahmet Selim Çanakçı <73101853+aselimc@users.noreply.github.com>

* ROS2 for heart anomaly detection (#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 <27914645+tsampazk@users.noreply.github.com>

* Fixed wrong name in dependency

* ROS2 speech command recognition (#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 <27914645+tsampazk@users.noreply.github.com>
Co-authored-by: tsampazk <tsampaka@csd.auth.gr>

* ROS2 for audiovisual emotion recognition node (#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 <27914645+tsampazk@users.noreply.github.com>

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

Co-authored-by: Kostas Tsampazis <27914645+tsampazk@users.noreply.github.com>

Co-authored-by: Kostas Tsampazis <27914645+tsampazk@users.noreply.github.com>

* Skeleton_based_action_recognition ROS2 node (#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 <27914645+tsampazk@users.noreply.github.com>

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

Co-authored-by: Kostas Tsampazis <27914645+tsampazk@users.noreply.github.com>

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

Co-authored-by: Kostas Tsampazis <27914645+tsampazk@users.noreply.github.com>

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

Co-authored-by: Kostas Tsampazis <27914645+tsampazk@users.noreply.github.com>

* Fixed extra newline at end of line

Co-authored-by: tsampazk <tsampaka@csd.auth.gr>
Co-authored-by: Kostas Tsampazis <27914645+tsampazk@users.noreply.github.com>

* landmark_based_facial_expression_recognition ROS2 node (#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 <27914645+tsampazk@users.noreply.github.com>

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

Co-authored-by: Kostas Tsampazis <27914645+tsampazk@users.noreply.github.com>

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

Co-authored-by: Kostas Tsampazis <27914645+tsampazk@users.noreply.github.com>

Co-authored-by: tsampazk <tsampaka@csd.auth.gr>
Co-authored-by: Kostas Tsampazis <27914645+tsampazk@users.noreply.github.com>

* Reformatted file

* Ros2 synthetic facial generation (#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 <27914645+tsampazk@users.noreply.github.com>

* Update .github/workflows/tests_suite_develop.yml

Co-authored-by: Kostas Tsampazis <27914645+tsampazk@users.noreply.github.com>

* Update .github/workflows/tests_suite_develop.yml

Co-authored-by: Kostas Tsampazis <27914645+tsampazk@users.noreply.github.com>

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

Co-authored-by: Kostas Tsampazis <27914645+tsampazk@users.noreply.github.com>

* 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 <27914645+tsampazk@users.noreply.github.com>

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

Co-authored-by: Kostas Tsampazis <27914645+tsampazk@users.noreply.github.com>

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

Co-authored-by: Kostas Tsampazis <27914645+tsampazk@users.noreply.github.com>

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

Co-authored-by: Kostas Tsampazis <27914645+tsampazk@users.noreply.github.com>

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

Co-authored-by: Kostas Tsampazis <27914645+tsampazk@users.noreply.github.com>

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

Co-authored-by: Kostas Tsampazis <27914645+tsampazk@users.noreply.github.com>

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

Co-authored-by: Kostas Tsampazis <27914645+tsampazk@users.noreply.github.com>

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

Co-authored-by: Kostas Tsampazis <27914645+tsampazk@users.noreply.github.com>

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

Co-authored-by: Kostas Tsampazis <27914645+tsampazk@users.noreply.github.com>

* Update package.xml

* Update synthetic_facial_generation.py

* Update .github/workflows/tests_suite_develop.yml

Co-authored-by: Kostas Tsampazis <27914645+tsampazk@users.noreply.github.com>

* 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 <27914645+tsampazk@users.noreply.github.com>

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

Co-authored-by: Kostas Tsampazis <27914645+tsampazk@users.noreply.github.com>

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

Co-authored-by: Kostas Tsampazis <27914645+tsampazk@users.noreply.github.com>

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

Co-authored-by: Kostas Tsampazis <27914645+tsampazk@users.noreply.github.com>

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

Co-authored-by: Kostas Tsampazis <27914645+tsampazk@users.noreply.github.com>

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

Co-authored-by: Kostas Tsampazis <27914645+tsampazk@users.noreply.github.com>

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

Co-authored-by: Kostas Tsampazis <27914645+tsampazk@users.noreply.github.com>

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

Co-authored-by: Kostas Tsampazis <27914645+tsampazk@users.noreply.github.com>

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

Co-authored-by: Kostas Tsampazis <27914645+tsampazk@users.noreply.github.com>

* Update tests/test_license.py

Co-authored-by: Kostas Tsampazis <27914645+tsampazk@users.noreply.github.com>

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

Co-authored-by: Kostas Tsampazis <27914645+tsampazk@users.noreply.github.com>

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

Co-authored-by: Kostas Tsampazis <27914645+tsampazk@users.noreply.github.com>

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

Co-authored-by: Kostas Tsampazis <27914645+tsampazk@users.noreply.github.com>

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

Co-authored-by: Kostas Tsampazis <27914645+tsampazk@users.noreply.github.com>

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

Co-authored-by: Kostas Tsampazis <27914645+tsampazk@users.noreply.github.com>

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

Co-authored-by: Kostas Tsampazis <27914645+tsampazk@users.noreply.github.com>

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

Co-authored-by: Kostas Tsampazis <27914645+tsampazk@users.noreply.github.com>

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

Co-authored-by: Kostas Tsampazis <27914645+tsampazk@users.noreply.github.com>

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

Co-authored-by: Kostas Tsampazis <27914645+tsampazk@users.noreply.github.com>

* 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 <27914645+tsampazk@users.noreply.github.com>

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

Co-authored-by: Kostas Tsampazis <27914645+tsampazk@users.noreply.github.com>

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

Co-authored-by: Kostas Tsampazis <27914645+tsampazk@users.noreply.github.com>

Co-authored-by: Kostas Tsampazis <27914645+tsampazk@users.noreply.github.com>

* Ros2 gem (#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 <27914645+tsampazk@users.noreply.github.com>

* 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 <27914645+tsampazk@users.noreply.github.com>

* 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 (#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 <27914645+tsampazk@users.noreply.github.com>

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

Co-authored-by: Kostas Tsampazis <27914645+tsampazk@users.noreply.github.com>

* 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 <io@ece.u.dk>
Co-authored-by: Kostas Tsampazis <27914645+tsampazk@users.noreply.github.com>

* ROS2 node for e2e planner and environment upgrade to Webots R2022b (#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 <27914645+tsampazk@users.noreply.github.com>

* 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 <27914645+tsampazk@users.noreply.github.com>

* 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 <44834743+ad-daniel@users.noreply.github.com>

* 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 <44834743+ad-daniel@users.noreply.github.com>

Co-authored-by: Kostas Tsampazis <27914645+tsampazk@users.noreply.github.com>
Co-authored-by: ad-daniel <daniel.dias@epfl.ch>
Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>

* ROS1,2 added for CoSTGCN

* Minor fix to allow .pt weights file loading

* Various improvements and fixes to costgcn ros1 node

* Renamed node to add _node

* Added documentation entry for new ROS1 node

* Applied some fixes and renamed node

* Added ROS2 readme entry for new node

* Added setup.py entry for ROS2 node

* Minor fix in skeleton based ROS2 node

* Fixed license year in the new nodes

* _pose2numpy returns tensor

* graph_type checking updated

* Exclude adjacency matrix weights from load checks

* Fix _pose2numpy

* Add no_grad in infer

* Add Category descriptions

* Applied fix for _pose2numpy from ros1 node

* Added ros node to CMakeLists.txt

* Some link fixes in ros docs

---------

Co-authored-by: Kostas Tsampazis <tsampaka@csd.auth.gr>
Co-authored-by: Kostas Tsampazis <27914645+tsampazk@users.noreply.github.com>
Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>
Co-authored-by: Stefania Pedrazzi <stefaniapedrazzi@users.noreply.github.com>
Co-authored-by: Jelle <43064291+jelledouwe@users.noreply.github.com>
Co-authored-by: Nikolaos Passalis <passalis@users.noreply.github.com>
Co-authored-by: Lukas Hedegaard <lukasxhedegaard@gmail.com>
Co-authored-by: Quoc Nguyen <53263073+minhquoc0712@users.noreply.github.com>
Co-authored-by: charsyme <63857415+charsyme@users.noreply.github.com>
Co-authored-by: Niclas <49001036+vniclas@users.noreply.github.com>
Co-authored-by: aselimc <canakcia@cs.uni-freiburg.de>
Co-authored-by: Ahmet Selim Çanakçı <73101853+aselimc@users.noreply.github.com>
Co-authored-by: ekakalet <63847549+ekakalet@users.noreply.github.com>
Co-authored-by: ad-daniel <daniel.dias@epfl.ch>
Co-authored-by: Illia Oleksiienko <io@ece.au.dk>
Co-authored-by: Illia Oleksiienko <io@ece.u.dk>
Co-authored-by: halil93ibrahim <halil@ece.au.dk>
Co-authored-by: LukasHedegaard <lh@eng.au.dk>

* Binary High Resolution Learner (#402)

* Adding binary high resolution learner

* Adding binary high resolution learner

* Added tests and demos

* Added reference

* Updated Changelog

* Style changes

* Added test

* Added a dependencies ini

* Fixed minor typo

* Reverted probably accidental change

* Typo

* Fixed device on tests

* Removed dataset (moved to ftp)

* Added download method for downloading test dataset

* Fixed leftover name/comment, added dowloading of dataset and cleaning up properly on tear down

* Added downloading of demo dataset

* Added binary hr ros1 node

* Some crude fixes on loader when trying to load multiple images

* Improvements for loading models and error handling

* ROS2 node

* Minor fix in sem segm

* Added ros2 node on setup.py

* Added architecture argument in ros1 node

* Added architecture argument in ros2 node

* Removed unused arguments and minor improvements

* Binary HR doc

* Minor fix in arg

* Added binary hr index entry and missing hr pose estimation

* Added binary hr section and missing hr pose estimation section

* Added binary hr index entry

* Added binary hr node section

* Reduced loader workers in test to avoid warning

* Reverted change that causes error

* Minor fixes

* Updated dependencies and packages

* Added missing protobuf dependency

* Add missing dependency

* Add missing dependency

---------

Co-authored-by: Kostas Tsampazis <27914645+tsampazk@users.noreply.github.com>
Co-authored-by: ad-daniel <daniel.dias@epfl.ch>
Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>

* fix(efficientLPS): Fix the dependency conflict of geffnet installation (#410)

* fix(efficientLPS): Fix the dependency conflict for geffnet

* fix(efficientLPS): Fix efficientNet dependency issue with priority option

---------

Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>

* ROS2 Node for EfficientLPS (#404)

* feat(efficientLPS): Re-implemented the ROS2 nodes for EfficientLPS and PCL2 publisher

* fix(efficientLPS): Small argument variable naming fix

* docs(efficientLPS): Doc update for ROS2 node list

* feat(efficientLPS): ROS2 Node added test data support and updated docs

* docs(efficientLPS): Fix small mistakes in the docs

* docs(efficientLPS): Fix small typos in the docs

* style(efficientLPS): Fix pep8

* style(efficientLPS): Fix pep8

* docs(efficientLPS): Fix license dates

* refactor(efficientLPS): Rename the output topic of EfficientLPS ROS2 node

* feat(efficientLPS): Small function/library call fixes on ROS2 nodes

* Added missing dependency for new efficient lps node

* feat(Continual-SLAM): Make pointcloud2 publisher publish a proper error message

---------

Co-authored-by: Niclas <49001036+vniclas@users.noreply.github.com>
Co-authored-by: tsampazk <27914645+tsampazk@users.noreply.github.com>
Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>

* Multi object search (#363)

* Add zenodo DOI badge (#396)

* Update README.md (#406)

* Update README.md

* Update projects/python/simulation/SMPL+D_human_models/README.md

Co-authored-by: Kostas Tsampazis <27914645+tsampazk@users.noreply.github.com>

* Update README.md

* Update README.md

---------

Co-authored-by: Kostas Tsampazis <27914645+tsampazk@users.noreply.github.com>

* add prev. commits

* Update src/opendr/control/multi_object_search/README.md

Co-authored-by: Kostas Tsampazis <27914645+tsampazk@users.noreply.github.com>

* env default value

* removed default argument

---------

Co-authored-by: Nikolaos Passalis <passalis@users.noreply.github.com>
Co-authored-by: charsyme <63857415+charsyme@users.noreply.github.com>
Co-authored-by: Kostas Tsampazis <27914645+tsampazk@users.noreply.github.com>
Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>

* High Resolution Pose Estimation webcam demo (#409)

* new hr webcam demo

* new hr webcam demo

* typos corrections

* typos corrections

* test licences

* fix infer outputs and update documentation

* update README.md

* Apply suggestions from code review

Co-authored-by: Kostas Tsampazis <27914645+tsampazk@users.noreply.github.com>

* edit for aspect ratio issue

* Change default mode

* ip camera mode removed after discussion

---------

Co-authored-by: Kostas Tsampazis <27914645+tsampazk@users.noreply.github.com>
Co-authored-by: Nikolaos Passalis <passalis@users.noreply.github.com>

* Merge `master` into `develop` (#411)

* Add zenodo DOI badge (#396)

* Update README.md (#406)

* Update README.md

* Update projects/python/simulation/SMPL+D_human_models/README.md

Co-authored-by: Kostas Tsampazis <27914645+tsampazk@users.noreply.github.com>

* Update README.md

* Update README.md

---------

Co-authored-by: Kostas Tsampazis <27914645+tsampazk@users.noreply.github.com>

* facial expression recognition demo update (FPS added)  (#405)

* added FPS to webcam demo

* Update projects/python/perception/facial_expression_recognition/image_based_facial_emotion_estimation/inference_demo.py

Co-authored-by: Kostas Tsampazis <27914645+tsampazk@users.noreply.github.com>

* added FPS to webcam demo

* Fix demo

* PEP8 fixes

---------

Co-authored-by: Kostas Tsampazis <27914645+tsampazk@users.noreply.github.com>
Co-authored-by: ad-daniel <daniel.dias@epfl.ch>
Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>

* Remove deprecated

---------

Co-authored-by: Nikolaos Passalis <passalis@users.noreply.github.com>
Co-authored-by: charsyme <63857415+charsyme@users.noreply.github.com>
Co-authored-by: Kostas Tsampazis <27914645+tsampazk@users.noreply.github.com>
Co-authored-by: Negar Heidari <36771997+negarhdr@users.noreply.github.com>

* Fall Detection - alternative infer input (#397)

* Removed returning of detection lines and infer now takes list of poses in addition to images

* Removed drawing of detection lines and added bbox on detected person even when not fallen

* Updated fall det readme appropriately

* Fixed ROS1 fall det node based on modified infer output

* Fixed ROS2 fall det node based on modified infer output

* Added tests cases for using infer with pose lists

* Fixed webcam demo based on new infer and improved its drawing

* Fixed and improved jupyter notebook tutorial

* Removed unused import

* Fixed hr pose estimation test according to latest changes in the infer method

---------

Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>

* Object detection 2d camera demos (#408)

* Onnx and Jit tracing-scripting implementation with python and c api inference. Docs and tests have changed acordingly

* Implementation of libtorch and torch vision installation as part of tool installation.

* add licence and file name corection

* style, inconclusive cppcheck fixes.

* Fixes for C API initilization errors

* Deleting no used code

* macos cppcheck -> C style fixes

* macos cppcheck -c style fixes

* c-style pointer delceration fixes

* c-style pointer delceration fixes

* cpp casting casting fixes

* bug fixes

* Update projects/python/perception/object_detection_2d/nanodet/export_torchscript.py

Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>

* Update install_torch_c_api.sh

* Update dependencies/install_torch_c_api.sh

Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>

* Update include/nanodet_c.h

Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>

* Update include/nanodet_c.h

Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>

* Update include/nanodet_c.h

Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>

* Update include/nanodet_c.h

Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>

* Update include/opendr_utils.h

Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>

* Update include/target.h

Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>

* Update docs/reference/nanodet.md

Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>

* Update docs/reference/nanodet.md

Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>

* Update nanodet.md

* Update docs/reference/nanodet.md

Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>

* Update docs/reference/nanodet.md

Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>

* Update docs/reference/nanodet.md

Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>

* Update docs/reference/nanodet.md

Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>

* Update docs/reference/nanodet.md

Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>

* Update nanodet.md

* Update docs/reference/nanodet.md

Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>

* Update docs/reference/nanodet.md

Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>

* Update Makefile

* Update docs/reference/nanodet.md

Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>

* Update docs/reference/nanodet.md

Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>

* Update nanodet.md

* Update projects/c_api/Makefile

Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>

* Update projects/python/perception/object_detection_2d/nanodet/README.md

Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>

* Update eval_demo.py

* Update projects/python/perception/object_detection_2d/nanodet/export_onnx.py

Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>

* Update projects/python/perception/object_detection_2d/nanodet/README.md

Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>

* Update projects/python/perception/object_detection_2d/nanodet/README.md

Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>

* installing libtorch and vision with respect to CUDA of the user

* better explanations of variables in optimization runtimes

* small typing fixes

* Fix dependency

* Update dependencies.ini

deleting torchmetrics

* update docs for new data structures and utilities of c api

* new source, samples, utilities and test for onnx C API. The new scripts are implemente the feed forward of almost all the onnx models that python api is provided.

* bug fixes in onnx exporting.

* Revert "update docs for new data structures and utilities of c api"

This reverts commit 467c1f1e661462de46dd88a1762b23cbfaf7f4c8.

* Revert "bug fixes in onnx exporting."

This reverts commit fcd4f9c3a09d70deb51eec83ad1d469c7290ae27.

* Revert "Revert "bug fixes in onnx exporting.""

This reverts commit 953a193aa9a99522ac6069814a4b50f6837c0fac.

* Revert "new source, samples, utilities and test for onnx C API. The new scripts are implemente the feed forward of almost all the onnx models that python api is provided."

This reverts commit 617572d5d6d3e5d02004ece522f7d224d050bd61.

* Revert "bug fixes in onnx exporting."

This reverts commit fcd4f9c3a09d70deb51eec83ad1d469c7290ae27.

* revert last commits, change files for cpp styles as wiki says and better directory construction for easier navigation and new tools implementation.

* change function name to be uniform with the others

* doc for c nanodet

* Added small Json parser and installation script for easier navigation and universal use for future c api

* Update projects/c_api/README.md

Co-authored-by: Nikolaos Passalis <passalis@users.noreply.github.com>

* Update dependencies/install_torch_c_api.sh

Co-authored-by: Nikolaos Passalis <passalis@users.noreply.github.com>

* Update dependencies/install_torch_c_api.sh

Co-authored-by: Nikolaos Passalis <passalis@users.noreply.github.com>

* Update install_torch_c_api.sh

not need for specified vision version in sh

* Update download_torch.py

not need for environment variables to be passed

* Update utilities.py

delete additional print from debugging

* Fixes

* Fixes of suggestions
Combi…
  • Loading branch information
28 people authored and Luca Marchionni committed Jun 6, 2023
1 parent 76c0b1b commit 5184997
Show file tree
Hide file tree
Showing 64 changed files with 179 additions and 122 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/test_packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ jobs:
# - perception/object_detection_3d # passes, but disabled due to free() crash
- perception/facial_expression_recognition
- simulation/human_model_generation
#- control/mobile_manipulation
- control/mobile_manipulation
#- control/single_demo_grasp
#- planning/end_to_end_planning
- control/multi_object_search
Expand All @@ -72,7 +72,7 @@ jobs:
python3 -m venv venv
source venv/bin/activate
python3 -m pip install --upgrade pip
python3 -m pip install wheel
python3 -m pip install wheel==0.38.4
python3 -m pip install opendr-toolkit-engine
python3 -m pip install opendr-toolkit
# run the test
Expand Down Expand Up @@ -114,7 +114,7 @@ jobs:
# - perception/object_detection_3d # passes, but disabled due to free() crash
- perception/facial_expression_recognition
- simulation/human_model_generation
- control/mobile_manipulation
# - control/mobile_manipulation
- control/single_demo_grasp
- planning/end_to_end_planning
- control/multi_object_search
Expand All @@ -126,6 +126,6 @@ jobs:
python-version: 3.8
- name: Test Docker
run: |
docker run --name toolkit -i opendr/opendr-toolkit:cpu_v2.0.0 bash
docker run --name toolkit -i opendr/opendr-toolkit:cpu_v2.1.0 bash
docker start toolkit
docker exec -i toolkit bash -c "source bin/activate.sh && source tests/sources/tools/control/mobile_manipulation/run_ros.sh && python3 -m unittest discover -s tests/sources/tools/${{ matrix.package }}"
25 changes: 16 additions & 9 deletions .github/workflows/tests_suite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,13 @@ jobs:
test-sources:
if: ${{ contains(github.event.pull_request.labels.*.name, 'test sources') || github.event_name == 'schedule' }}
strategy:
fail-fast: false
matrix:
os: [ubuntu-20.04, macos-10.15]
os: [ubuntu-20.04, macos-11]
include:
- os: ubuntu-20.04
DEPENDENCIES_INSTALLATION: "sudo apt -y install clang-format-10 cppcheck"
- os: macos-10.15
DEPENDENCIES_INSTALLATION: "sudo apt update; sudo apt -y install clang-format-10 cppcheck"
- os: macos-11
DEPENDENCIES_INSTALLATION: "brew install clang-format@11 cppcheck; ln /usr/local/bin/clang-format-11 /usr/local/bin/clang-format"
runs-on: ${{ matrix.os }}
steps:
Expand Down Expand Up @@ -105,7 +106,9 @@ jobs:
if [ ${{ matrix.package }} = "ctests" ]; then
make ctests
else
source tests/sources/tools/control/mobile_manipulation/run_ros.sh
if [[ ${{ matrix.package }} == "control/mobile_manipulation" || ${{ matrix.package }} == "planning/end_to_end_planning" ]]; then
source tests/sources/tools/control/mobile_manipulation/run_ros.sh
fi
python3 -m unittest discover -s tests/sources/tools/${{ matrix.package }}
fi
build-wheel:
Expand Down Expand Up @@ -191,7 +194,7 @@ jobs:
# - perception/object_detection_3d # passes, but disabled due to free() crash
- perception/facial_expression_recognition
- simulation/human_model_generation
- control/multi_object_search
#- control/multi_object_search
#- control/mobile_manipulation
#- control/single_demo_grasp
#- planning/end_to_end_planning
Expand Down Expand Up @@ -223,7 +226,7 @@ jobs:
python3 -m venv venv
source venv/bin/activate
python3 -m pip install --upgrade pip
python3 -m pip install wheel
python3 -m pip install wheel==0.38.4
# install all tools one at a time
while read f; do
Expand Down Expand Up @@ -277,7 +280,7 @@ jobs:
# - perception/object_detection_3d # passes, but disabled due to free() crash
- perception/facial_expression_recognition
- simulation/human_model_generation
- control/multi_object_search
#- control/multi_object_search
#- control/mobile_manipulation
#- control/single_demo_grasp
#- planning/end_to_end_planning
Expand Down Expand Up @@ -309,7 +312,7 @@ jobs:
python3 -m venv venv
source venv/bin/activate
python3 -m pip install --upgrade pip
python3 -m pip install wheel
python3 -m pip install wheel==0.38.4
# get the name of the wheel to install based on the test being run
package=$(sed "s/_/-/g" <<< ${{ matrix.package }})
Expand Down Expand Up @@ -396,7 +399,11 @@ jobs:
docker load < ./artifact/docker-artifact/cpu_test.zip
docker run --name toolkit -i opendr/opendr-toolkit:cpu_test bash
docker start toolkit
docker exec -i toolkit bash -c "source bin/activate.sh && source tests/sources/tools/control/mobile_manipulation/run_ros.sh && python3 -m unittest discover -s tests/sources/tools/${{ matrix.package }}"
if [[ ${{ matrix.package }} == "control/mobile_manipulation" || ${{ matrix.package }} == "planning/end_to_end_planning" ]]; then
docker exec -i toolkit bash -c "source bin/activate.sh && source tests/sources/tools/control/mobile_manipulation/run_ros.sh && python3 -m unittest discover -s tests/sources/tools/${{ matrix.package }}"
else
docker exec -i toolkit bash -c "source bin/activate.sh && python3 -m unittest discover -s tests/sources/tools/${{ matrix.package }}"
fi
delete-docker-artifacts:
needs: [build-docker, test-docker]
if: ${{ always() }}
Expand Down
29 changes: 19 additions & 10 deletions .github/workflows/tests_suite_develop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,13 @@ jobs:
test-sources:
if: ${{ contains(github.event.pull_request.labels.*.name, 'test sources') || github.event_name == 'schedule' }}
strategy:
fail-fast: false
matrix:
os: [ubuntu-20.04, macos-10.15]
os: [ubuntu-20.04, macos-11]
include:
- os: ubuntu-20.04
DEPENDENCIES_INSTALLATION: "sudo apt -y install clang-format-10 cppcheck"
- os: macos-10.15
DEPENDENCIES_INSTALLATION: "sudo apt update; sudo apt -y install clang-format-10 cppcheck"
- os: macos-11
DEPENDENCIES_INSTALLATION: "brew install clang-format@11 cppcheck; ln /usr/local/bin/clang-format-11 /usr/local/bin/clang-format"
runs-on: ${{ matrix.os }}
steps:
Expand Down Expand Up @@ -107,7 +108,9 @@ jobs:
if [ ${{ matrix.package }} = "ctests" ]; then
make ctests
else
source tests/sources/tools/control/mobile_manipulation/run_ros.sh
if [[ ${{ matrix.package }} == "control/mobile_manipulation" || ${{ matrix.package }} == "planning/end_to_end_planning" ]]; then
source tests/sources/tools/control/mobile_manipulation/run_ros.sh
fi
python3 -m unittest discover -s tests/sources/tools/${{ matrix.package }}
fi
build-wheel:
Expand Down Expand Up @@ -195,10 +198,10 @@ jobs:
# - perception/object_detection_3d # passes, but disabled due to free() crash
- perception/facial_expression_recognition
- simulation/human_model_generation
#- control/multi_object_search
#- control/mobile_manipulation
#- control/single_demo_grasp
#- planning/end_to_end_planning
- control/multi_object_search
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v3
Expand Down Expand Up @@ -229,7 +232,7 @@ jobs:
python3 -m venv venv
source venv/bin/activate
python3 -m pip install --upgrade pip
python3 -m pip install wheel
python3 -m pip install wheel==0.38.4
# install all tools one at a time
while read f; do
Expand Down Expand Up @@ -288,7 +291,7 @@ jobs:
#- control/mobile_manipulation
#- control/single_demo_grasp
#- planning/end_to_end_planning
- control/multi_object_search
#- control/multi_object_search
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v3
Expand Down Expand Up @@ -319,7 +322,7 @@ jobs:
python3 -m venv venv
source venv/bin/activate
python3 -m pip install --upgrade pip
python3 -m pip install wheel
python3 -m pip install wheel==0.38.4
# get the name of the wheel to install based on the test being run
package=$(sed "s/_/-/g" <<< ${{ matrix.package }})
Expand Down Expand Up @@ -350,7 +353,9 @@ jobs:
python3 -m pip install ./artifact/wheel-artifact/opendr-toolkit-$package-*.tar.gz
fi
cd src/opendr/perception/object_detection_2d/retinaface; make; cd $OPENDR_HOME
if [[ ${{ matrix.package }} == "perception/object_detection_2d/retinaface" ]]; then
cd src/opendr/perception/object_detection_2d/retinaface; make; cd $OPENDR_HOME
fi
# run the test
python3 -m unittest discover -s tests/sources/tools/${{ matrix.package }}
Expand Down Expand Up @@ -408,7 +413,11 @@ jobs:
docker load < ./artifact/docker-artifact/cpu_test.zip
docker run --name toolkit -i opendr/opendr-toolkit:cpu_test bash
docker start toolkit
docker exec -i toolkit bash -c "source bin/activate.sh && source tests/sources/tools/control/mobile_manipulation/run_ros.sh && python3 -m unittest discover -s tests/sources/tools/${{ matrix.package }}"
if [[ ${{ matrix.package }} == "control/mobile_manipulation" || ${{ matrix.package }} == "planning/end_to_end_planning" ]]; then
docker exec -i toolkit bash -c "source bin/activate.sh && source tests/sources/tools/control/mobile_manipulation/run_ros.sh && python3 -m unittest discover -s tests/sources/tools/${{ matrix.package }}"
else
docker exec -i toolkit bash -c "source bin/activate.sh && python3 -m unittest discover -s tests/sources/tools/${{ matrix.package }}"
fi
delete-docker-artifacts:
needs: [build-docker, test-docker]
if: ${{ always() }}
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# OpenDR Toolkit Change Log

## Version 2.1.0
Released on XX, XX, 2023.
Released on February, 22nd, 2023.

- New Features:
- Added YOLOv5 as an inference-only tool ([#360](https://github.com/opendr-eu/opendr/pull/360)).
Expand Down
2 changes: 1 addition & 1 deletion CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
# the repo. Unless a later match takes precedence,
# @global-owner1 and @global-owner2 will be requested for
# review when someone opens a pull request.
* @passalis @omichel @ad-daniel @stefaniapedrazzi
* @passalis @omichel @stefaniapedrazzi
6 changes: 3 additions & 3 deletions bin/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ git submodule update
python3 -m venv venv
source venv/bin/activate
python3 -m pip install -U pip
python3 -m pip install setuptools configparser
python3 -m pip install setuptools configparser wheel==0.38.4

# Add repositories for ROS
sudo sh -c 'echo "deb http://packages.ros.org/ros/ubuntu $(lsb_release -sc) main" > /etc/apt/sources.list.d/ros-latest.list' \
Expand Down Expand Up @@ -62,8 +62,8 @@ if [[ "${OPENDR_DEVICE}" == "gpu" ]]; then
python3 -m pip uninstall -y torch
echo "[INFO] Replacing mxnet-cu112==1.8.0post0 to enable CUDA acceleration."
python3 -m pip install mxnet-cu112==1.8.0post0
echo "[INFO] Replacing torch==1.9.0+cu111 to enable CUDA acceleration."
python3 -m pip install torch==1.9.0+cu111 torchvision==0.10.0+cu111 torchaudio==0.9.0 -f https://download.pytorch.org/whl/torch_stable.html
echo "[INFO] Replacing torch==1.13.1+cu116 to enable CUDA acceleration."
python3 -m pip install torch==1.13.1+cu116 torchvision==0.14.1 torchaudio==0.13.1 -f https://download.pytorch.org/whl/torch_stable.html
echo "[INFO] Reinstalling detectronv2."
python3 -m pip install 'git+https://github.com/facebookresearch/detectron2.git@5aeb252b194b93dc2879b4ac34bc51a31b5aee13'
fi
Expand Down
4 changes: 2 additions & 2 deletions bin/install_nvidia.sh
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ pip3 install yacs==0.1.8
pip3 install yarl==1.7.2
pip3 install zipp==3.6.0
pip3 install zope.interface==5.4.0
pip3 install wheel
pip3 install wheel==0.38.4
pip3 install pytorch-lightning==1.2.3
pip3 install omegaconf==2.3.0
pip3 install ninja
Expand All @@ -300,7 +300,7 @@ pip3 install git+https://github.com/cidl-auth/cocoapi@03ee5a19844e253b8365dbbf35
pip3 install git+https://github.com/cocodataset/panopticapi.git@7bb4655548f98f3fedc07bf37e9040a992b054b0
pip3 install git+https://github.com/mapillary/inplace_abn.git
pip3 install git+https://github.com/facebookresearch/detectron2.git@4841e70ee48da72c32304f9ebf98138c2a70048d
pip3 install git+https://github.com/cidl-auth/DCNv2
pip3 install git+https://github.com/cidl-auth/DCNv2_updated
pip3 install ${OPENDR_HOME}/src/opendr/perception/panoptic_segmentation/efficient_ps/algorithm/EfficientPS
pip3 install ${OPENDR_HOME}/src/opendr/perception/panoptic_segmentation/efficient_lps/algorithm/EfficientLPS
pip3 install ${OPENDR_HOME}/src/opendr/perception/panoptic_segmentation/efficient_lps/algorithm/EfficientLPS/efficientNet
Expand Down
4 changes: 3 additions & 1 deletion dependencies/dependencies.ini
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
[runtime]
# 'python' and 'python-dependencies' keys expect a value in the Python requirements file format
# https://pip.pypa.io/en/stable/reference/pip_install/#requirements-file-format
python=torch==1.9.0
python=torch==1.13.1
wheel
numpy


[device]
# These dependencies require a CPU. If no CPU is available, the package will not be installed.
Expand Down
4 changes: 2 additions & 2 deletions docs/reference/index.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# OpenDR Toolkit Reference Manual

*Release 2.0.0*
*Release 2.1.0*
<div align="center">
<img src="images/opendr_logo.png" />
</div>
Expand Down Expand Up @@ -43,7 +43,7 @@ Neither the copyright holder nor any applicable licensor will be liable for any
- [edgespeechnets Module](edgespeechnets.md)
- [quadraticselfonn Module](quadratic-selfonn.md)
- object detection 2d:
- [nanodet Module](nanodet.md)
- [nanodet Module](object-detection-2d-nanodet.md)
- [detr Module](detr.md)
- [gem Module](gem.md)
- [retinaface Module](face-detection-2d-retinaface.md)
Expand Down
16 changes: 8 additions & 8 deletions docs/reference/installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ First, install the required dependencies:
sudo apt install python3.8-venv libfreetype6-dev git build-essential cmake python3-dev wget libopenblas-dev libsndfile1 libboost-dev libeigen3-dev
python3 -m venv venv
source venv/bin/activate
pip install wheel
pip install wheel==0.38.4
```
Then, you install the Python API of the toolkit using pip:
```bash
Expand All @@ -57,8 +57,8 @@ For example, if you stick with the default PyTorch version (1.8) and use CUDA11.
sudo apt install python3.8-venv libfreetype6-dev git build-essential cmake python3-dev wget libopenblas-dev libsndfile1 libboost-dev libeigen3-dev
python3 -m venv venv
source venv/bin/activate
pip install wheel
pip install torch==1.9.0+cu111 torchvision==0.10.0+cu111 torchaudio==0.9.0 -f https://download.pytorch.org/whl/torch_stable.html
pip install wheel==0.38.4
pip install torch==1.13.1+cu116 torchvision==0.14.1 torchaudio==0.13.1 -f https://download.pytorch.org/whl/torch_stable.html
pip install 'git+https://github.com/facebookresearch/detectron2.git'
pip install mxnet-cu112==1.8.0post0
pip install opendr-toolkit-engine
Expand Down Expand Up @@ -106,14 +106,14 @@ Note that `opendr-toolkit` is actually just a metapackage that includes all the
## CPU docker
After installing [docker](https://docs.docker.com/engine/install/ubuntu/), you can directly run the OpenDR image as:
```bash
sudo docker run -p 8888:8888 opendr/opendr-toolkit:cpu_v2.0.0
sudo docker run -p 8888:8888 opendr/opendr-toolkit:cpu_v2.1.0
```
The docker automatically runs a Jupyter notebook server that listens at port 8888.
When launched, you can access the Jupyter notebook by following the link provided in the console, it should be similar to [http://127.0.0.1:8888/?token=TOKEN](http://127.0.0.1:8888/?token=TOKEN). In order to stop the container, please quit the Jupyter notebook.

If you do not wish to use Jupyter, you can also experiment by starting an interactive session by running:
```bash
sudo docker run -it opendr/opendr-toolkit:cpu_v2.0.0 /bin/bash
sudo docker run -it opendr/opendr-toolkit:cpu_v2.1.0 /bin/bash
```
In this case, do not forget to enable the virtual environment with:
```bash
Expand All @@ -122,18 +122,18 @@ source bin/activate.sh
If you want to display GTK-based applications from the Docker container (e.g., visualize results using OpenCV `imshow()`), then you should mount the X server socket inside the container, e.g.,
```bash
xhost +local:root
sudo docker run -it -v /tmp/.X11-unix:/tmp/.X11-unix -e DISPLAY=unix$DISPLAY opendr/opendr-toolkit:cpu_v2.0.0 /bin/bash
sudo docker run -it -v /tmp/.X11-unix:/tmp/.X11-unix -e DISPLAY=unix$DISPLAY opendr/opendr-toolkit:cpu_v2.1.0 /bin/bash
```

## GPU docker
If you want to use a CUDA-enabled container please install [nvidia-docker](https://github.com/NVIDIA/nvidia-docker).
Then, you can directly run the latest image with the command:
```bash
sudo docker run --gpus all -p 8888:8888 opendr/opendr-toolkit:cuda_v2.0.0
sudo docker run --gpus all -p 8888:8888 opendr/opendr-toolkit:cuda_v2.1.0
```
or, for an interactive session:
```bash
sudo docker run --gpus all -it opendr/opendr-toolkit:cuda_v2.0.0 /bin/bash
sudo docker run --gpus all -it opendr/opendr-toolkit:cuda_v2.1.0 /bin/bash
```
In this case, do not forget to enable the virtual environment with:
```bash
Expand Down
2 changes: 1 addition & 1 deletion docs/reference/object-detection-2d-nms-seq2seq_nms.md
Original file line number Diff line number Diff line change
Expand Up @@ -302,4 +302,4 @@ TABLE-1: Average Precision (AP) achieved by pretrained models on the person dete


#### References
<a name="seq2seq_nms-1" href="https://www.techrxiv.org/articles/preprint/Neural_Attention-driven_Non-Maximum_Suppression_for_Person_Detection/16940275">[1]</a> Neural Attention-driven Non-Maximum Suppression for Person Detection, [TechRxiv](https://www.techrxiv.org/articles/preprint/Neural_Attention-driven_Non-Maximum_Suppression_for_Person_Detection/16940275).
<a name="seq2seq_nms-1" href="https://ieeexplore.ieee.org/abstract/document/10107719">[1]</a> C. Symeonidis, I. Mademlis, I. Pitas and N. Nikolaidis, "Neural Attention-Driven Non-Maximum Suppression for Person Detection" in IEEE Transactions on Image Processing, vol. 32, pp. 2454-2467, 2023, doi: 10.1109/TIP.2023.3268561.
Original file line number Diff line number Diff line change
Expand Up @@ -198,8 +198,8 @@ def __init__(
self.gem_learner.download(path=".", verbose=True)

# Subscribers
msg_rgb = message_filters.Subscriber(self, ROS_Image, input_rgb_image_topic, 1)
msg_ir = message_filters.Subscriber(self, ROS_Image, input_infra_image_topic, 1)
msg_rgb = message_filters.Subscriber(self, ROS_Image, input_rgb_image_topic)
msg_ir = message_filters.Subscriber(self, ROS_Image, input_infra_image_topic)

sync = message_filters.TimeSynchronizer([msg_rgb, msg_ir], 1)
sync.registerCallback(self.callback)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Flask==1.1.2
Flask==2.3.2
gluoncv==0.10.1.post0
2 changes: 1 addition & 1 deletion projects/python/simulation/SMPL+D_human_models/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ $BLENDER_PATH/blender -P src/generate_models.py

**Note:** FBX models must have been previously generated

Finally, instructions for setting a demo project in Webots are provided. In the project, the SMPL+D models (in the FBX format) can perform animations from [AMASS](https://smpl.is.tue.mpg.de/).
Finally, instructions for setting a demo project in Webots are provided. In the project, the SMPL+D models (in the FBX format) can perform animations from [AMASS](https://smpl.is.tue.mpg.de/).

- Download ACCAD database from AMASS (https://amass.is.tue.mpg.de/download.php)

Expand Down
2 changes: 1 addition & 1 deletion src/opendr/control/mobile_manipulation/dependencies.ini
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ python=vcstool
[runtime]
# 'python' key expects a value using the Python requirements file format
# https://pip.pypa.io/en/stable/reference/pip_install/#requirements-file-format
python=torch==1.9.0
python=torch==1.13.1
protobuf<=3.20.0
tensorboard
numpy<=1.23.5
Expand Down
4 changes: 2 additions & 2 deletions src/opendr/control/multi_object_search/dependencies.ini
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[runtime]
python=torch==1.9.0
torchvision==0.10.0
python=torch==1.13.1
torchvision==0.14.1
tensorboard
numpy
scipy
Expand Down
Loading

0 comments on commit 5184997

Please sign in to comment.