Skip to content

Commit 3dcab24

Browse files
stefaniapedrazziad-danielpassaliskaterynaChPavlos-Tosidis
authored
Merge master into develop branch (#290)
* Synchronize master and develop workflows (#236) * Synchronize master and develop workflows * comment * Added OpenDR citation (#238) * Added OpenDR citation * Update README.md * Fixes bibtex name (#241) Fixes citation name * Fix clang (#250) * Integration of heart anomaly detection self-attention neural bag of features (#246) * added sanbof models * added attention models to ci test Co-authored-by: ad-daniel <[email protected]> * Make `test release` docker target the specific branch when the label is run manually (#252) * Fix * Better approach * Fix * Update CODEOWNERS (#253) * Update face-recognition.md (#257) * skeleton-based HAR demo bug fixed (#260) * infer updated * edge case fix (no pose detected) * pep fixes * Fix sources after cppcheck upgrade * More Co-authored-by: Negar <[email protected]> Co-authored-by: Nikolaos Passalis <[email protected]> Co-authored-by: ad-daniel <[email protected]> * Synchronize workflows * Fix workflows * Version bump * Merge `develop` into `master` (#262) * Merge `master` into `develop` (#203) * Add automatic nightly sanity check (#192) * Add automatic nightly check * fix * Add badge * remove conditions * Remove develop badge * restore name * Fix nightly check (#193) * Fix nightly check * fix test * upgrade scikit-learn to 0.22 (#198) * upgrade scikit-learn to 0.22 0.21.3 causes warnings with the current numpy version. Upgrading it fixes it. * add changelog Co-authored-by: ad-daniel <[email protected]> * bug fixed (#196) Co-authored-by: Negar <[email protected]> Co-authored-by: ad-daniel <[email protected]> * Fix copyright dates and double-check rights owner (action required) (#199) * Fix dates * undo wrong change * Fix Tampere * Automatic test of pip and docker (#200) * Test pip installation * Trigger * Fix * Minor * Updated wheel test * Added libopenblas install * Temporary test disable * Temporary test disable * Added libsndfile1 dependency * Restored disabled test * New wheel building pipeline * Update build_wheel.sh * Added libboost-dev dep * Update installation.md * Switch to sdist * sdist workflow * Update tests_suite.yml * Added numpy include dirs * Disabled two 3d detection tests * Disabled three 3d detection tests * Disabled five 3d detection tests * Disabled all 3d detection tests * Disabled model download - 3d test * Disabled everything? * Removed imports from 3d object detection test * Import test * Import test * Import test * Import test * Import test * Import test * Restored test * Disabled object detection 3d test * Refactor workflow * disable temporarely * Fix docker mobile manipulation * Re-enable test * add badge * Fix changelog * remove test install reference * Restored pip installation Co-authored-by: Nikolaos Passalis <[email protected]> Co-authored-by: Nikolaos <[email protected]> Co-authored-by: Pavlos Tosidis <[email protected]> Co-authored-by: Negar Heidari <[email protected]> Co-authored-by: Negar <[email protected]> Co-authored-by: Nikolaos Passalis <[email protected]> Co-authored-by: Nikolaos <[email protected]> * Modular python packages (#201) * Split package creation * Added description.txt * Updated setup.py * Added separate setup.py * Added separate setup.py * Relaxed dependencies * Added hyper-parameter tuning setup py * Updates * Relaxed dependecies * Added updated setup.py * Changed generation policy * Added wheel dep * Moved helper utilities to engine * Moved test * Updated setup.py * Updated deps * Updated deps * Added metapackage generation * Moved io to engine.helper * Relaxed dependencies * Update installation.md * Added new .ini sections * Cleaned build_wheel.sh * Restored pytorch dependencies * Added missing __init__.py * _setup.py fix * Updated deps * Updated deps * Updated deps * Updated deps * Fixed _setup.py * Updated package list * Updates * Updates * temp disable single_demo_grasp * Fixed deps * Restored single_demo_grasp test * Added sequential package installation * Update build_wheel.sh * Update tests_suite.yml * Update tests_suite.yml * Updated installation workflow * Fixed workflow * Manual AVX2 disable for bcolz * Fix string replace * Fixed path * Added debug output * Update build_wheel.sh * Added dependencies to ensure correct building * Update installation.md * Added separate pip package testing * Fixed package naming * Typo fix * Added a missing dependency * Added missing dependency * Fixed utils workflow * Fixed utils bug * Fixed hyperparameter_tuner test * Fixed utils * Update .github/workflows/tests_suite.yml Co-authored-by: ad-daniel <[email protected]> * Added wheel and docker testing to develop * Pass key by const reference * Style fix * Minor fix and cleanup Co-authored-by: ad-daniel <[email protected]> Co-authored-by: ad-daniel <[email protected]> * Face Recognition ROS and bug fixes (#219) * This commit contains: 1. face_recognition.py script and perception README.md update 2. updated benchmarking_demo.py to correctly measure GPU memory allocation 3. Added torch setting in model_mobilenet.py for faster CPU inference 4. Sped up utils.py pair generation script 5. Fixed a minor bug in face_recognition_learner.py * This commit contains: 1. face_recognition.py script and perception README.md update 2. updated benchmarking_demo.py to correctly measure GPU memory allocation 3. Added torch setting in model_mobilenet.py for faster CPU inference 4. Sped up utils.py pair generation script 5. Fixed a minor bug in face_recognition_learner.py 6. Added create_new flag on face_recognition_learner.fit_reference() * Update docs/reference/face-recognition.md Co-authored-by: Nikolaos Passalis <[email protected]> * Update benchmarking_demo.py * Update benchmarking_demo.py Co-authored-by: Nikolaos Passalis <[email protected]> * XML dataset addition + mxnet-cu102 fix (#224) * xml type dataset addition * documentation for concatdataset * mxnet-cu102 changes * fixed license * changed order of mxnet cpu-gpu installation * documentation addition + fix * Gem Mobilenet-v2 pretrained backbone (#226) * Add pretrained mobilenetv2 backbone * Update gem.md Co-authored-by: Jelle Luijkx <[email protected]> * Notebooks for mxnet detectors (#230) * added notebooks for mxnet detectors * import + OpenDR reformat * EAGERx as dependency instead of submodule. (#228) * EAGERx as dependeny instead of submodule. Docs and demos updated accordingly * Fix typo * Minor fixes * Update test_pep8.py * Loosen pyqglet requirements to solve dependency issue * Loosen pyglet requitement to solve dependency issue * Update dependencies * Update dependencies * Update EAGERx * Fix typo * Add rendering toggle to eagerx demos Co-authored-by: Jelle Luijkx <[email protected]> Co-authored-by: ad-daniel <[email protected]> * Lightweight openpose fixes (#242) * Fixed onnx optimize bugs with half precision and different number of stages * Fixed height check based on [original repo #202](Daniil-Osokin/lightweight-human-pose-estimation.pytorch#202) * Update changelog for #242 * Upgrade to CUDA 11.2 and improve GPU support (#215) * Updated to CUDA11.2 * Switch to devel image * Update install.sh * Update dependencies.ini * Updated pytorch * DCNv2 update * Detectron update * Update installation.md * More strict stable-baselines3 ver * Updated dep version * Update CHANGELOG.md * Small consistent fix * Minor typo fix * Updated CPU/GPU support for pip * Updated numba version * Removed OPENDR_DEVICE * Added support for changing inference device during testing * Style fixes * Separate tests for face detection * Updated testing pipeline for face detection 2d * Update installation.md * Fixed weight placement * Fixed cuda placement check * Fixed mxnet installation * Updated base image * Separate object detection 2d tests * Upgraded to pytorch 1.9.0 * Changed default constant folding setting * Updated EfficientPS * Apply suggestions from code review Co-authored-by: ad-daniel <[email protected]> * Bugfixes * Increase tollerance in test_cox3d_learner * Test dockerfile with correct branch * Removed comment * remove branch from docker files Co-authored-by: ad-daniel <[email protected]> Co-authored-by: ad-daniel <[email protected]> Co-authored-by: LukasHedegaard <[email protected]> * chore(eagerx): bump version eagerx to 0.1.10 (#244) Co-authored-by: Jelle Luijkx <[email protected]> * End to end planning (#223) * v0 * v0 * Ros nodes and documentation. * fit method * cleanup * test for eval and infer * env updated * env updated - tests passed * pep8 - cleanup * pep8 - cleanup * pep8 * licenses fixed * clang * test_sources * dep - test only this tool * dep - test only this tool * test only this tool * test only this tool * test only this tool * test only this tool * test python 3.6 * test python 3.6 * test python 3.6 * test python 3.8 * test python 3.8 * test python 3.8 * test python 3.8 * test python 3.8 * test python 3.8 * test python 3.8 * test python 3.8 * test - exclude control/mm * test all * clean up * clean up * test * undo * install webots * Update e2e_planning_learner.py * Update download_ardupilot_files.py * Update range_image.py * Update agi_env.py * Update children_robot.cpp * Update take_off.cpp * gym version issue with save and load * gym version * clean up test licence skipped directory * gym version issue * gym version 0.19 * stable baselines3 version 1.3 * gym ver 0.20 sb3 ver 1.1 * docs updated * docs updated * docs updated * fix * Update .github/workflows/tests_suite.yml Co-authored-by: ad-daniel <[email protected]> * Update .github/workflows/tests_suite_develop.yml Co-authored-by: ad-daniel <[email protected]> * Update docs/reference/end_to_end_planning.md Co-authored-by: ad-daniel <[email protected]> * update tests_suite.yml and tests_suite_develop.yml * added infer to docs * requested changes * fix pep8 * init files * preformance evaluation and init files under tests & test/sources * undo * test * Revert "test" This reverts commit 7f20428. * Update CHANGELOG.md * Update CHANGELOG.md * Update CHANGELOG.md Co-authored-by: ad-daniel <[email protected]> * added TEST_DEVICE in tests * eval/fit return dictionary Co-authored-by: ad-daniel <[email protected]> Co-authored-by: ad-daniel <[email protected]> Co-authored-by: Illia Oleksiienko <[email protected]> Co-authored-by: Nikolaos Passalis <[email protected]> * Benchmark au (#231) * Add Human Activity Recognition benchmark scripts * Remove pandas dependency in activity_recognition * Remove pyav dependency * Add decoder option to kinetics loader * Add script for har benchmark install * Update har-benchmark install script * Add variable batch_sizes to har benchmark script * Add har benchmark RTX2080Ti results * Update har benchmark scripts * Add xavier benchmark har results * Update har benchmark scripts with CPU batch_sizes * Add har benchmark CPU results * Fix black lint issue * Remove obsolete dependency * Redo cox3d RTX2080Ti benchmark * Update har benchmark batch sizes * Fix install script env vars * Fix exception handling in kinetics * Update Xavier har benchmark * Add har results on TX2 * Add batch size for tx2 in har benchmark scripts * Add 3D object detection benchmark * Fix bounding box to str * Add detection_3d and tracking_2d benchmarks * Fix imports not working in python 3.6 * Update file names * Update far mot names * Add AB3DMOT benchmark * Update media tracking 3d * benchmark_stgcn added * benchmark_stgcn added * benchmark_stgcn added * benchmark_stgcn added * benchmark_stgcn added * benchmark_stgcn added * benchmark_stgcn added * benchmark_stgcn added * benchmark_stgcn modified * benchmark_stgcn modified * benchmark_stgcn modified * benchmark_stgcn modified * benchmark_stbln modified * benchmark_stbln modified * benchmark_stbln modified * benchmark_stbln modified * benchmark_stbln modified * mcdo is modified * mcdo is modified * mcdo is modified * mcdo is modified * mcdo is modified * mcdo is modified * Fix style in kinetics * Fix W503 * code style fixed * style fixed * Fix style errors * Fix kinetics unused torchvision * Remove activity recognition results * Add av dependency back Co-authored-by: Illia Oleksiienko <[email protected]> Co-authored-by: Negar <[email protected]> Co-authored-by: ad-daniel <[email protected]> * Clang Fixes (#249) * clang fixes * Changed version of clang in MacOS * Revert change * Update tests_suite.yml * Switched to clang 11 * Documentation for performance evaluation (#239) * Pose estimation speed documentation * Added pose estimation results * Formatting fix * Update lightweight-open-pose.md * Apply suggestions from code review Co-authored-by: ad-daniel <[email protected]> * Update lightweight-open-pose.md * Add performance evaluation for EfficientPS * Added evalutation metrics * evaluation documentation * evaluation metrics added Skeleton-based HAR, Landmark-based FER * Add activity recognition results * performance documentation for mxnet-based detectors * Update human-model-generation.md * Update human-model-generation.md * Update human-model-generation.md * Update human-model-generation.md * mobileRL performance metrics * Update semantic-segmentation.md Add performance evaluation for BiseNet. * Update semantic-segmentation.md Add performance evaluation for BiseNet. * Add 2d trackiong evaluation results * Add 3d tracking evaluation results * Add 3d object detection evaluation results * docs(gem.md): add performance evaluation tables * docs(eagerx.md): add performance evaluation tables * docs(hyperparameter_tuner.md): add performance evaluation tables * upload end-to-end planning docs * Add performance evaluation metrics * Update docs/reference/single-demonstration-grasping.md Co-authored-by: ad-daniel <[email protected]> * Update docs/reference/single-demonstration-grasping.md Co-authored-by: ad-daniel <[email protected]> * Delete end-to-end-planning.md * Update docs/reference/synthetic_facial_image_generator.md Co-authored-by: ad-daniel <[email protected]> * Update docs/reference/synthetic_facial_image_generator.md Co-authored-by: ad-daniel <[email protected]> * Update docs/reference/synthetic_facial_image_generator.md Co-authored-by: ad-daniel <[email protected]> * Update docs/reference/human-model-generation.md Co-authored-by: ad-daniel <[email protected]> * Update docs/reference/human-model-generation.md Co-authored-by: ad-daniel <[email protected]> * Update docs/reference/human-model-generation.md Co-authored-by: ad-daniel <[email protected]> * Update docs/reference/human-model-generation.md Co-authored-by: ad-daniel <[email protected]> * Update docs/reference/activity-recognition.md Co-authored-by: ad-daniel <[email protected]> * Update docs/reference/activity-recognition.md Co-authored-by: ad-daniel <[email protected]> * Apply suggestions from code review Co-authored-by: ad-daniel <[email protected]> * Update docs/reference/activity-recognition.md Co-authored-by: ad-daniel <[email protected]> * Update docs/reference/activity-recognition.md Co-authored-by: ad-daniel <[email protected]> * Update docs/reference/face-detection-2d-retinaface.md * Update docs/reference/single-demonstration-grasping.md Co-authored-by: thomaspeyrucain <[email protected]> * Update docs/reference/face-detection-2d-retinaface.md * Update docs/reference/face-detection-2d-retinaface.md * Update docs/reference/voxel-object-detection-3d.md * Update docs/reference/voxel-object-detection-3d.md * Update docs/reference/voxel-object-detection-3d.md * Update docs/reference/face-recognition.md * Update docs/reference/landmark-based-facial-expression-recognition.md * Update docs/reference/landmark-based-facial-expression-recognition.md * Update docs/reference/landmark-based-facial-expression-recognition.md * Update docs/reference/object-tracking-2d-fair-mot.md * Apply suggestions from code review * Update docs/reference/mobile-manipulation.md Co-authored-by: ad-daniel <[email protected]> * Update docs/reference/object-tracking-3d-ab3dmot.md Co-authored-by: ad-daniel <[email protected]> * Update docs/reference/efficient-ps.md * Update docs/reference/skeleton-based-action-recognition.md Co-authored-by: ad-daniel <[email protected]> * Update docs/reference/skeleton-based-action-recognition.md Co-authored-by: ad-daniel <[email protected]> * Update docs/reference/skeleton-based-action-recognition.md Co-authored-by: ad-daniel <[email protected]> Co-authored-by: ad-daniel <[email protected]> Co-authored-by: Niclas Vödisch <[email protected]> Co-authored-by: pavlos <[email protected]> Co-authored-by: ekakalet <[email protected]> Co-authored-by: Negar <[email protected]> Co-authored-by: LukasHedegaard <[email protected]> Co-authored-by: Vivi <[email protected]> Co-authored-by: charsyme <[email protected]> Co-authored-by: Daniel Honerkamp <[email protected]> Co-authored-by: Maria Tzelepi <[email protected]> Co-authored-by: Illia Oleksiienko <[email protected]> Co-authored-by: Jelle Luijkx <[email protected]> Co-authored-by: halil93ibrahim <[email protected]> Co-authored-by: Alexandre Angleraud <[email protected]> Co-authored-by: Lukas Hedegaard <[email protected]> Co-authored-by: Niclas <[email protected]> Co-authored-by: thomaspeyrucain <[email protected]> Co-authored-by: Olivier Michel <[email protected]> * Fall detection (#237) * Initial version of fall detector learner with naive fall detection implementation * Added alternative ways to retrieve data from Keypoint, similar to Pose class * Formatted imports * Initial version of fall detection demo and empty README * Reverted changes in target.py for Keypoint class * Reverted to default Keypoint.data access and fixed download path * Added convenience __getitem__ method and properties for accessing Keypoint data. * Fall detection evaluation on UR Fall Dataset WIP * Improved reading of UR Fall Dataset and completed basic evaluation * Inference demo to run fall detection on predetermined images * Renamed fall_detection.py to webcam_demo.py * Webcam demo cleanup * Removed unused time import * Infer now returns a list of detections * Inference demo now works with modified learner for multiple poses * Infer now returns the pose as well * Inference demo works on multiple detections and prints appropriate messages and graphics * Webcam demo now works with multiple fall detections * Some modifications to the eval method and a docstring with some explanations. * Evaluation demo * Changed the way naive fall detection calculates angles for major increase in sensitivity and minor decrease in specificity * Changed the way naive fall detection calculates leg position, avoiding some false positives and fixed minor bug * Added condition for calves angle, increasing sensitivity significantly * Added tests for fall detector * Added download method and did extensive changes all around to work with tests * Finalized inference demo with images downloaded from FTP * Finalized eval demo with image download from FTP and argparse * Finalized webcam demo * Added fall detection demo readme * Added NotImplementedError on fit and made some methods private * Added documentation for fall detector * Minor fixes * Added tutorial notebook and updated README * Update tests_suite.yml Added fall detection tests * Added missing references on fall detection tests * Fixes according to review * Couple of fixes based on review * Added fall detection on packages.txt * Added a dependencies.ini for fall-detection * Removed notes section * Update dep installation * Added changelog entry for fall detection tool * Added fall detection node * Added fall detection node instructions * Added Fall Detection entry in list of nodes * Added python ros node for fall detection * Review fixes * Temporary test * Revert "Temporary test" This reverts commit 40dba12. Co-authored-by: ad-daniel <[email protected]> Co-authored-by: Nikolaos Passalis <[email protected]> Co-authored-by: ad-daniel <[email protected]> * Merge `master` into `develop` (#254) * Synchronize master and develop workflows (#236) * Synchronize master and develop workflows * comment * Added OpenDR citation (#238) * Added OpenDR citation * Update README.md * Fixes bibtex name (#241) Fixes citation name * Fix clang (#250) * Integration of heart anomaly detection self-attention neural bag of features (#246) * added sanbof models * added attention models to ci test Co-authored-by: ad-daniel <[email protected]> * Make `test release` docker target the specific branch when the label is run manually (#252) * Fix * Better approach * Fix * Update CODEOWNERS (#253) Co-authored-by: Nikolaos Passalis <[email protected]> Co-authored-by: Kateryna Chumachenko <[email protected]> Co-authored-by: Stefania Pedrazzi <[email protected]> * Added webcam demo for Face Recognition (#247) * Added webcam demo for Face Recognition * Update webcam_demo.py * Renamed README.md and added webcam_demo instructions. * Renamed README.md and added webcam_demo instructions. * Renamed README.md and added webcam_demo instructions. * Renamed README.md and added webcam_demo instructions. * Renamed README.md and added webcam_demo instructions. * Renamed README.md and added webcam_demo instructions. Co-authored-by: ad-daniel <[email protected]> * Added audiovisual emotion learner (develop) (#251) * added av emotion learner * added demo * updated index.md * fixed licenses * pep8 fixes * pep8 fix * dependencies fix * delete redundant files from demos * Update tests/sources/tools/perception/multimodal_human_centric/audiovisual_emotion_recognition/test_audiovisual_emotion_learner.py Co-authored-by: ad-daniel <[email protected]> * demo fix * simplify imports * pep8 fix * pep8 fix * Fix sources Co-authored-by: ad-daniel <[email protected]> Co-authored-by: ad-daniel <[email protected]> * Fix nvidia docker key (#255) * Fix nvidia key * Test if it actually fails * Undo * Don't delete prior key * Nms module (#232) * Add files via upload * Add files via upload * Add files via upload * Create __init__.py * Create __init__.py * Add files via upload * Add files via upload * Add files via upload * Update __init__.py * Update __init__.py * Update __init__.py * Update __init__.py * Delete __init__.py * Delete __init__.py * Update nms_utils.py * Update seq2seq_nms_learner.py * Update test_seq2seq_nms.py * Update nms_dataset.py * tests * Update test_seq2seq_nms.py * Update test_seq2seq_nms.py * Update nms_dataset.py * Update test_seq2seq_nms.py * Update nms_utils.py * Update seq2seq_nms_learner.py * Update seq2seq_nms_learner.py * Update seq2seq_nms_learner.py * Update fmod.py * Update seq2seq_model.py * Update fmod.py * Update seq2seq_nms_learner.py * Update seq2seq_nms_learner.py * Update seq2seq_nms_learner.py * Update object-detection-2d-nms-seq2seq_nms.md * Update test_seq2seq_nms.py * Update object_detection_2d_ssd.py * Update object_detection_2d_ssd.py * Update object_detection_2d_ssd.py * Update object_detection_2d_ssd.py * Update object_detection_2d_ssd.py * Create README.md * Create README.md * Update README.md * Update README.md * Create README.md * Update README.md * Update ssd_learner.py * Update ssd_learner.py * Update nms_utils.py * Update inference_demo.py * Update inference_demo.py * Update README.md * Update README.md * Update README.md * Create README.md * Update inference_demo.py * Create training_demo.py * Update training_demo.py * Update training_demo.py * Rename training_demo.py to train_demo.py * Create eval_demo.py * Update train_demo.py * Update docs/reference/object-detection-2d-nms-seq2seq_nms.md Co-authored-by: ad-daniel <[email protected]> * Update docs/reference/object-detection-2d-nms-seq2seq_nms.md Co-authored-by: ad-daniel <[email protected]> * Update docs/reference/object-detection-2d-nms-seq2seq_nms.md Co-authored-by: ad-daniel <[email protected]> * Update docs/reference/object-detection-2d-nms-seq2seq_nms.md Co-authored-by: ad-daniel <[email protected]> * Update docs/reference/object-detection-2d-nms-seq2seq_nms.md Co-authored-by: ad-daniel <[email protected]> * Update docs/reference/object-detection-2d-nms-seq2seq_nms.md Co-authored-by: ad-daniel <[email protected]> * Update src/opendr/perception/object_detection_2d/datasets/transforms.py Co-authored-by: ad-daniel <[email protected]> * Update README.md * Update README.md * Update README.md * Update README.md * Update README.md * Update README.md * Update README.md * Update README.md * Update README.md * Update README.md * Update README.md * Update README.md * Update README.md * Update README.md * Update docs/reference/object-detection-2d-nms-seq2seq_nms.md Co-authored-by: ad-daniel <[email protected]> * Update docs/reference/object-detection-2d-nms-seq2seq_nms.md Co-authored-by: ad-daniel <[email protected]> * Update docs/reference/object-detection-2d-nms-seq2seq_nms.md Co-authored-by: ad-daniel <[email protected]> * Update docs/reference/object-detection-2d-nms-seq2seq_nms.md Co-authored-by: ad-daniel <[email protected]> * Update docs/reference/object-detection-2d-nms-seq2seq_nms.md Co-authored-by: ad-daniel <[email protected]> * Update docs/reference/object-detection-2d-nms-seq2seq_nms.md Co-authored-by: ad-daniel <[email protected]> * Update docs/reference/object-detection-2d-nms-seq2seq_nms.md Co-authored-by: ad-daniel <[email protected]> * Update docs/reference/object-detection-2d-nms-seq2seq_nms.md Co-authored-by: ad-daniel <[email protected]> * Update docs/reference/object-detection-2d-nms-seq2seq_nms.md Co-authored-by: ad-daniel <[email protected]> * Update docs/reference/object-detection-2d-nms-seq2seq_nms.md Co-authored-by: ad-daniel <[email protected]> * Update docs/reference/object-detection-2d-nms-seq2seq_nms.md Co-authored-by: ad-daniel <[email protected]> * Update docs/reference/object-detection-2d-nms-seq2seq_nms.md Co-authored-by: ad-daniel <[email protected]> * Create init * Update and rename init to __init__.py * Delete dataset.py * Update seq2seq_nms_learner.py * Update train_demo.py * Update train_demo.py * Update object_detection_2d_ssd.py * Update object-detection-2d-nms-seq2seq_nms.md * Update inference_demo.py * Update inference_demo.py * Update inference_demo.py * Update eval_demo.py * Update inference_demo.py * Update src/opendr/perception/object_detection_2d/datasets/transforms.py Co-authored-by: ad-daniel <[email protected]> * Update fast_nms.py * Update __init__.py * Update cluster_nms.py * Update soft_nms.py * Update seq2seq_nms_learner.py * Update ssd_learner.py * Update test_seq2seq_nms.py * Update object_detection_2d_ssd.py * Update train_demo.py * Update __init__.py * Update __init__.py * Update cluster_nms.py * Update fast_nms.py * Update soft_nms.py * Update seq2seq_nms_learner.py * Update seq2seq_nms_learner.py * Update __init__.py * Update seq2seq_nms_learner.py * Update __init__.py * Create __init__.py * Update cluster_nms.py * Update fast_nms.py * Update soft_nms.py * Update seq2seq_nms_learner.py * Update test_seq2seq_nms.py * Update ssd_learner.py * Update nms_dataset.py * Delete __init__.py * Update cluster_nms.py * Update cluster_nms.py * Create __init__.py * Update seq2seq_nms_learner.py * Update seq2seq_nms_learner.py * Update __init__.py * Update __init__.py * Update __init__.py * Update seq2seq_nms_learner.py * Update test_seq2seq_nms.py * Update nms_dataset.py * Update cluster_nms.py * Update fast_nms.py * Update fast_nms.py * Update cluster_nms.py * Update nms_utils.py * Update soft_nms.py * Update README.md * Update README.md * Update README.md * Update cluster_nms.py * Update fast_nms.py * Update nms_utils.py * Update train_demo.py * Update seq2seq_nms_learner.py * Update seq2seq_nms_learner.py * Update seq2seq_nms_learner.py * Update seq2seq_model.py * Update fmod.py * Update seq2seq_nms_learner.py * Update train_demo.py * Update train_demo.py * Update eval_demo.py * Update inference_demo.py * Add files via upload * Update README.md * Add files via upload * Update README.md * Update README.md * Update object-detection-2d-nms-seq2seq_nms.md * Update object-detection-2d-nms-seq2seq_nms.md * Update object-detection-2d-nms-seq2seq_nms.md * Update object-detection-2d-nms-seq2seq_nms.md * Update seq2seq_nms_learner.py * Update seq2seq_nms_learner.py * Update nms_dataset.py * Update nms_dataset.py * Update README.md * Update README.md * Update README.md * Update README.md * Update README.md * Update README.md * Update README.md * Update README.md * Update README.md * Update README.md * Update README.md * Update README.md * Update README.md * Update README.md * Update README.md * Update README.md * Update object-detection-2d-nms-seq2seq_nms.md * Update README.md * Update README.md * Update object-detection-2d-nms-seq2seq_nms.md * Update projects/opendr_ws/src/perception/scripts/object_detection_2d_ssd.py Co-authored-by: ad-daniel <[email protected]> * Update projects/perception/object_detection_2d/nms/fast_nms/inference_demo.py Co-authored-by: ad-daniel <[email protected]> * Update projects/perception/object_detection_2d/nms/seq2seq-nms/eval_demo.py Co-authored-by: ad-daniel <[email protected]> * Update projects/perception/object_detection_2d/nms/seq2seq-nms/inference_demo.py Co-authored-by: ad-daniel <[email protected]> * Update projects/perception/object_detection_2d/nms/seq2seq-nms/train_demo.py Co-authored-by: ad-daniel <[email protected]> * Update projects/perception/object_detection_2d/nms/soft_nms/inference_demo.py Co-authored-by: ad-daniel <[email protected]> * Update tests/sources/tools/perception/object_detection_2d/nms/seq2seq_nms/test_seq2seq_nms.py Co-authored-by: ad-daniel <[email protected]> * Update __init__.py * Update tests_suite.yml * Update tests_suite_develop.yml * Update test_packages.yml * Update object-detection-2d-nms-seq2seq_nms.md * Update object-detection-2d-nms-seq2seq_nms.md * Update README.md * Update projects/perception/object_detection_2d/nms/cluster_nms/inference_demo.py Co-authored-by: ad-daniel <[email protected]> * Update seq2seq_nms_learner.py * Update eval_demo.py * Update seq2seq_nms_learner.py * Update object-detection-2d-nms-seq2seq_nms.md * Update object-detection-2d-nms-seq2seq_nms.md * Update eval_demo.py * Update __init__.py * Delete stats_pretrained.png * Update seq2seq_nms_learner.py * Update eval_demo.py * Update inference_demo.py * Update test_seq2seq_nms.py * Update test_seq2seq_nms.py * Update object-detection-2d-nms-seq2seq_nms.md * Delete __init__.py * final changes * Update seq2seq_nms_learner.py * Update index.md * Update index.md * Update CHANGELOG.md * Update object-detection-2d-nms-seq2seq_nms.md * Update object-detection-2d-nms-seq2seq_nms.md * Update object-detection-2d-nms-seq2seq_nms.md * Update object-detection-2d-nms-seq2seq_nms.md Co-authored-by: ad-daniel <[email protected]> * Merge `master`into `develop` (#261) * Synchronize master and develop workflows (#236) * Synchronize master and develop workflows * comment * Added OpenDR citation (#238) * Added OpenDR citation * Update README.md * Fixes bibtex name (#241) Fixes citation name * Fix clang (#250) * Integration of heart anomaly detection self-attention neural bag of features (#246) * added sanbof models * added attention models to ci test Co-authored-by: ad-daniel <[email protected]> * Make `test release` docker target the specific branch when the label is run manually (#252) * Fix * Better approach * Fix * Update CODEOWNERS (#253) * Update face-recognition.md (#257) * skeleton-based HAR demo bug fixed (#260) * infer updated * edge case fix (no pose detected) * pep fixes * Fix sources after cppcheck upgrade * More Co-authored-by: Negar <[email protected]> Co-authored-by: Nikolaos Passalis <[email protected]> Co-authored-by: ad-daniel <[email protected]> * Update seq2seq_nms_learner.py * Update seq2seq_nms_learner.py * add init Co-authored-by: Nikolaos Passalis <[email protected]> Co-authored-by: Kateryna Chumachenko <[email protected]> Co-authored-by: Stefania Pedrazzi <[email protected]> Co-authored-by: Pavlos Tosidis <[email protected]> Co-authored-by: Negar Heidari <[email protected]> Co-authored-by: Negar <[email protected]> Co-authored-by: charsyme <[email protected]> Co-authored-by: charsyme <[email protected]> * Synchronize workflows * Fix workflows * Sync Co-authored-by: Pavlos Tosidis <[email protected]> Co-authored-by: Negar Heidari <[email protected]> Co-authored-by: Negar <[email protected]> Co-authored-by: Nikolaos Passalis <[email protected]> Co-authored-by: Nikolaos <[email protected]> Co-authored-by: vivinousi <[email protected]> Co-authored-by: Jelle <[email protected]> Co-authored-by: Jelle Luijkx <[email protected]> Co-authored-by: Kostas Tsampazis <[email protected]> Co-authored-by: LukasHedegaard <[email protected]> Co-authored-by: halil93ibrahim <[email protected]> Co-authored-by: Illia Oleksiienko <[email protected]> Co-authored-by: Niclas Vödisch <[email protected]> Co-authored-by: pavlos <[email protected]> Co-authored-by: ekakalet <[email protected]> Co-authored-by: Vivi <[email protected]> Co-authored-by: charsyme <[email protected]> Co-authored-by: Daniel Honerkamp <[email protected]> Co-authored-by: Maria Tzelepi <[email protected]> Co-authored-by: Alexandre Angleraud <[email protected]> Co-authored-by: Lukas Hedegaard <[email protected]> Co-authored-by: Niclas <[email protected]> Co-authored-by: thomaspeyrucain <[email protected]> Co-authored-by: Olivier Michel <[email protected]> Co-authored-by: Kateryna Chumachenko <[email protected]> Co-authored-by: Stefania Pedrazzi <[email protected]> Co-authored-by: charsyme <[email protected]> * Update CHANGELOG.md * Update CHANGELOG.md Co-authored-by: Stefania Pedrazzi <[email protected]> * Fix face recognition (#267) * Fix EfficientPS submodule update (#268) * Cleanup GitHub workflows (#266) * Update test_packages.yml Replace deprecated workflow cleanup job * Remove deprecated action * Remove deprecated action * Remove space * Remove space * Remove space * Prepare 1.1.1 (#274) * Fix detectron2 installation and skimage deprecated functions (#287) * Checkout specific detectron commit * Install specific detectron2 commit * Point to specific detectron2 commit * Update installation.md * Update dependencies.ini * Update requirements.txt * Update to support newer skimage version * Fix sources * Disable fail-fast Co-authored-by: ad-daniel <[email protected]> Co-authored-by: ad-daniel <[email protected]> Co-authored-by: ad-daniel <[email protected]> Co-authored-by: Nikolaos Passalis <[email protected]> Co-authored-by: Kateryna Chumachenko <[email protected]> Co-authored-by: Pavlos Tosidis <[email protected]> Co-authored-by: Negar Heidari <[email protected]> Co-authored-by: Negar <[email protected]> Co-authored-by: ad-daniel <[email protected]> Co-authored-by: Nikolaos <[email protected]> Co-authored-by: vivinousi <[email protected]> Co-authored-by: Jelle <[email protected]> Co-authored-by: Jelle Luijkx <[email protected]> Co-authored-by: Kostas Tsampazis <[email protected]> Co-authored-by: LukasHedegaard <[email protected]> Co-authored-by: halil93ibrahim <[email protected]> Co-authored-by: Illia Oleksiienko <[email protected]> Co-authored-by: Niclas Vödisch <[email protected]> Co-authored-by: pavlos <[email protected]> Co-authored-by: ekakalet <[email protected]> Co-authored-by: Vivi <[email protected]> Co-authored-by: charsyme <[email protected]> Co-authored-by: Daniel Honerkamp <[email protected]> Co-authored-by: Maria Tzelepi <[email protected]> Co-authored-by: Alexandre Angleraud <[email protected]> Co-authored-by: Lukas Hedegaard <[email protected]> Co-authored-by: Niclas <[email protected]> Co-authored-by: thomaspeyrucain <[email protected]> Co-authored-by: Olivier Michel <[email protected]> Co-authored-by: charsyme <[email protected]>
1 parent 27a911f commit 3dcab24

File tree

20 files changed

+67
-68
lines changed

20 files changed

+67
-68
lines changed

Diff for: ‎.github/workflows/test_packages.yml

+4-9
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,17 @@ on:
77
schedule:
88
- cron: '0 23 * * *'
99

10+
concurrency:
11+
group: ${{ github.workflow }}-${{ github.ref }}
12+
cancel-in-progress: true
13+
1014
defaults:
1115
run:
1216
shell: bash
1317

1418

1519
jobs:
16-
cleanup-runs:
17-
if: ${{ contains(github.event.pull_request.labels.*.name, 'test packages') || github.event_name == 'schedule' }}
18-
runs-on: ubuntu-latest
19-
steps:
20-
- uses: rokroskar/workflow-run-cleanup-action@master
21-
env:
22-
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
2320
test-wheel:
24-
needs: cleanup-runs
2521
if: ${{ contains(github.event.pull_request.labels.*.name, 'test packages') || github.event_name == 'schedule' }}
2622
strategy:
2723
matrix:
@@ -70,7 +66,6 @@ jobs:
7066
pip install opendr-toolkit
7167
python -m unittest discover -s tests/sources/tools/${{ matrix.package }}
7268
test-docker:
73-
needs: cleanup-runs
7469
if: ${{ contains(github.event.pull_request.labels.*.name, 'test packages') || github.event_name == 'schedule' }}
7570
strategy:
7671
matrix:

Diff for: ‎.github/workflows/tests_suite.yml

+8-11
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,16 @@ on:
66
schedule:
77
- cron: '0 23 * * *'
88

9+
concurrency:
10+
group: ${{ github.workflow }}-${{ github.ref }}
11+
cancel-in-progress: true
12+
913
defaults:
1014
run:
1115
shell: bash
1216

1317
jobs:
14-
cleanup-runs:
15-
if: ${{ contains(github.event.pull_request.labels.*.name, 'test sources') || contains(github.event.pull_request.labels.*.name, 'test tools') || contains(github.event.pull_request.labels.*.name, 'test release') || github.event_name == 'schedule' }}
16-
runs-on: ubuntu-latest
17-
steps:
18-
- uses: rokroskar/workflow-run-cleanup-action@master
19-
env:
20-
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
2118
test-sources:
22-
needs: cleanup-runs
2319
if: ${{ contains(github.event.pull_request.labels.*.name, 'test sources') || github.event_name == 'schedule' }}
2420
strategy:
2521
matrix:
@@ -51,9 +47,9 @@ jobs:
5147
pip install -r tests/requirements.txt
5248
python -m unittest discover -s tests
5349
test-tools:
54-
needs: cleanup-runs
5550
if: ${{ contains(github.event.pull_request.labels.*.name, 'test tools') || github.event_name == 'schedule' }}
5651
strategy:
52+
fail-fast: false
5753
matrix:
5854
os: [ubuntu-20.04]
5955
package:
@@ -115,7 +111,6 @@ jobs:
115111
python -m unittest discover -s tests/sources/tools/${{ matrix.package }}
116112
fi
117113
build-wheel:
118-
needs: cleanup-runs
119114
if: ${{ contains(github.event.pull_request.labels.*.name, 'test release') || github.event_name == 'schedule' }}
120115
runs-on: ubuntu-20.04
121116
steps:
@@ -140,7 +135,6 @@ jobs:
140135
path:
141136
dist/*.tar.gz
142137
build-docker:
143-
needs: cleanup-runs
144138
if: ${{ contains(github.event.pull_request.labels.*.name, 'test release') || github.event_name == 'schedule' }}
145139
runs-on: ubuntu-20.04
146140
steps:
@@ -164,6 +158,7 @@ jobs:
164158
needs: build-wheel
165159
if: ${{ contains(github.event.pull_request.labels.*.name, 'test release') || github.event_name == 'schedule' }}
166160
strategy:
161+
fail-fast: false
167162
matrix:
168163
os: [ubuntu-20.04]
169164
package:
@@ -235,6 +230,7 @@ jobs:
235230
needs: build-wheel
236231
if: ${{ contains(github.event.pull_request.labels.*.name, 'test release') || github.event_name == 'schedule' }}
237232
strategy:
233+
fail-fast: false
238234
matrix:
239235
os: [ubuntu-20.04]
240236
package:
@@ -312,6 +308,7 @@ jobs:
312308
needs: build-docker
313309
if: ${{ contains(github.event.pull_request.labels.*.name, 'test release') || github.event_name == 'schedule' }}
314310
strategy:
311+
fail-fast: false
315312
matrix:
316313
os: [ubuntu-20.04]
317314
package:

Diff for: ‎.github/workflows/tests_suite_develop.yml

+16-20
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,16 @@ on:
66
schedule:
77
- cron: '0 23 * * *'
88

9+
concurrency:
10+
group: ${{ github.workflow }}-${{ github.ref }}
11+
cancel-in-progress: true
12+
913
defaults:
1014
run:
1115
shell: bash
1216

1317
jobs:
14-
cleanup-runs:
15-
if: ${{ contains(github.event.pull_request.labels.*.name, 'test sources') || contains(github.event.pull_request.labels.*.name, 'test tools') || contains(github.event.pull_request.labels.*.name, 'test release') || github.event_name == 'schedule' }}
16-
runs-on: ubuntu-latest
17-
steps:
18-
- uses: rokroskar/workflow-run-cleanup-action@master
19-
env:
20-
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
2118
test-sources:
22-
needs: cleanup-runs
2319
if: ${{ contains(github.event.pull_request.labels.*.name, 'test sources') || github.event_name == 'schedule' }}
2420
strategy:
2521
matrix:
@@ -52,9 +48,9 @@ jobs:
5248
pip install -r tests/requirements.txt
5349
python -m unittest discover -s tests
5450
test-tools:
55-
needs: cleanup-runs
5651
if: ${{ contains(github.event.pull_request.labels.*.name, 'test tools') || github.event_name == 'schedule' }}
5752
strategy:
53+
fail-fast: false
5854
matrix:
5955
os: [ubuntu-20.04]
6056
package:
@@ -117,7 +113,6 @@ jobs:
117113
python -m unittest discover -s tests/sources/tools/${{ matrix.package }}
118114
fi
119115
build-wheel:
120-
needs: cleanup-runs
121116
if: ${{ contains(github.event.pull_request.labels.*.name, 'test release') || github.event_name == 'schedule' }}
122117
runs-on: ubuntu-20.04
123118
steps:
@@ -143,7 +138,6 @@ jobs:
143138
path:
144139
dist/*.tar.gz
145140
build-docker:
146-
needs: cleanup-runs
147141
if: ${{ contains(github.event.pull_request.labels.*.name, 'test release') || github.event_name == 'schedule' }}
148142
runs-on: ubuntu-20.04
149143
steps:
@@ -168,6 +162,7 @@ jobs:
168162
needs: build-wheel
169163
if: ${{ contains(github.event.pull_request.labels.*.name, 'test release') || github.event_name == 'schedule' }}
170164
strategy:
165+
fail-fast: false
171166
matrix:
172167
os: [ubuntu-20.04]
173168
package:
@@ -230,16 +225,17 @@ jobs:
230225
fi
231226
echo "Installing $package package"
232227
if [ "$package" == "opendr" ]; then
233-
pip install ./artifact/artifact/opendr-toolkit-*.tar.gz
228+
pip install ./artifact/wheel-artifact/opendr-toolkit-*.tar.gz
234229
else
235-
pip install ./artifact/artifact/opendr-toolkit-$package-*.tar.gz
230+
pip install ./artifact/wheel-artifact/opendr-toolkit-$package-*.tar.gz
236231
fi
237232
done < packages.txt
238233
python -m unittest discover -s tests/sources/tools/${{ matrix.package }}
239234
test-wheel-separate:
240235
needs: build-wheel
241236
if: ${{ contains(github.event.pull_request.labels.*.name, 'test release') || github.event_name == 'schedule' }}
242237
strategy:
238+
fail-fast: false
243239
matrix:
244240
os: [ubuntu-20.04]
245241
package:
@@ -294,11 +290,11 @@ jobs:
294290
source venv/bin/activate
295291
pip install wheel
296292
# Install engine and requirements for other packages
297-
pip install ./artifact/artifact/opendr-toolkit-engine-*.tar.gz
293+
pip install ./artifact/wheel-artifact/opendr-toolkit-engine-*.tar.gz
298294
# The following two are dependecies for some other packages and pip cannot automatically install them if they are not on a repo
299-
pip install ./artifact/artifact/opendr-toolkit-compressive-learning-*.tar.gz
300-
pip install ./artifact/artifact/opendr-toolkit-object-detection-2d-*.tar.gz
301-
295+
pip install ./artifact/wheel-artifact/opendr-toolkit-compressive-learning-*.tar.gz
296+
pip install ./artifact/wheel-artifact/opendr-toolkit-object-detection-2d-*.tar.gz
297+
pip install ./artifact/wheel-artifact/opendr-toolkit-pose-estimation-*.tar.gz
302298
# Install specific package for testing
303299
package=$(sed "s/_/-/g" <<< ${{ matrix.package }})
304300
arr=(${package//// })
@@ -308,16 +304,16 @@ jobs:
308304
echo "Installing $package package"
309305
# Utils contains hyperparameter tuning
310306
if [ "$package" == "utils" ]; then
311-
pip install ./artifact/artifact/opendr-toolkit-hyperparameter-tuner-*.tar.gz
312-
307+
pip install ./artifact/wheel-artifact/opendr-toolkit-hyperparameter-tuner-*.tar.gz
313308
else
314-
pip install ./artifact/artifact/opendr-toolkit-$package-*.tar.gz
309+
pip install ./artifact/wheel-artifact/opendr-toolkit-$package-*.tar.gz
315310
fi
316311
python -m unittest discover -s tests/sources/tools/${{ matrix.package }}
317312
test-docker:
318313
needs: build-docker
319314
if: ${{ contains(github.event.pull_request.labels.*.name, 'test release') || github.event_name == 'schedule' }}
320315
strategy:
316+
fail-fast: false
321317
matrix:
322318
os: [ubuntu-20.04]
323319
package:

Diff for: ‎CHANGELOG.md

+9-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,14 @@
11
# OpenDR Toolkit Change Log
22

3-
## Version 1.X
4-
Released on XX, XXth, 2022.
3+
## Version 1.1.1
4+
Released on June, 30th, 2022.
5+
6+
- Bug Fixes:
7+
- Fix Efficient Panoptic Segmentation submodule commit ([#268](https://github.com/opendr-eu/opendr/pull/268)).
8+
- Fix Face Recognition compilation error ([#267](https://github.com/opendr-eu/opendr/pull/267)).
9+
10+
## Version 1.1.0
11+
Released on June, 14th, 2022.
512

613
- New Features:
714
- Added end-to-end planning tool ([#223](https://github.com/opendr-eu/opendr/pull/223)).

Diff for: ‎bin/install.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ if [[ "${OPENDR_DEVICE}" == "gpu" ]]; then
5151
echo "[INFO] Replacing torch==1.9.0+cu111 to enable CUDA acceleration."
5252
pip3 install torch==1.9.0+cu111 torchvision==0.10.0+cu111 torchaudio==0.9.0 -f https://download.pytorch.org/whl/torch_stable.html
5353
echo "[INFO] Reinstalling detectronv2."
54-
pip3 install 'git+https://github.com/facebookresearch/detectron2.git'
54+
pip3 install 'git+https://github.com/facebookresearch/detectron2.git@5aeb252b194b93dc2879b4ac34bc51a31b5aee13'
5555
fi
5656

5757
make libopendr

Diff for: ‎docs/reference/installation.md

+4
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,10 @@ pip install mxnet-cu112==1.8.0post0
6464
pip install opendr-toolkit-engine
6565
pip install opendr-toolkit
6666
```
67+
If you encounter any issue installing the latest version of detectron, then you can try installing a previous commit:
68+
```bash
69+
pip install 'git+https://github.com/facebookresearch/detectron2.git@5aeb252b194b93dc2879b4ac34bc51a31b5aee13'
70+
```
6771

6872
## Installing only a *particular* tool using *pip* (CPU/GPU)
6973

Diff for: ‎projects/data_generation/synthetic_multi_view_facial_image_generation/requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ torch>=1.0.0
22
torchvision
33
dominate>=2.3.1
44
dill
5-
scikit-image
5+
scikit-image>0.16.2
66
numpy>=1.15.4
77
scipy>=1.1.0
88
matplotlib>=2.2.2

Diff for: ‎projects/opendr_ws/src/data_generation/package.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0"?>
22
<package format="2">
33
<name>data_generation</name>
4-
<version>1.0.0</version>
4+
<version>1.1.1</version>
55
<description>OpenDR's ROS nodes for data generation package</description>
66
<maintainer email="[email protected]">OpenDR Project Coordinator</maintainer>
77
<license>Apache License v2.0 </license>

Diff for: ‎projects/opendr_ws/src/perception/package.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0"?>
22
<package format="2">
33
<name>perception</name>
4-
<version>1.0.0</version>
4+
<version>1.1.1</version>
55
<description>OpenDR's ROS nodes for perception package</description>
66
<maintainer email="[email protected]">OpenDR Project Coordinator</maintainer>
77
<license>Apache License v2.0 </license>

Diff for: ‎projects/opendr_ws/src/ros_bridge/package.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0"?>
22
<package format="2">
33
<name>ros_bridge</name>
4-
<version>1.0.0</version>
4+
<version>1.1.1</version>
55
<description>OpenDR ros_bridge package. This package provides a way to translate ROS messages into OpenDR data types
66
and vice versa.
77
</description>

Diff for: ‎projects/opendr_ws/src/simulation/package.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0"?>
22
<package format="2">
33
<name>simulation</name>
4-
<version>1.0.0</version>
4+
<version>1.1.1</version>
55
<description>OpenDR's ROS nodes for simulation package</description>
66
<maintainer email="[email protected]">OpenDR Project Coordinator</maintainer>
77
<license>Apache License v2.0 </license>

Diff for: ‎projects/perception/slam/full_map_posterior_gmapping/src/fmp_slam_eval/package.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0"?>
22
<package format="2">
33
<name>fmp_slam_eval</name>
4-
<version>1.0.0</version>
4+
<version>1.1.1</version>
55
<description>FMP SLAM Evaluation Package</description>
66

77
<maintainer email="[email protected]">Jose Arce</maintainer>

Diff for: ‎projects/perception/slam/full_map_posterior_gmapping/src/map_simulator/package.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0"?>
22
<package format="2">
33
<name>map_simulator</name>
4-
<version>1.0.0</version>
4+
<version>1.1.1</version>
55
<description>The 2D Map Simulator package for generating datasets for testing and evaluating SLAM algorithms</description>
66

77
<maintainer email="[email protected]">Jose Arce</maintainer>

Diff for: ‎src/c_api/face_recognition.cpp

+12-12
Original file line numberDiff line numberDiff line change
@@ -289,20 +289,20 @@ void build_database_face_recognition(const char *database_folder, const char *ou
289289
// Write number of persons
290290
int n = person_names.size();
291291

292-
fout.write(static_cast<char *>(&n), sizeof(int));
292+
fout.write(reinterpret_cast<char *>(&n), sizeof(int));
293293
for (int i = 0; i < n; i++) {
294294
// Write the name of the person (along with its size)
295295
int name_length = person_names[i].size() + 1;
296-
fout.write(static_cast<char *>(&name_length), sizeof(int));
296+
fout.write(reinterpret_cast<char *>(&name_length), sizeof(int));
297297
fout.write(person_names[i].c_str(), name_length);
298298
}
299299

300300
cv::Size s = database_out.size();
301301

302-
fout.write(static_cast<char *>(&s.height), sizeof(int));
303-
fout.write(static_cast<char *>(&s.width), sizeof(int));
304-
fout.write(static_cast<char *>(database_out.data), sizeof(float) * s.height * s.width);
305-
fout.write(static_cast<char *>(&database_ids[0]), sizeof(int) * s.height);
302+
fout.write(reinterpret_cast<char *>(&s.height), sizeof(int));
303+
fout.write(reinterpret_cast<char *>(&s.width), sizeof(int));
304+
fout.write(reinterpret_cast<char *>(database_out.data), sizeof(float) * s.height * s.width);
305+
fout.write(reinterpret_cast<char *>(&database_ids[0]), sizeof(int) * s.height);
306306
fout.flush();
307307
fout.close();
308308
}
@@ -318,14 +318,14 @@ void load_database_face_recognition(const char *database_path, face_recognition_
318318
return;
319319
}
320320
int n;
321-
fin.read(static_cast<char *>(&n), sizeof(int));
321+
fin.read(reinterpret_cast<char *>(&n), sizeof(int));
322322
char **person_names = new char *[n];
323323

324324
for (int i = 0; i < n; i++) {
325325
person_names[i] = new char[512];
326326
// Read person name
327327
int name_length;
328-
fin.read(static_cast<char *>(&name_length), sizeof(int));
328+
fin.read(reinterpret_cast<char *>(&name_length), sizeof(int));
329329
if (name_length > 512) {
330330
std::cerr << "Person name exceeds max number of characters (512)" << std::endl;
331331
return;
@@ -334,13 +334,13 @@ void load_database_face_recognition(const char *database_path, face_recognition_
334334
}
335335

336336
int height, width;
337-
fin.read(static_cast<char *>(&height), sizeof(int));
338-
fin.read(static_cast<char *>(&width), sizeof(int));
337+
fin.read(reinterpret_cast<char *>(&height), sizeof(int));
338+
fin.read(reinterpret_cast<char *>(&width), sizeof(int));
339339

340340
float *database_buff = new float[height * width];
341341
int *features_ids = new int[height];
342-
fin.read(static_cast<char *>(database_buff), sizeof(float) * height * width);
343-
fin.read(static_cast<char *>(features_ids), sizeof(int) * height);
342+
fin.read(reinterpret_cast<char *>(database_buff), sizeof(float) * height * width);
343+
fin.read(reinterpret_cast<char *>(features_ids), sizeof(int) * height);
344344

345345
fin.close();
346346

Diff for: ‎src/opendr/_version.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
__version__ = "1.0.0"
15+
__version__ = "1.1.1"

0 commit comments

Comments
 (0)