Skip to content

Commit d7df097

Browse files
authored
Merge pull request opendr-eu#389 from opendr-eu/merge-develop-into-master
Merge `develop` into `master`
2 parents 758be7e + d1d56ef commit d7df097

File tree

1,224 files changed

+79788
-6959
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,224 files changed

+79788
-6959
lines changed

.github/workflows/test_packages.yml

+40-23
Original file line numberDiff line numberDiff line change
@@ -30,41 +30,50 @@ jobs:
3030
- perception/face_recognition
3131
- perception/heart_anomaly_detection
3232
- perception/multimodal_human_centric
33-
- perception/object_tracking_2d
3433
- perception/pose_estimation
34+
- perception/fall_detection
3535
- perception/speech_recognition
36-
- perception/skeleton_based_action_recognition
36+
- perception/skeleton_based_action_recognition/costgcn
37+
- perception/skeleton_based_action_recognition/pstgcn
38+
- perception/skeleton_based_action_recognition/stbln
39+
- perception/skeleton_based_action_recognition/stgcn
40+
- perception/skeleton_based_action_recognition/tagcn
3741
- perception/semantic_segmentation
42+
- perception/object_tracking_2d
43+
# - perception/object_tracking_3d # passes, but disabled due to free() crash
3844
- perception/object_detection_2d/centernet
3945
- perception/object_detection_2d/detr
4046
- perception/object_detection_2d/gem
4147
- perception/object_detection_2d/ssd
48+
- perception/object_detection_2d/nanodet
4249
- perception/object_detection_2d/yolov3
50+
- perception/object_detection_2d/yolov5
4351
- perception/object_detection_2d/retinaface
4452
- perception/object_detection_2d/nms
53+
# - perception/object_detection_3d # passes, but disabled due to free() crash
4554
- perception/facial_expression_recognition
46-
- perception/object_detection_3d
47-
# - control/mobile_manipulation
48-
# - simulation/human_model_generation
49-
# - control/single_demo_grasp
50-
- perception/object_tracking_3d
55+
- simulation/human_model_generation
56+
#- control/mobile_manipulation
57+
#- control/single_demo_grasp
58+
#- planning/end_to_end_planning
5159
runs-on: ${{ matrix.os }}
5260
steps:
53-
- uses: actions/checkout@v2
61+
- uses: actions/checkout@v3
5462
- name: Set up Python 3.8
55-
uses: actions/setup-python@v2
63+
uses: actions/setup-python@v4
5664
with:
5765
python-version: 3.8
58-
- name: Test Wheel
66+
- name: Test Wheel Separately
5967
run: |
6068
export DISABLE_BCOLZ_AVX2=true
61-
sudo apt -y install python3.8-venv libfreetype6-dev git build-essential cmake python3-dev wget libopenblas-dev libsndfile1 libboost-dev python3-dev
69+
sudo apt -y install python3.8-venv libfreetype6-dev git build-essential cmake python3-dev wget libopenblas-dev libsndfile1 libboost-dev libeigen3-dev
6270
python3 -m venv venv
6371
source venv/bin/activate
64-
wget https://raw.githubusercontent.com/opendr-eu/opendr/master/dependencies/pip_requirements.txt
65-
cat pip_requirements.txt | xargs -n 1 -L 1 pip install
66-
pip install opendr-toolkit
67-
python -m unittest discover -s tests/sources/tools/${{ matrix.package }}
72+
python3 -m pip install --upgrade pip
73+
python3 -m pip install wheel
74+
python3 -m pip install opendr-toolkit
75+
# run the test
76+
python3 -m unittest discover -s tests/sources/tools/${{ matrix.package }}
6877
test-docker:
6978
if: ${{ contains(github.event.pull_request.labels.*.name, 'test packages') || github.event_name == 'schedule' }}
7079
strategy:
@@ -78,32 +87,40 @@ jobs:
7887
- perception/face_recognition
7988
- perception/heart_anomaly_detection
8089
- perception/multimodal_human_centric
81-
- perception/object_tracking_2d
8290
- perception/pose_estimation
91+
- perception/fall_detection
8392
- perception/speech_recognition
84-
- perception/skeleton_based_action_recognition
93+
- perception/skeleton_based_action_recognition/costgcn
94+
- perception/skeleton_based_action_recognition/pstgcn
95+
- perception/skeleton_based_action_recognition/stbln
96+
- perception/skeleton_based_action_recognition/stgcn
97+
- perception/skeleton_based_action_recognition/tagcn
8598
- perception/semantic_segmentation
99+
- perception/object_tracking_2d
100+
# - perception/object_tracking_3d # passes, but disabled due to free() crash
86101
- perception/object_detection_2d/centernet
87102
- perception/object_detection_2d/detr
88103
- perception/object_detection_2d/gem
89104
- perception/object_detection_2d/ssd
105+
- perception/object_detection_2d/nanodet
90106
- perception/object_detection_2d/yolov3
107+
- perception/object_detection_2d/yolov5
91108
- perception/object_detection_2d/retinaface
92109
- perception/object_detection_2d/nms
110+
# - perception/object_detection_3d # passes, but disabled due to free() crash
93111
- perception/facial_expression_recognition
94-
- perception/object_detection_3d
95-
- control/mobile_manipulation
96112
- simulation/human_model_generation
113+
- control/mobile_manipulation
97114
- control/single_demo_grasp
98-
- perception/object_tracking_3d
115+
- planning/end_to_end_planning
99116
runs-on: ${{ matrix.os }}
100117
steps:
101118
- name: Set up Python 3.8
102-
uses: actions/setup-python@v2
119+
uses: actions/setup-python@v4
103120
with:
104121
python-version: 3.8
105122
- name: Test Docker
106123
run: |
107-
docker run --name toolkit -i opendr/opendr-toolkit:cpu_v1.1.1 bash
124+
docker run --name toolkit -i opendr/opendr-toolkit:cpu_v2.0.0 bash
108125
docker start toolkit
109-
docker exec -i toolkit bash -c "source bin/activate.sh && source tests/sources/tools/control/mobile_manipulation/run_ros.sh && python -m unittest discover -s tests/sources/tools/${{ matrix.package }}"
126+
docker exec -i toolkit bash -c "source bin/activate.sh && source tests/sources/tools/control/mobile_manipulation/run_ros.sh && python3 -m unittest discover -s tests/sources/tools/${{ matrix.package }}"

0 commit comments

Comments
 (0)