Skip to content

Merge develop into master #262

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 30 commits into from
Jun 13, 2022
Merged

Merge develop into master #262

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
ddfa801
Merge `master` into `develop` (#203)
ad-daniel Jan 25, 2022
9906541
Conflict resolution
passalis Feb 3, 2022
a5c65a9
Merge branch 'master' into merge-master-into-develop
passalis Feb 4, 2022
a3c31c0
Merge pull request #213 from opendr-eu/merge-master-into-develop
passalis Feb 4, 2022
2280fd3
Modular python packages (#201)
passalis Feb 11, 2022
c5615ee
Face Recognition ROS and bug fixes (#219)
Pavlos-Tosidis Feb 11, 2022
822dbc7
XML dataset addition + mxnet-cu102 fix (#224)
vivinousi Feb 19, 2022
fe91adf
Gem Mobilenet-v2 pretrained backbone (#226)
jelledouwe Feb 21, 2022
d42dcc5
Notebooks for mxnet detectors (#230)
vivinousi Feb 24, 2022
092e2da
Merge branch 'master' into merge-master-into-develop
ad-daniel Mar 3, 2022
6113fa2
Merge pull request #235 from opendr-eu/merge-master-into-develop
ad-daniel Mar 3, 2022
47ad668
EAGERx as dependency instead of submodule. (#228)
jelledouwe Mar 8, 2022
280db6c
Lightweight openpose fixes (#242)
tsampazk Mar 11, 2022
3a08d24
Upgrade to CUDA 11.2 and improve GPU support (#215)
passalis Mar 22, 2022
a7bd1d1
chore(eagerx): bump version eagerx to 0.1.10 (#244)
jelledouwe Mar 29, 2022
5490b71
End to end planning (#223)
halil93ibrahim Mar 30, 2022
82a26ba
Benchmark au (#231)
LukasHedegaard Apr 5, 2022
4a85d8c
Clang Fixes (#249)
passalis Apr 25, 2022
3d82381
Documentation for performance evaluation (#239)
passalis Apr 27, 2022
00a9fb4
Fall detection (#237)
tsampazk Apr 27, 2022
5f6778b
Merge `master` into `develop` (#254)
ad-daniel May 2, 2022
e8bb8d3
Added webcam demo for Face Recognition (#247)
Pavlos-Tosidis May 2, 2022
1d03c9f
Added audiovisual emotion learner (develop) (#251)
katerynaCh May 9, 2022
4a18cff
Fix nvidia docker key (#255)
ad-daniel May 9, 2022
f3caf87
Nms module (#232)
charsyme May 16, 2022
d3beb3b
Merge `master`into `develop` (#261)
ad-daniel Jun 9, 2022
7fd53d1
Merge develop into master
ad-daniel Jun 9, 2022
b74ffc6
Synchronize workflows
ad-daniel Jun 9, 2022
c33ea33
Fix workflows
ad-daniel Jun 10, 2022
6feace0
Sync
ad-daniel Jun 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions .github/workflows/test_packages.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,13 @@ jobs:
- perception/speech_recognition
- perception/skeleton_based_action_recognition
- perception/semantic_segmentation
- perception/object_detection_2d
- perception/object_detection_2d/centernet
- perception/object_detection_2d/detr
- perception/object_detection_2d/gem
- perception/object_detection_2d/ssd
- perception/object_detection_2d/yolov3
- perception/object_detection_2d/retinaface
- perception/object_detection_2d/nms
- perception/facial_expression_recognition
# - perception/object_detection_3d
# - control/mobile_manipulation
Expand Down Expand Up @@ -82,7 +88,13 @@ jobs:
- perception/speech_recognition
- perception/skeleton_based_action_recognition
- perception/semantic_segmentation
- perception/object_detection_2d
- perception/object_detection_2d/centernet
- perception/object_detection_2d/detr
- perception/object_detection_2d/gem
- perception/object_detection_2d/ssd
- perception/object_detection_2d/yolov3
- perception/object_detection_2d/retinaface
- perception/object_detection_2d/nms
- perception/facial_expression_recognition
- perception/object_detection_3d
- control/mobile_manipulation
Expand Down
126 changes: 119 additions & 7 deletions .github/workflows/tests_suite.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,14 +67,22 @@ jobs:
- perception/object_tracking_2d
- perception/object_detection_3d
- perception/pose_estimation
- perception/fall_detection
- perception/speech_recognition
- perception/skeleton_based_action_recognition
- perception/semantic_segmentation
- control/mobile_manipulation
- perception/object_detection_2d
- perception/object_detection_2d/centernet
- perception/object_detection_2d/detr
- perception/object_detection_2d/gem
- perception/object_detection_2d/ssd
- perception/object_detection_2d/yolov3
- perception/object_detection_2d/retinaface
- perception/object_detection_2d/nms
- simulation/human_model_generation
- perception/facial_expression_recognition
- control/single_demo_grasp
- planning/end_to_end_planning
# - perception/object_tracking_3d
include:
- os: ubuntu-20.04
Expand Down Expand Up @@ -168,10 +176,17 @@ jobs:
- perception/multimodal_human_centric
- perception/object_tracking_2d
- perception/pose_estimation
- perception/fall_detection
- perception/speech_recognition
- perception/skeleton_based_action_recognition
- perception/semantic_segmentation
- perception/object_detection_2d
- perception/object_detection_2d/centernet
- perception/object_detection_2d/detr
- perception/object_detection_2d/gem
- perception/object_detection_2d/ssd
- perception/object_detection_2d/yolov3
- perception/object_detection_2d/retinaface
- perception/object_detection_2d/nms
- perception/facial_expression_recognition
# - perception/object_detection_3d
# - control/mobile_manipulation
Expand Down Expand Up @@ -200,9 +215,98 @@ jobs:
sudo apt -y install python3.8-venv libfreetype6-dev git build-essential cmake python3-dev wget libopenblas-dev libsndfile1 libboost-dev python3-dev
python3 -m venv venv
source venv/bin/activate
wget https://raw.githubusercontent.com/opendr-eu/opendr/${{ steps.branch-name.outputs.current_branch }}/dependencies/pip_requirements.txt
cat pip_requirements.txt | xargs -n 1 -L 1 pip install
pip install ./artifact/wheel-artifact/*.tar.gz
pip install wheel
while read f; do
package=$(sed "s/_/-/g" <<< $f)
arr=(${package//// })
# Get the tool name (if there is a base path before)
if [ ! -z ${arr[1]} ]; then
package=${arr[1]}
fi
echo "Installing $package package"
if [ "$package" == "opendr" ]; then
pip install ./artifact/wheel-artifact/opendr-toolkit-*.tar.gz
else
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:
matrix:
os: [ubuntu-20.04]
package:
- engine
- utils
- perception/activity_recognition
- perception/compressive_learning
- perception/face_recognition
- perception/heart_anomaly_detection
- perception/multimodal_human_centric
- perception/object_tracking_2d
- perception/pose_estimation
- perception/fall_detection
- perception/speech_recognition
- perception/skeleton_based_action_recognition
- perception/semantic_segmentation
- perception/object_detection_2d/centernet
- perception/object_detection_2d/detr
- perception/object_detection_2d/gem
- perception/object_detection_2d/ssd
- perception/object_detection_2d/yolov3
- perception/object_detection_2d/retinaface
- perception/object_detection_2d/nms
- perception/facial_expression_recognition
# - perception/object_detection_3d
# - control/mobile_manipulation
# - simulation/human_model_generation
# - control/single_demo_grasp
# - perception/object_tracking_3d
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
with:
submodules: true
- name: Set up Python 3.8
uses: actions/setup-python@v2
with:
python-version: 3.8
- name: Download artifact
uses: actions/download-artifact@v2
with:
path: artifact
- name: Get branch name
id: branch-name
uses: tj-actions/[email protected]
- name: Test Wheel
run: |
export DISABLE_BCOLZ_AVX2=true
sudo apt -y install python3.8-venv libfreetype6-dev git build-essential cmake python3-dev wget libopenblas-dev libsndfile1 libboost-dev libeigen3-dev
python3 -m venv venv
source venv/bin/activate
pip install wheel
# Install engine and requirements for other packages
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/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//// })
if [ ! -z ${arr[1]} ]; then
package=${arr[1]}
fi
echo "Installing $package package"
# Utils contains hyperparameter tuning
if [ "$package" == "utils" ]; then
pip install ./artifact/wheel-artifact/opendr-toolkit-hyperparameter-tuner-*.tar.gz
else
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
Expand All @@ -220,15 +324,23 @@ jobs:
- perception/multimodal_human_centric
- perception/object_tracking_2d
- perception/pose_estimation
- perception/fall_detection
- perception/speech_recognition
- perception/skeleton_based_action_recognition
- perception/semantic_segmentation
- perception/object_detection_2d
- perception/object_detection_2d/centernet
- perception/object_detection_2d/detr
- perception/object_detection_2d/gem
- perception/object_detection_2d/ssd
- perception/object_detection_2d/yolov3
- perception/object_detection_2d/retinaface
- perception/object_detection_2d/nms
- perception/facial_expression_recognition
- perception/object_detection_3d
- control/mobile_manipulation
- simulation/human_model_generation
- control/single_demo_grasp
- planning/end_to_end_planning
# - perception/object_tracking_3d
runs-on: ubuntu-20.04
steps:
Expand All @@ -255,7 +367,7 @@ jobs:
with:
name: docker-artifact
delete-wheel-artifacts:
needs: [build-wheel, test-wheel]
needs: [build-wheel, test-wheel, test-wheel-separate]
if: ${{ always() }}
strategy:
matrix:
Expand Down
130 changes: 121 additions & 9 deletions .github/workflows/tests_suite_develop.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,14 +68,22 @@ jobs:
- perception/object_tracking_2d
- perception/object_detection_3d
- perception/pose_estimation
- perception/fall_detection
- perception/speech_recognition
- perception/skeleton_based_action_recognition
- perception/semantic_segmentation
- control/mobile_manipulation
- perception/object_detection_2d
- perception/object_detection_2d/centernet
- perception/object_detection_2d/detr
- perception/object_detection_2d/gem
- perception/object_detection_2d/ssd
- perception/object_detection_2d/yolov3
- perception/object_detection_2d/retinaface
- perception/object_detection_2d/nms
- simulation/human_model_generation
- perception/facial_expression_recognition
- control/single_demo_grasp
- planning/end_to_end_planning
# - perception/object_tracking_3d
include:
- os: ubuntu-20.04
Expand Down Expand Up @@ -172,10 +180,17 @@ jobs:
- perception/multimodal_human_centric
- perception/object_tracking_2d
- perception/pose_estimation
- perception/fall_detection
- perception/speech_recognition
- perception/skeleton_based_action_recognition
- perception/semantic_segmentation
- perception/object_detection_2d
- perception/object_detection_2d/centernet
- perception/object_detection_2d/detr
- perception/object_detection_2d/gem
- perception/object_detection_2d/ssd
- perception/object_detection_2d/yolov3
- perception/object_detection_2d/retinaface
- perception/object_detection_2d/nms
- perception/facial_expression_recognition
# - perception/object_detection_3d
# - control/mobile_manipulation
Expand All @@ -202,12 +217,101 @@ jobs:
- name: Test Wheel
run: |
export DISABLE_BCOLZ_AVX2=true
sudo apt -y install python3.8-venv libfreetype6-dev git build-essential cmake python3-dev wget libopenblas-dev libsndfile1 libboost-dev python3-dev
sudo apt -y install python3.8-venv libfreetype6-dev git build-essential cmake python3-dev wget libopenblas-dev libsndfile1 libboost-dev libeigen3-dev
python3 -m venv venv
source venv/bin/activate
wget https://raw.githubusercontent.com/opendr-eu/opendr/${{ steps.branch-name.outputs.current_branch }}/dependencies/pip_requirements.txt
cat pip_requirements.txt | xargs -n 1 -L 1 pip install
pip install ./artifact/wheel-artifact/*.tar.gz
pip install wheel
while read f; do
package=$(sed "s/_/-/g" <<< $f)
arr=(${package//// })
# Get the tool name (if there is a base path before)
if [ ! -z ${arr[1]} ]; then
package=${arr[1]}
fi
echo "Installing $package package"
if [ "$package" == "opendr" ]; then
pip install ./artifact/wheel-artifact/opendr-toolkit-*.tar.gz
else
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:
matrix:
os: [ubuntu-20.04]
package:
- engine
- utils
- perception/activity_recognition
- perception/compressive_learning
- perception/face_recognition
- perception/heart_anomaly_detection
- perception/multimodal_human_centric
- perception/object_tracking_2d
- perception/pose_estimation
- perception/fall_detection
- perception/speech_recognition
- perception/skeleton_based_action_recognition
- perception/semantic_segmentation
- perception/object_detection_2d/centernet
- perception/object_detection_2d/detr
- perception/object_detection_2d/gem
- perception/object_detection_2d/ssd
- perception/object_detection_2d/yolov3
- perception/object_detection_2d/retinaface
- perception/object_detection_2d/nms
- perception/facial_expression_recognition
# - perception/object_detection_3d
# - control/mobile_manipulation
# - simulation/human_model_generation
# - control/single_demo_grasp
# - perception/object_tracking_3d
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
with:
submodules: true
ref: develop
- name: Set up Python 3.8
uses: actions/setup-python@v2
with:
python-version: 3.8
- name: Download artifact
uses: actions/download-artifact@v2
with:
path: artifact
- name: Get branch name
id: branch-name
uses: tj-actions/[email protected]
- name: Test Wheel
run: |
export DISABLE_BCOLZ_AVX2=true
sudo apt -y install python3.8-venv libfreetype6-dev git build-essential cmake python3-dev wget libopenblas-dev libsndfile1 libboost-dev libeigen3-dev
python3 -m venv venv
source venv/bin/activate
pip install wheel
# Install engine and requirements for other packages
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/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//// })
if [ ! -z ${arr[1]} ]; then
package=${arr[1]}
fi
echo "Installing $package package"
# Utils contains hyperparameter tuning
if [ "$package" == "utils" ]; then
pip install ./artifact/wheel-artifact/opendr-toolkit-hyperparameter-tuner-*.tar.gz
else
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
Expand All @@ -225,15 +329,23 @@ jobs:
- perception/multimodal_human_centric
- perception/object_tracking_2d
- perception/pose_estimation
- perception/fall_detection
- perception/speech_recognition
- perception/skeleton_based_action_recognition
- perception/semantic_segmentation
- perception/object_detection_2d
- perception/object_detection_2d/centernet
- perception/object_detection_2d/detr
- perception/object_detection_2d/gem
- perception/object_detection_2d/ssd
- perception/object_detection_2d/yolov3
- perception/object_detection_2d/retinaface
- perception/object_detection_2d/nms
- perception/facial_expression_recognition
- perception/object_detection_3d
- control/mobile_manipulation
- simulation/human_model_generation
- control/single_demo_grasp
- planning/end_to_end_planning
# - perception/object_tracking_3d
runs-on: ubuntu-20.04
steps:
Expand All @@ -260,7 +372,7 @@ jobs:
with:
name: docker-artifact
delete-wheel-artifacts:
needs: [build-wheel, test-wheel]
needs: [build-wheel, test-wheel, test-wheel-separate]
if: ${{ always() }}
strategy:
matrix:
Expand All @@ -270,4 +382,4 @@ jobs:
- name: Delete wheel artifacts
uses: geekyeggo/delete-artifact@v1
with:
name: wheel-artifact
name: wheel-artifact
Loading