Skip to content

Commit

Permalink
Merge master into develop branch (#290)
Browse files Browse the repository at this point in the history
* 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 <44834743+ad-daniel@users.noreply.github.com>

* 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 <negar.heidari@eng.au.dk>
Co-authored-by: Nikolaos Passalis <passalis@users.noreply.github.com>
Co-authored-by: ad-daniel <daniel.dias@epfl.ch>

* 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 <daniel.dias@epfl.ch>

* bug fixed (#196)

Co-authored-by: Negar <negar.heidari@eng.au.dk>
Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>

* 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 <passalis@users.noreply.github.com>
Co-authored-by: Nikolaos <passalis@csd.auth.gr>

Co-authored-by: Pavlos Tosidis <35866477+Pavlos-Tosidis@users.noreply.github.com>
Co-authored-by: Negar Heidari <36771997+negarhdr@users.noreply.github.com>
Co-authored-by: Negar <negar.heidari@eng.au.dk>
Co-authored-by: Nikolaos Passalis <passalis@users.noreply.github.com>
Co-authored-by: Nikolaos <passalis@csd.auth.gr>

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

* Added wheel and docker testing to develop

* Pass key by const reference

* Style fix

* Minor fix and cleanup

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

* 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 <passalis@users.noreply.github.com>

* Update benchmarking_demo.py

* Update benchmarking_demo.py

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

* 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 <j.d.luijkx@tudelft.nl>

* 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 <j.d.luijkx@tudelft.nl>
Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>

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

* Bugfixes

* Increase tollerance in test_cox3d_learner

* Test dockerfile with correct branch

* Removed comment

* remove branch from docker files

Co-authored-by: ad-daniel <daniel.dias@epfl.ch>
Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>
Co-authored-by: LukasHedegaard <lh@eng.au.dk>

* chore(eagerx): bump version eagerx to 0.1.10 (#244)

Co-authored-by: Jelle Luijkx <j.d.luijkx@tudelft.nl>

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

* Update .github/workflows/tests_suite_develop.yml

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

* Update docs/reference/end_to_end_planning.md

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

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

* added TEST_DEVICE in tests

* eval/fit return dictionary

Co-authored-by: ad-daniel <44834743+ad-daniel@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: Nikolaos Passalis <passalis@users.noreply.github.com>

* 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 <io@ece.au.dk>
Co-authored-by: Negar <negar.heidari@eng.au.dk>
Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>

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

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

* Update docs/reference/single-demonstration-grasping.md

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

* Delete end-to-end-planning.md

* Update docs/reference/synthetic_facial_image_generator.md

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

* Update docs/reference/synthetic_facial_image_generator.md

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

* Update docs/reference/synthetic_facial_image_generator.md

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

* Update docs/reference/human-model-generation.md

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

* Update docs/reference/human-model-generation.md

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

* Update docs/reference/human-model-generation.md

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

* Update docs/reference/human-model-generation.md

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

* Update docs/reference/activity-recognition.md

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

* Update docs/reference/activity-recognition.md

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

* Apply suggestions from code review

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

* Update docs/reference/activity-recognition.md

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

* Update docs/reference/activity-recognition.md

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

* Update docs/reference/face-detection-2d-retinaface.md

* Update docs/reference/single-demonstration-grasping.md

Co-authored-by: thomaspeyrucain <87322480+thomaspeyrucain@users.noreply.github.com>

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

* Update docs/reference/object-tracking-3d-ab3dmot.md

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

* Update docs/reference/efficient-ps.md

* Update docs/reference/skeleton-based-action-recognition.md

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

* Update docs/reference/skeleton-based-action-recognition.md

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

* Update docs/reference/skeleton-based-action-recognition.md

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

Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>
Co-authored-by: Niclas Vödisch <voedisch@cs.uni-freiburg.de>
Co-authored-by: pavlos <ptosidis@gmail.com>
Co-authored-by: ekakalet <63847549+ekakalet@users.noreply.github.com>
Co-authored-by: Negar <negar.heidari@eng.au.dk>
Co-authored-by: LukasHedegaard <lh@eng.au.dk>
Co-authored-by: Vivi <vivinousi@gmail.com>
Co-authored-by: charsyme <63857415+charsyme@users.noreply.github.com>
Co-authored-by: Daniel Honerkamp <daniel.honerkamp@gmail.com>
Co-authored-by: Maria Tzelepi <mtzelepi@users.noreply.github.com>
Co-authored-by: Illia Oleksiienko <io@ece.au.dk>
Co-authored-by: Jelle Luijkx <j.d.luijkx@tudelft.nl>
Co-authored-by: halil93ibrahim <halil@ece.au.dk>
Co-authored-by: Alexandre Angleraud <alexandre.angleraud@gmail.com>
Co-authored-by: Lukas Hedegaard <lukasxhedegaard@gmail.com>
Co-authored-by: Niclas <49001036+vniclas@users.noreply.github.com>
Co-authored-by: thomaspeyrucain <87322480+thomaspeyrucain@users.noreply.github.com>
Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com>

* 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 <44834743+ad-daniel@users.noreply.github.com>
Co-authored-by: Nikolaos Passalis <passalis@users.noreply.github.com>
Co-authored-by: ad-daniel <daniel.dias@epfl.ch>

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

* 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 <passalis@users.noreply.github.com>
Co-authored-by: Kateryna Chumachenko <katerynaCh@users.noreply.github.com>
Co-authored-by: Stefania Pedrazzi <stefaniapedrazzi@users.noreply.github.com>

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

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

* demo fix

* simplify imports

* pep8 fix

* pep8 fix

* Fix sources

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

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

* Update docs/reference/object-detection-2d-nms-seq2seq_nms.md

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

* Update docs/reference/object-detection-2d-nms-seq2seq_nms.md

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

* Update docs/reference/object-detection-2d-nms-seq2seq_nms.md

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

* Update docs/reference/object-detection-2d-nms-seq2seq_nms.md

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

* Update docs/reference/object-detection-2d-nms-seq2seq_nms.md

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

* Update src/opendr/perception/object_detection_2d/datasets/transforms.py

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

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

* Update docs/reference/object-detection-2d-nms-seq2seq_nms.md

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

* Update docs/reference/object-detection-2d-nms-seq2seq_nms.md

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

* Update docs/reference/object-detection-2d-nms-seq2seq_nms.md

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

* Update docs/reference/object-detection-2d-nms-seq2seq_nms.md

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

* Update docs/reference/object-detection-2d-nms-seq2seq_nms.md

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

* Update docs/reference/object-detection-2d-nms-seq2seq_nms.md

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

* Update docs/reference/object-detection-2d-nms-seq2seq_nms.md

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

* Update docs/reference/object-detection-2d-nms-seq2seq_nms.md

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

* Update docs/reference/object-detection-2d-nms-seq2seq_nms.md

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

* Update docs/reference/object-detection-2d-nms-seq2seq_nms.md

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

* Update docs/reference/object-detection-2d-nms-seq2seq_nms.md

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

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

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

* Update projects/perception/object_detection_2d/nms/fast_nms/inference_demo.py

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

* Update projects/perception/object_detection_2d/nms/seq2seq-nms/eval_demo.py

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

* Update projects/perception/object_detection_2d/nms/seq2seq-nms/inference_demo.py

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

* Update projects/perception/object_detection_2d/nms/seq2seq-nms/train_demo.py

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

* Update projects/perception/object_detection_2d/nms/soft_nms/inference_demo.py

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

* Update tests/sources/tools/perception/object_detection_2d/nms/seq2seq_nms/test_seq2seq_nms.py

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

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

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

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

* 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 <negar.heidari@eng.au.dk>
Co-authored-by: Nikolaos Passalis <passalis@users.noreply.github.com>
Co-authored-by: ad-daniel <daniel.dias@epfl.ch>

* Update seq2seq_nms_learner.py

* Update seq2seq_nms_learner.py

* add init

Co-authored-by: Nikolaos Passalis <passalis@users.noreply.github.com>
Co-authored-by: Kateryna Chumachenko <katerynaCh@users.noreply.github.com>
Co-authored-by: Stefania Pedrazzi <stefaniapedrazzi@users.noreply.github.com>
Co-authored-by: Pavlos Tosidis <35866477+Pavlos-Tosidis@users.noreply.github.com>
Co-authored-by: Negar Heidari <36771997+negarhdr@users.noreply.github.com>
Co-authored-by: Negar <negar.heidari@eng.au.dk>
Co-authored-by: charsyme <63857415+charsyme@users.noreply.github.com>
Co-authored-by: charsyme <charsyme@csd.auth.gr>

* Synchronize workflows

* Fix workflows

* Sync

Co-authored-by: Pavlos Tosidis <35866477+Pavlos-Tosidis@users.noreply.github.com>
Co-authored-by: Negar Heidari <36771997+negarhdr@users.noreply.github.com>
Co-authored-by: Negar <negar.heidari@eng.au.dk>
Co-authored-by: Nikolaos Passalis <passalis@users.noreply.github.com>
Co-authored-by: Nikolaos <passalis@csd.auth.gr>
Co-authored-by: vivinousi <32997432+vivinousi@users.noreply.github.com>
Co-authored-by: Jelle <43064291+jelledouwe@users.noreply.github.com>
Co-authored-by: Jelle Luijkx <j.d.luijkx@tudelft.nl>
Co-authored-by: Kostas Tsampazis <27914645+tsampazk@users.noreply.github.com>
Co-authored-by: LukasHedegaard <lh@eng.au.dk>
Co-authored-by: halil93ibrahim <halil@ece.au.dk>
Co-authored-by: Illia Oleksiienko <io@ece.au.dk>
Co-authored-by: Niclas Vödisch <voedisch@cs.uni-freiburg.de>
Co-authored-by: pavlos <ptosidis@gmail.com>
Co-authored-by: ekakalet <63847549+ekakalet@users.noreply.github.com>
Co-authored-by: Vivi <vivinousi@gmail.com>
Co-authored-by: charsyme <63857415+charsyme@users.noreply.github.com>
Co-authored-by: Daniel Honerkamp <daniel.honerkamp@gmail.com>
Co-authored-by: Maria Tzelepi <mtzelepi@users.noreply.github.com>
Co-authored-by: Alexandre Angleraud <alexandre.angleraud@gmail.com>
Co-authored-by: Lukas Hedegaard <lukasxhedegaard@gmail.com>
Co-authored-by: Niclas <49001036+vniclas@users.noreply.github.com>
Co-authored-by: thomaspeyrucain <87322480+thomaspeyrucain@users.noreply.github.com>
Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com>
Co-authored-by: Kateryna Chumachenko <katerynaCh@users.noreply.github.com>
Co-authored-by: Stefania Pedrazzi <stefaniapedrazzi@users.noreply.github.com>
Co-authored-by: charsyme <charsyme@csd.auth.gr>

* Update CHANGELOG.md

* Update CHANGELOG.md

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

* 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 <daniel.dias@epfl.ch>
Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>

Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>
Co-authored-by: Nikolaos Passalis <passalis@users.noreply.github.com>
Co-authored-by: Kateryna Chumachenko <katerynaCh@users.noreply.github.com>
Co-authored-by: Pavlos Tosidis <35866477+Pavlos-Tosidis@users.noreply.github.com>
Co-authored-by: Negar Heidari <36771997+negarhdr@users.noreply.github.com>
Co-authored-by: Negar <negar.heidari@eng.au.dk>
Co-authored-by: ad-daniel <daniel.dias@epfl.ch>
Co-authored-by: Nikolaos <passalis@csd.auth.gr>
Co-authored-by: vivinousi <32997432+vivinousi@users.noreply.github.com>
Co-authored-by: Jelle <43064291+jelledouwe@users.noreply.github.com>
Co-authored-by: Jelle Luijkx <j.d.luijkx@tudelft.nl>
Co-authored-by: Kostas Tsampazis <27914645+tsampazk@users.noreply.github.com>
Co-authored-by: LukasHedegaard <lh@eng.au.dk>
Co-authored-by: halil93ibrahim <halil@ece.au.dk>
Co-authored-by: Illia Oleksiienko <io@ece.au.dk>
Co-authored-by: Niclas Vödisch <voedisch@cs.uni-freiburg.de>
Co-authored-by: pavlos <ptosidis@gmail.com>
Co-authored-by: ekakalet <63847549+ekakalet@users.noreply.github.com>
Co-authored-by: Vivi <vivinousi@gmail.com>
Co-authored-by: charsyme <63857415+charsyme@users.noreply.github.com>
Co-authored-by: Daniel Honerkamp <daniel.honerkamp@gmail.com>
Co-authored-by: Maria Tzelepi <mtzelepi@users.noreply.github.com>
Co-authored-by: Alexandre Angleraud <alexandre.angleraud@gmail.com>
Co-authored-by: Lukas Hedegaard <lukasxhedegaard@gmail.com>
Co-authored-by: Niclas <49001036+vniclas@users.noreply.github.com>
Co-authored-by: thomaspeyrucain <87322480+thomaspeyrucain@users.noreply.github.com>
Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com>
Co-authored-by: charsyme <charsyme@csd.auth.gr>
  • Loading branch information
1 parent 27a911f commit 3dcab24
Show file tree
Hide file tree
Showing 20 changed files with 67 additions and 68 deletions.
13 changes: 4 additions & 9 deletions .github/workflows/test_packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,17 @@ on:
schedule:
- cron: '0 23 * * *'

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

defaults:
run:
shell: bash


jobs:
cleanup-runs:
if: ${{ contains(github.event.pull_request.labels.*.name, 'test packages') || github.event_name == 'schedule' }}
runs-on: ubuntu-latest
steps:
- uses: rokroskar/workflow-run-cleanup-action@master
env:
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
test-wheel:
needs: cleanup-runs
if: ${{ contains(github.event.pull_request.labels.*.name, 'test packages') || github.event_name == 'schedule' }}
strategy:
matrix:
Expand Down Expand Up @@ -70,7 +66,6 @@ jobs:
pip install opendr-toolkit
python -m unittest discover -s tests/sources/tools/${{ matrix.package }}
test-docker:
needs: cleanup-runs
if: ${{ contains(github.event.pull_request.labels.*.name, 'test packages') || github.event_name == 'schedule' }}
strategy:
matrix:
Expand Down
19 changes: 8 additions & 11 deletions .github/workflows/tests_suite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,16 @@ on:
schedule:
- cron: '0 23 * * *'

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

defaults:
run:
shell: bash

jobs:
cleanup-runs:
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' }}
runs-on: ubuntu-latest
steps:
- uses: rokroskar/workflow-run-cleanup-action@master
env:
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
test-sources:
needs: cleanup-runs
if: ${{ contains(github.event.pull_request.labels.*.name, 'test sources') || github.event_name == 'schedule' }}
strategy:
matrix:
Expand Down Expand Up @@ -51,9 +47,9 @@ jobs:
pip install -r tests/requirements.txt
python -m unittest discover -s tests
test-tools:
needs: cleanup-runs
if: ${{ contains(github.event.pull_request.labels.*.name, 'test tools') || github.event_name == 'schedule' }}
strategy:
fail-fast: false
matrix:
os: [ubuntu-20.04]
package:
Expand Down Expand Up @@ -115,7 +111,6 @@ jobs:
python -m unittest discover -s tests/sources/tools/${{ matrix.package }}
fi
build-wheel:
needs: cleanup-runs
if: ${{ contains(github.event.pull_request.labels.*.name, 'test release') || github.event_name == 'schedule' }}
runs-on: ubuntu-20.04
steps:
Expand All @@ -140,7 +135,6 @@ jobs:
path:
dist/*.tar.gz
build-docker:
needs: cleanup-runs
if: ${{ contains(github.event.pull_request.labels.*.name, 'test release') || github.event_name == 'schedule' }}
runs-on: ubuntu-20.04
steps:
Expand All @@ -164,6 +158,7 @@ jobs:
needs: build-wheel
if: ${{ contains(github.event.pull_request.labels.*.name, 'test release') || github.event_name == 'schedule' }}
strategy:
fail-fast: false
matrix:
os: [ubuntu-20.04]
package:
Expand Down Expand Up @@ -235,6 +230,7 @@ jobs:
needs: build-wheel
if: ${{ contains(github.event.pull_request.labels.*.name, 'test release') || github.event_name == 'schedule' }}
strategy:
fail-fast: false
matrix:
os: [ubuntu-20.04]
package:
Expand Down Expand Up @@ -312,6 +308,7 @@ jobs:
needs: build-docker
if: ${{ contains(github.event.pull_request.labels.*.name, 'test release') || github.event_name == 'schedule' }}
strategy:
fail-fast: false
matrix:
os: [ubuntu-20.04]
package:
Expand Down
36 changes: 16 additions & 20 deletions .github/workflows/tests_suite_develop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,16 @@ on:
schedule:
- cron: '0 23 * * *'

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

defaults:
run:
shell: bash

jobs:
cleanup-runs:
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' }}
runs-on: ubuntu-latest
steps:
- uses: rokroskar/workflow-run-cleanup-action@master
env:
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
test-sources:
needs: cleanup-runs
if: ${{ contains(github.event.pull_request.labels.*.name, 'test sources') || github.event_name == 'schedule' }}
strategy:
matrix:
Expand Down Expand Up @@ -52,9 +48,9 @@ jobs:
pip install -r tests/requirements.txt
python -m unittest discover -s tests
test-tools:
needs: cleanup-runs
if: ${{ contains(github.event.pull_request.labels.*.name, 'test tools') || github.event_name == 'schedule' }}
strategy:
fail-fast: false
matrix:
os: [ubuntu-20.04]
package:
Expand Down Expand Up @@ -117,7 +113,6 @@ jobs:
python -m unittest discover -s tests/sources/tools/${{ matrix.package }}
fi
build-wheel:
needs: cleanup-runs
if: ${{ contains(github.event.pull_request.labels.*.name, 'test release') || github.event_name == 'schedule' }}
runs-on: ubuntu-20.04
steps:
Expand All @@ -143,7 +138,6 @@ jobs:
path:
dist/*.tar.gz
build-docker:
needs: cleanup-runs
if: ${{ contains(github.event.pull_request.labels.*.name, 'test release') || github.event_name == 'schedule' }}
runs-on: ubuntu-20.04
steps:
Expand All @@ -168,6 +162,7 @@ jobs:
needs: build-wheel
if: ${{ contains(github.event.pull_request.labels.*.name, 'test release') || github.event_name == 'schedule' }}
strategy:
fail-fast: false
matrix:
os: [ubuntu-20.04]
package:
Expand Down Expand Up @@ -230,16 +225,17 @@ jobs:
fi
echo "Installing $package package"
if [ "$package" == "opendr" ]; then
pip install ./artifact/artifact/opendr-toolkit-*.tar.gz
pip install ./artifact/wheel-artifact/opendr-toolkit-*.tar.gz
else
pip install ./artifact/artifact/opendr-toolkit-$package-*.tar.gz
pip install ./artifact/wheel-artifact/opendr-toolkit-$package-*.tar.gz
fi
done < packages.txt
python -m unittest discover -s tests/sources/tools/${{ matrix.package }}
test-wheel-separate:
needs: build-wheel
if: ${{ contains(github.event.pull_request.labels.*.name, 'test release') || github.event_name == 'schedule' }}
strategy:
fail-fast: false
matrix:
os: [ubuntu-20.04]
package:
Expand Down Expand Up @@ -294,11 +290,11 @@ jobs:
source venv/bin/activate
pip install wheel
# Install engine and requirements for other packages
pip install ./artifact/artifact/opendr-toolkit-engine-*.tar.gz
pip install ./artifact/wheel-artifact/opendr-toolkit-engine-*.tar.gz
# The following two are dependecies for some other packages and pip cannot automatically install them if they are not on a repo
pip install ./artifact/artifact/opendr-toolkit-compressive-learning-*.tar.gz
pip install ./artifact/artifact/opendr-toolkit-object-detection-2d-*.tar.gz
pip install ./artifact/wheel-artifact/opendr-toolkit-compressive-learning-*.tar.gz
pip install ./artifact/wheel-artifact/opendr-toolkit-object-detection-2d-*.tar.gz
pip install ./artifact/wheel-artifact/opendr-toolkit-pose-estimation-*.tar.gz
# Install specific package for testing
package=$(sed "s/_/-/g" <<< ${{ matrix.package }})
arr=(${package//// })
Expand All @@ -308,16 +304,16 @@ jobs:
echo "Installing $package package"
# Utils contains hyperparameter tuning
if [ "$package" == "utils" ]; then
pip install ./artifact/artifact/opendr-toolkit-hyperparameter-tuner-*.tar.gz
pip install ./artifact/wheel-artifact/opendr-toolkit-hyperparameter-tuner-*.tar.gz
else
pip install ./artifact/artifact/opendr-toolkit-$package-*.tar.gz
pip install ./artifact/wheel-artifact/opendr-toolkit-$package-*.tar.gz
fi
python -m unittest discover -s tests/sources/tools/${{ matrix.package }}
test-docker:
needs: build-docker
if: ${{ contains(github.event.pull_request.labels.*.name, 'test release') || github.event_name == 'schedule' }}
strategy:
fail-fast: false
matrix:
os: [ubuntu-20.04]
package:
Expand Down
11 changes: 9 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,14 @@
# OpenDR Toolkit Change Log

## Version 1.X
Released on XX, XXth, 2022.
## Version 1.1.1
Released on June, 30th, 2022.

- Bug Fixes:
- Fix Efficient Panoptic Segmentation submodule commit ([#268](https://github.com/opendr-eu/opendr/pull/268)).
- Fix Face Recognition compilation error ([#267](https://github.com/opendr-eu/opendr/pull/267)).

## Version 1.1.0
Released on June, 14th, 2022.

- New Features:
- Added end-to-end planning tool ([#223](https://github.com/opendr-eu/opendr/pull/223)).
Expand Down
2 changes: 1 addition & 1 deletion bin/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ if [[ "${OPENDR_DEVICE}" == "gpu" ]]; then
echo "[INFO] Replacing torch==1.9.0+cu111 to enable CUDA acceleration."
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
echo "[INFO] Reinstalling detectronv2."
pip3 install 'git+https://github.com/facebookresearch/detectron2.git'
pip3 install 'git+https://github.com/facebookresearch/detectron2.git@5aeb252b194b93dc2879b4ac34bc51a31b5aee13'
fi

make libopendr
Expand Down
4 changes: 4 additions & 0 deletions docs/reference/installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,10 @@ pip install mxnet-cu112==1.8.0post0
pip install opendr-toolkit-engine
pip install opendr-toolkit
```
If you encounter any issue installing the latest version of detectron, then you can try installing a previous commit:
```bash
pip install 'git+https://github.com/facebookresearch/detectron2.git@5aeb252b194b93dc2879b4ac34bc51a31b5aee13'
```

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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ torch>=1.0.0
torchvision
dominate>=2.3.1
dill
scikit-image
scikit-image>0.16.2
numpy>=1.15.4
scipy>=1.1.0
matplotlib>=2.2.2
Expand Down
2 changes: 1 addition & 1 deletion projects/opendr_ws/src/data_generation/package.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<package format="2">
<name>data_generation</name>
<version>1.0.0</version>
<version>1.1.1</version>
<description>OpenDR's ROS nodes for data generation package</description>
<maintainer email="tefas@csd.auth.gr">OpenDR Project Coordinator</maintainer>
<license>Apache License v2.0 </license>
Expand Down
2 changes: 1 addition & 1 deletion projects/opendr_ws/src/perception/package.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<package format="2">
<name>perception</name>
<version>1.0.0</version>
<version>1.1.1</version>
<description>OpenDR's ROS nodes for perception package</description>
<maintainer email="tefas@csd.auth.gr">OpenDR Project Coordinator</maintainer>
<license>Apache License v2.0 </license>
Expand Down
2 changes: 1 addition & 1 deletion projects/opendr_ws/src/ros_bridge/package.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<package format="2">
<name>ros_bridge</name>
<version>1.0.0</version>
<version>1.1.1</version>
<description>OpenDR ros_bridge package. This package provides a way to translate ROS messages into OpenDR data types
and vice versa.
</description>
Expand Down
2 changes: 1 addition & 1 deletion projects/opendr_ws/src/simulation/package.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<package format="2">
<name>simulation</name>
<version>1.0.0</version>
<version>1.1.1</version>
<description>OpenDR's ROS nodes for simulation package</description>
<maintainer email="tefas@csd.auth.gr">OpenDR Project Coordinator</maintainer>
<license>Apache License v2.0 </license>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<package format="2">
<name>fmp_slam_eval</name>
<version>1.0.0</version>
<version>1.1.1</version>
<description>FMP SLAM Evaluation Package</description>

<maintainer email="jose.arce@students.uni-freiburg.de">Jose Arce</maintainer>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<package format="2">
<name>map_simulator</name>
<version>1.0.0</version>
<version>1.1.1</version>
<description>The 2D Map Simulator package for generating datasets for testing and evaluating SLAM algorithms</description>

<maintainer email="jose.arce@students.uni-freiburg.de">Jose Arce</maintainer>
Expand Down
24 changes: 12 additions & 12 deletions src/c_api/face_recognition.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -289,20 +289,20 @@ void build_database_face_recognition(const char *database_folder, const char *ou
// Write number of persons
int n = person_names.size();

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

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

fout.write(static_cast<char *>(&s.height), sizeof(int));
fout.write(static_cast<char *>(&s.width), sizeof(int));
fout.write(static_cast<char *>(database_out.data), sizeof(float) * s.height * s.width);
fout.write(static_cast<char *>(&database_ids[0]), sizeof(int) * s.height);
fout.write(reinterpret_cast<char *>(&s.height), sizeof(int));
fout.write(reinterpret_cast<char *>(&s.width), sizeof(int));
fout.write(reinterpret_cast<char *>(database_out.data), sizeof(float) * s.height * s.width);
fout.write(reinterpret_cast<char *>(&database_ids[0]), sizeof(int) * s.height);
fout.flush();
fout.close();
}
Expand All @@ -318,14 +318,14 @@ void load_database_face_recognition(const char *database_path, face_recognition_
return;
}
int n;
fin.read(static_cast<char *>(&n), sizeof(int));
fin.read(reinterpret_cast<char *>(&n), sizeof(int));
char **person_names = new char *[n];

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

int height, width;
fin.read(static_cast<char *>(&height), sizeof(int));
fin.read(static_cast<char *>(&width), sizeof(int));
fin.read(reinterpret_cast<char *>(&height), sizeof(int));
fin.read(reinterpret_cast<char *>(&width), sizeof(int));

float *database_buff = new float[height * width];
int *features_ids = new int[height];
fin.read(static_cast<char *>(database_buff), sizeof(float) * height * width);
fin.read(static_cast<char *>(features_ids), sizeof(int) * height);
fin.read(reinterpret_cast<char *>(database_buff), sizeof(float) * height * width);
fin.read(reinterpret_cast<char *>(features_ids), sizeof(int) * height);

fin.close();

Expand Down
2 changes: 1 addition & 1 deletion src/opendr/_version.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

__version__ = "1.0.0"
__version__ = "1.1.1"
Loading

0 comments on commit 3dcab24

Please sign in to comment.