From cb6bff42553bcb47745396271b4da4fd92455104 Mon Sep 17 00:00:00 2001 From: Nikolaos Passalis Date: Tue, 14 Nov 2023 11:53:34 +0200 Subject: [PATCH 01/36] Added new features and enhancements --- CHANGELOG.md | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 142b0f5091..929bd39ddd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,32 @@ # OpenDR Toolkit Change Log +## Version 3.0.0 +Released on Dec, XXX, 2023. +- New Features: + - Binary High Resolution Learner ([#402](https://github.com/opendr-eu/opendr/pull/402)) + - ROS2 node for EfficientLPS ([#404](https://github.com/opendr-eu/opendr/pull/404)) + - Fall and wave detection ROS nodes ([#423](https://github.com/opendr-eu/opendr/pull/423)) + - Continual SLAM: Adds a new SLAM tool for Continual SLAM ([#424](https://github.com/opendr-eu/opendr/pull/424)) + - Add RGB gesture recognition ([#436](https://github.com/opendr-eu/opendr/pull/436)) + - FSeq2-NMS ([#442](https://github.com/opendr-eu/opendr/pull/442)) + - Intent recognition tool ([#443](https://github.com/opendr-eu/opendr/pull/443)) + - Robotti human detection simulation demo ([#451](https://github.com/opendr-eu/opendr/pull/451)) + - Object Detection 2D Class Filtering ([#467](https://github.com/opendr-eu/opendr/pull/467)) + - RL-based Learner for Active Face Recognition ([#473](https://github.com/opendr-eu/opendr/pull/473)) + - YOLOv5s Inference Demo with Optimized Weights for Agricultural Use ([#476]([#](https://github.com/opendr-eu/opendr/pull/)476)) + - Adaptive HR Pose Estimation ([#479](https://github.com/opendr-eu/opendr/pull/479)) +- Enhancements: + - Wave detection demo based on pose estimation ([#394](https://github.com/opendr-eu/opendr/pull/394)) + - Facial expression recognition demo update ([#405](https://github.com/opendr-eu/opendr/pull/405)) + - Object detection 2d camera demos ([#408](https://github.com/opendr-eu/opendr/pull/408)) + - High Resolution Pose Estimation webcam demo ([#409](https://github.com/opendr-eu/opendr/pull/409)) + - ROS nodes FPS performance measurements ([#419](https://github.com/opendr-eu/opendr/pull/419)) + - Refactoring: pythonic joins in `test_clang_format.py`/`test_cppcheck.py` ([#455](https://github.com/opendr-eu/opendr/pull/455)) + - Test-tools improvement ([#456](https://github.com/opendr-eu/opendr/pull/456)) + - Adding prompt when transcribe with Whisper ([#462](https://github.com/opendr-eu/opendr/pull/462)) + +- Bug Fixes: + ## Version 2.2.0 Released on July, 3rd, 2023. From 3cd912da68a99f40d0a5540be92486941aa4988c Mon Sep 17 00:00:00 2001 From: Nikolaos Passalis Date: Tue, 14 Nov 2023 12:00:34 +0200 Subject: [PATCH 02/36] Added bugfixes --- CHANGELOG.md | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 929bd39ddd..b5a4d3f026 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,6 +26,25 @@ Released on Dec, XXX, 2023. - Adding prompt when transcribe with Whisper ([#462](https://github.com/opendr-eu/opendr/pull/462)) - Bug Fixes: + - Fix package creator and sources ([#390](https://github.com/opendr-eu/opendr/pull/390)) + - Lightweight OpenPose tool fixes and improvements ([#392](https://github.com/opendr-eu/opendr/pull/392)) + - Fall Detection - alternative infer input ([#397](https://github.com/opendr-eu/opendr/pull/397)) + - Yolov5 training bugfix ([#401](https://github.com/opendr-eu/opendr/pull/401)) + - Fix the dependency conflict of geffnet installation ([#410](https://github.com/opendr-eu/opendr/pull/410)) + - Fix bug in GEM ROS2 node ([#420](https://github.com/opendr-eu/opendr/pull/420)) + - Fix link to nanodet documentation ([#421](https://github.com/opendr-eu/opendr/pull/421)) + - EfficientLPS panoptic segmentation coloring bug ([#426](https://github.com/opendr-eu/opendr/pull/426)) + - Bump flask from 1.1.2 to 2.3.2 ([#430](https://github.com/opendr-eu/opendr/pull/430)) + - Fix tests on master branch ([#438](https://github.com/opendr-eu/opendr/pull/438)) + - Added unzip installation as base ubuntu dependency and tool tests fixes ([#454](https://github.com/opendr-eu/opendr/pull/454)) + - Active face recognition demo and bug fixes on Face Recognition ([#459](https://github.com/opendr-eu/opendr/pull/459)) + - GPU installation fix ([#463](https://github.com/opendr-eu/opendr/pull/463)) + - Fix ROS1 nodes argparse issue with .launch files ([#465](https://github.com/opendr-eu/opendr/pull/465)) + - Minor fix on yolov5 webcam demo ([#466](https://github.com/opendr-eu/opendr/pull/466)) + - Apply cuDNN init fix to all Object Detectors 2D ([#469](https://github.com/opendr-eu/opendr/pull/469)) + - Updated test_suite_develop.yml based on latest test_suite.yml ([#471](https://github.com/opendr-eu/opendr/pull/471)) + - Fix fmpgmapping ([#472](https://github.com/opendr-eu/opendr/pull/472)) + - Synchronization and bugfixes ([#478](https://github.com/opendr-eu/opendr/pull/478)) ## Version 2.2.0 Released on July, 3rd, 2023. From 753be4509b31b5f0216876e7fc0a929abbff26e8 Mon Sep 17 00:00:00 2001 From: Nikolaos Passalis Date: Thu, 16 Nov 2023 15:27:39 +0200 Subject: [PATCH 03/36] Added apt update --- .github/workflows/tests_suite_develop.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/tests_suite_develop.yml b/.github/workflows/tests_suite_develop.yml index 2ee060316a..673553a3f3 100644 --- a/.github/workflows/tests_suite_develop.yml +++ b/.github/workflows/tests_suite_develop.yml @@ -368,6 +368,7 @@ jobs: export PYTHONPATH=$OPENDR_HOME/src:$PYTHONPATH export ROS_DISTRO=noetic + sudo apt-get update 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 @@ -463,6 +464,7 @@ jobs: export PYTHONPATH=$OPENDR_HOME/src:$PYTHONPATH export ROS_DISTRO=noetic + sudo apt-get update 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 From 442191647f5ddaa6eda9679a32ceac6e01d505a5 Mon Sep 17 00:00:00 2001 From: Nikolaos Passalis Date: Thu, 16 Nov 2023 15:28:10 +0200 Subject: [PATCH 04/36] Added apt update --- .github/workflows/tests_suite.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/tests_suite.yml b/.github/workflows/tests_suite.yml index f7a24198c7..1eed64c88a 100644 --- a/.github/workflows/tests_suite.yml +++ b/.github/workflows/tests_suite.yml @@ -362,6 +362,7 @@ jobs: export PYTHONPATH=$OPENDR_HOME/src:$PYTHONPATH export ROS_DISTRO=noetic + sudo apt-get update 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 @@ -454,6 +455,7 @@ jobs: export OPENDR_DEVICE=cpu export ROS_DISTRO=noetic + sudo apt-get update 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 From 99e6d574884bbd95b1e17bef71b7cf5f7a047d9c Mon Sep 17 00:00:00 2001 From: Nikolaos Passalis Date: Thu, 16 Nov 2023 15:37:50 +0200 Subject: [PATCH 05/36] Bump jlumbroso/free-disk-space --- .github/workflows/tests_suite.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests_suite.yml b/.github/workflows/tests_suite.yml index 1eed64c88a..c37d9e312e 100644 --- a/.github/workflows/tests_suite.yml +++ b/.github/workflows/tests_suite.yml @@ -274,7 +274,7 @@ jobs: runs-on: ubuntu-20.04 steps: - name: Free Disk Space - uses: jlumbroso/free-disk-space@v1.2.0 + uses: jlumbroso/free-disk-space@v1.3.1 - uses: actions/checkout@v3 with: submodules: true @@ -548,7 +548,7 @@ jobs: runs-on: ubuntu-20.04 steps: - name: Free Disk Space - uses: jlumbroso/free-disk-space@v1.2.0 + uses: jlumbroso/free-disk-space@v1.3.1 - name: Download artifact uses: actions/download-artifact@v2 with: From ca8670603f7278444d06dfca0297cbc99d18d45a Mon Sep 17 00:00:00 2001 From: Nikolaos Passalis Date: Thu, 16 Nov 2023 15:38:15 +0200 Subject: [PATCH 06/36] Bump jlumbroso/free-disk-space --- .github/workflows/tests_suite_develop.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests_suite_develop.yml b/.github/workflows/tests_suite_develop.yml index 673553a3f3..1dc2d83b54 100644 --- a/.github/workflows/tests_suite_develop.yml +++ b/.github/workflows/tests_suite_develop.yml @@ -278,7 +278,7 @@ jobs: runs-on: ubuntu-20.04 steps: - name: Free Disk Space - uses: jlumbroso/free-disk-space@v1.2.0 + uses: jlumbroso/free-disk-space@v1.3.1 - uses: actions/checkout@v3 with: submodules: true @@ -557,7 +557,7 @@ jobs: runs-on: ubuntu-20.04 steps: - name: Free Disk Space - uses: jlumbroso/free-disk-space@v1.2.0 + uses: jlumbroso/free-disk-space@v1.3.1 - name: Download artifact uses: actions/download-artifact@v2 with: From d14bf50bcbea4c28e42ca3e25b78684814a0e3b8 Mon Sep 17 00:00:00 2001 From: Nikolaos Passalis Date: Thu, 16 Nov 2023 15:58:13 +0200 Subject: [PATCH 07/36] Updated versions --- .github/workflows/test_packages.yml | 2 +- docs/reference/index.md | 2 +- docs/reference/installation.md | 10 +++++----- projects/opendr_ws/src/opendr_bridge/package.xml | 2 +- .../opendr_ws/src/opendr_data_generation/package.xml | 2 +- projects/opendr_ws/src/opendr_perception/package.xml | 2 +- projects/opendr_ws/src/opendr_planning/package.xml | 2 +- projects/opendr_ws/src/opendr_simulation/package.xml | 2 +- projects/opendr_ws_2/src/opendr_bridge/package.xml | 2 +- projects/opendr_ws_2/src/opendr_bridge/setup.py | 2 +- .../opendr_ws_2/src/opendr_data_generation/package.xml | 2 +- .../opendr_ws_2/src/opendr_data_generation/setup.py | 2 +- projects/opendr_ws_2/src/opendr_interface/package.xml | 2 +- projects/opendr_ws_2/src/opendr_perception/package.xml | 2 +- projects/opendr_ws_2/src/opendr_perception/setup.py | 2 +- projects/opendr_ws_2/src/opendr_planning/package.xml | 2 +- projects/opendr_ws_2/src/opendr_planning/setup.py | 2 +- projects/opendr_ws_2/src/opendr_simulation/package.xml | 2 +- projects/opendr_ws_2/src/opendr_simulation/setup.py | 2 +- .../src/fmp_slam_eval/package.xml | 2 +- .../src/map_simulator/package.xml | 2 +- src/opendr/_version.py | 2 +- 22 files changed, 26 insertions(+), 26 deletions(-) diff --git a/.github/workflows/test_packages.yml b/.github/workflows/test_packages.yml index 1ea18c9b40..0f14bb089d 100644 --- a/.github/workflows/test_packages.yml +++ b/.github/workflows/test_packages.yml @@ -132,6 +132,6 @@ jobs: python-version: 3.8 - name: Test Docker run: | - docker run --name toolkit -i opendr/opendr-toolkit:cpu_v2.2.0 bash + docker run --name toolkit -i opendr/opendr-toolkit:cpu_v3.0.0 bash docker start toolkit docker exec -i toolkit bash -c "source bin/activate.sh && source tests/sources/tools/control/mobile_manipulation/run_ros.sh && python3 -m unittest discover -s tests/sources/tools/${{ matrix.package }}" diff --git a/docs/reference/index.md b/docs/reference/index.md index 032d8dcf9d..2aefba3a3f 100644 --- a/docs/reference/index.md +++ b/docs/reference/index.md @@ -1,6 +1,6 @@ # OpenDR Toolkit Reference Manual -*Release 2.2.0* +*Release 3.0.0*
diff --git a/docs/reference/installation.md b/docs/reference/installation.md index 6698d69566..346cd3cef7 100644 --- a/docs/reference/installation.md +++ b/docs/reference/installation.md @@ -106,14 +106,14 @@ Note that `opendr-toolkit` is actually just a metapackage that includes all the ## CPU docker After installing [docker](https://docs.docker.com/engine/install/ubuntu/), you can directly run the OpenDR image as: ```bash -sudo docker run -p 8888:8888 opendr/opendr-toolkit:cpu_v2.2.0 +sudo docker run -p 8888:8888 opendr/opendr-toolkit:cpu_v3.0.0 ``` The docker automatically runs a Jupyter notebook server that listens at port 8888. When launched, you can access the Jupyter notebook by following the link provided in the console, it should be similar to [http://127.0.0.1:8888/?token=TOKEN](http://127.0.0.1:8888/?token=TOKEN). In order to stop the container, please quit the Jupyter notebook. If you do not wish to use Jupyter, you can also experiment by starting an interactive session by running: ```bash -sudo docker run -it opendr/opendr-toolkit:cpu_v2.2.0 /bin/bash +sudo docker run -it opendr/opendr-toolkit:cpu_v3.0.0 /bin/bash ``` In this case, do not forget to enable the virtual environment with: ```bash @@ -122,18 +122,18 @@ source bin/activate.sh If you want to display GTK-based applications from the Docker container (e.g., visualize results using OpenCV `imshow()`), then you should mount the X server socket inside the container, e.g., ```bash xhost +local:root -sudo docker run -it -v /tmp/.X11-unix:/tmp/.X11-unix -e DISPLAY=unix$DISPLAY opendr/opendr-toolkit:cpu_v2.2.0 /bin/bash +sudo docker run -it -v /tmp/.X11-unix:/tmp/.X11-unix -e DISPLAY=unix$DISPLAY opendr/opendr-toolkit:cpu_v3.0.0 /bin/bash ``` ## GPU docker If you want to use a CUDA-enabled container please install [nvidia-docker](https://github.com/NVIDIA/nvidia-docker). Then, you can directly run the latest image with the command: ```bash -sudo docker run --gpus all -p 8888:8888 opendr/opendr-toolkit:cuda_v2.2.0 +sudo docker run --gpus all -p 8888:8888 opendr/opendr-toolkit:cuda_v3.0.0 ``` or, for an interactive session: ```bash -sudo docker run --gpus all -it opendr/opendr-toolkit:cuda_v2.2.0 /bin/bash +sudo docker run --gpus all -it opendr/opendr-toolkit:cuda_v3.0.0 /bin/bash ``` In this case, do not forget to enable the virtual environment with: ```bash diff --git a/projects/opendr_ws/src/opendr_bridge/package.xml b/projects/opendr_ws/src/opendr_bridge/package.xml index c292a0debc..5297c7fd61 100644 --- a/projects/opendr_ws/src/opendr_bridge/package.xml +++ b/projects/opendr_ws/src/opendr_bridge/package.xml @@ -1,7 +1,7 @@ opendr_bridge - 2.2.0 + 3.0.0 OpenDR ROS bridge package. This package provides a way to translate ROS messages into OpenDR data types and vice versa. diff --git a/projects/opendr_ws/src/opendr_data_generation/package.xml b/projects/opendr_ws/src/opendr_data_generation/package.xml index 14085a0028..575c424476 100644 --- a/projects/opendr_ws/src/opendr_data_generation/package.xml +++ b/projects/opendr_ws/src/opendr_data_generation/package.xml @@ -1,7 +1,7 @@ opendr_data_generation - 2.2.0 + 3.0.0 OpenDR's ROS nodes for data generation package OpenDR Project Coordinator Apache License v2.0 diff --git a/projects/opendr_ws/src/opendr_perception/package.xml b/projects/opendr_ws/src/opendr_perception/package.xml index 3c809d4fa4..37b60ae176 100644 --- a/projects/opendr_ws/src/opendr_perception/package.xml +++ b/projects/opendr_ws/src/opendr_perception/package.xml @@ -1,7 +1,7 @@ opendr_perception - 2.2.0 + 3.0.0 OpenDR's ROS nodes for perception package OpenDR Project Coordinator Apache License v2.0 diff --git a/projects/opendr_ws/src/opendr_planning/package.xml b/projects/opendr_ws/src/opendr_planning/package.xml index 8729d66a62..de36289a4f 100644 --- a/projects/opendr_ws/src/opendr_planning/package.xml +++ b/projects/opendr_ws/src/opendr_planning/package.xml @@ -1,7 +1,7 @@ opendr_planning - 2.2.0 + 3.0.0 OpenDR's ROS planning package OpenDR Project Coordinator Apache License v2.0 diff --git a/projects/opendr_ws/src/opendr_simulation/package.xml b/projects/opendr_ws/src/opendr_simulation/package.xml index 92cfb597fc..700d7be556 100644 --- a/projects/opendr_ws/src/opendr_simulation/package.xml +++ b/projects/opendr_ws/src/opendr_simulation/package.xml @@ -1,7 +1,7 @@ opendr_simulation - 2.2.0 + 3.0.0 OpenDR's ROS nodes for simulation package OpenDR Project Coordinator Apache License v2.0 diff --git a/projects/opendr_ws_2/src/opendr_bridge/package.xml b/projects/opendr_ws_2/src/opendr_bridge/package.xml index 8885f5f33f..c49b7adbaf 100644 --- a/projects/opendr_ws_2/src/opendr_bridge/package.xml +++ b/projects/opendr_ws_2/src/opendr_bridge/package.xml @@ -2,7 +2,7 @@ opendr_bridge - 2.2.0 + 3.0.0 OpenDR ROS2 bridge package. This package provides a way to translate ROS2 messages into OpenDR data types and vice versa. OpenDR Project Coordinator diff --git a/projects/opendr_ws_2/src/opendr_bridge/setup.py b/projects/opendr_ws_2/src/opendr_bridge/setup.py index b6b6d6eb0d..6725b67816 100644 --- a/projects/opendr_ws_2/src/opendr_bridge/setup.py +++ b/projects/opendr_ws_2/src/opendr_bridge/setup.py @@ -4,7 +4,7 @@ setup( name=package_name, - version='2.2.0', + version='3.0.0', packages=[package_name], data_files=[ ('share/ament_index/resource_index/packages', diff --git a/projects/opendr_ws_2/src/opendr_data_generation/package.xml b/projects/opendr_ws_2/src/opendr_data_generation/package.xml index 18eb967fdf..8ca2d3dcd1 100644 --- a/projects/opendr_ws_2/src/opendr_data_generation/package.xml +++ b/projects/opendr_ws_2/src/opendr_data_generation/package.xml @@ -2,7 +2,7 @@ opendr_data_generation - 2.2.0 + 3.0.0 OpenDR's ROS2 nodes for data generation package tefas Apache License v2.0 diff --git a/projects/opendr_ws_2/src/opendr_data_generation/setup.py b/projects/opendr_ws_2/src/opendr_data_generation/setup.py index a7633bba5d..1db06914a0 100644 --- a/projects/opendr_ws_2/src/opendr_data_generation/setup.py +++ b/projects/opendr_ws_2/src/opendr_data_generation/setup.py @@ -18,7 +18,7 @@ setup( name=package_name, - version='2.2.0', + version='3.0.0', packages=[package_name], data_files=[ ('share/ament_index/resource_index/packages', diff --git a/projects/opendr_ws_2/src/opendr_interface/package.xml b/projects/opendr_ws_2/src/opendr_interface/package.xml index 5fa99dd88e..0832635aba 100644 --- a/projects/opendr_ws_2/src/opendr_interface/package.xml +++ b/projects/opendr_ws_2/src/opendr_interface/package.xml @@ -2,7 +2,7 @@ opendr_interface - 2.2.0 + 3.0.0 OpenDR ROS2 custom interface package. This package includes all custom OpenDR ROS2 messages and services. OpenDR Project Coordinator Apache License v2.0 diff --git a/projects/opendr_ws_2/src/opendr_perception/package.xml b/projects/opendr_ws_2/src/opendr_perception/package.xml index 32c7c19813..13484988c2 100644 --- a/projects/opendr_ws_2/src/opendr_perception/package.xml +++ b/projects/opendr_ws_2/src/opendr_perception/package.xml @@ -2,7 +2,7 @@ opendr_perception - 2.2.0 + 3.0.0 OpenDR ROS2 nodes for the perception package OpenDR Project Coordinator Apache License v2.0 diff --git a/projects/opendr_ws_2/src/opendr_perception/setup.py b/projects/opendr_ws_2/src/opendr_perception/setup.py index e5d98361c0..27df175130 100644 --- a/projects/opendr_ws_2/src/opendr_perception/setup.py +++ b/projects/opendr_ws_2/src/opendr_perception/setup.py @@ -4,7 +4,7 @@ setup( name=package_name, - version='2.2.0', + version='3.0.0', packages=[package_name], data_files=[ ('share/ament_index/resource_index/packages', diff --git a/projects/opendr_ws_2/src/opendr_planning/package.xml b/projects/opendr_ws_2/src/opendr_planning/package.xml index 3e121fe9a6..30f6a3257e 100644 --- a/projects/opendr_ws_2/src/opendr_planning/package.xml +++ b/projects/opendr_ws_2/src/opendr_planning/package.xml @@ -2,7 +2,7 @@ opendr_planning - 2.2.0 + 3.0.0 OpenDR ROS2 nodes for the planning package OpenDR Project Coordinator Apache License v2.0 diff --git a/projects/opendr_ws_2/src/opendr_planning/setup.py b/projects/opendr_ws_2/src/opendr_planning/setup.py index 6db08e9a4a..d622dd1108 100644 --- a/projects/opendr_ws_2/src/opendr_planning/setup.py +++ b/projects/opendr_ws_2/src/opendr_planning/setup.py @@ -12,7 +12,7 @@ setup( name=package_name, - version='2.2.0', + version='3.0.0', packages=[package_name], data_files=data_files, install_requires=['setuptools'], diff --git a/projects/opendr_ws_2/src/opendr_simulation/package.xml b/projects/opendr_ws_2/src/opendr_simulation/package.xml index 8553ea6ccb..5775afcf31 100644 --- a/projects/opendr_ws_2/src/opendr_simulation/package.xml +++ b/projects/opendr_ws_2/src/opendr_simulation/package.xml @@ -2,7 +2,7 @@ opendr_simulation - 2.2.0 + 3.0.0 OpenDR ROS2 nodes for the simulation package OpenDR Project Coordinator Apache License v2.0 diff --git a/projects/opendr_ws_2/src/opendr_simulation/setup.py b/projects/opendr_ws_2/src/opendr_simulation/setup.py index 00173ac7fd..a03be06ab7 100644 --- a/projects/opendr_ws_2/src/opendr_simulation/setup.py +++ b/projects/opendr_ws_2/src/opendr_simulation/setup.py @@ -4,7 +4,7 @@ setup( name=package_name, - version='2.2.0', + version='3.0.0', packages=[package_name], data_files=[ ('share/ament_index/resource_index/packages', diff --git a/projects/python/perception/slam/full_map_posterior_gmapping/src/fmp_slam_eval/package.xml b/projects/python/perception/slam/full_map_posterior_gmapping/src/fmp_slam_eval/package.xml index 60786c9b56..41414016fd 100644 --- a/projects/python/perception/slam/full_map_posterior_gmapping/src/fmp_slam_eval/package.xml +++ b/projects/python/perception/slam/full_map_posterior_gmapping/src/fmp_slam_eval/package.xml @@ -1,7 +1,7 @@ fmp_slam_eval - 2.2.0 + 3.0.0 FMP SLAM Evaluation Package Jose Arce diff --git a/projects/python/perception/slam/full_map_posterior_gmapping/src/map_simulator/package.xml b/projects/python/perception/slam/full_map_posterior_gmapping/src/map_simulator/package.xml index e851203959..9d7ae014be 100644 --- a/projects/python/perception/slam/full_map_posterior_gmapping/src/map_simulator/package.xml +++ b/projects/python/perception/slam/full_map_posterior_gmapping/src/map_simulator/package.xml @@ -1,7 +1,7 @@ map_simulator - 2.2.0 + 3.0.0 The 2D Map Simulator package for generating datasets for testing and evaluating SLAM algorithms Jose Arce diff --git a/src/opendr/_version.py b/src/opendr/_version.py index f61d044d64..a9e8ffeb1d 100644 --- a/src/opendr/_version.py +++ b/src/opendr/_version.py @@ -12,4 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -__version__ = "2.2.0" +__version__ = "3.0.0" From 5a569220e274de61eaeaea9f28fea75c54675b17 Mon Sep 17 00:00:00 2001 From: Nikolaos Passalis Date: Thu, 16 Nov 2023 16:01:06 +0200 Subject: [PATCH 08/36] Added speech_transcription to `packages.txt` --- packages.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/packages.txt b/packages.txt index 90f72212ac..3c039a2824 100644 --- a/packages.txt +++ b/packages.txt @@ -1,5 +1,6 @@ engine perception/speech_recognition +perception/speech_transcription perception/semantic_segmentation perception/binary_high_resolution perception/face_recognition From 65dd02b6e884119514466e4a6793f85d70f06eb9 Mon Sep 17 00:00:00 2001 From: Nikolaos Passalis Date: Sun, 19 Nov 2023 15:57:06 +0200 Subject: [PATCH 09/36] disabling single_demo_grasp docker tests --- .github/workflows/tests_suite_develop.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests_suite_develop.yml b/.github/workflows/tests_suite_develop.yml index 1dc2d83b54..820f9bf0a2 100644 --- a/.github/workflows/tests_suite_develop.yml +++ b/.github/workflows/tests_suite_develop.yml @@ -551,7 +551,7 @@ jobs: - perception/facial_expression_recognition - simulation/human_model_generation - control/mobile_manipulation - - control/single_demo_grasp + # - control/single_demo_grasp - planning/end_to_end_planning # - control/multi_object_search # needs CUDA Docker container runs-on: ubuntu-20.04 From 66882307cfa9d2147724791c512b4426f7599ee5 Mon Sep 17 00:00:00 2001 From: Nikolaos Passalis Date: Sun, 19 Nov 2023 15:57:12 +0200 Subject: [PATCH 10/36] disabling single_demo_grasp docker tests --- .github/workflows/tests_suite.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests_suite.yml b/.github/workflows/tests_suite.yml index c37d9e312e..f9f1b4b580 100644 --- a/.github/workflows/tests_suite.yml +++ b/.github/workflows/tests_suite.yml @@ -542,7 +542,7 @@ jobs: - perception/facial_expression_recognition - simulation/human_model_generation - control/mobile_manipulation - - control/single_demo_grasp + # - control/single_demo_grasp - planning/end_to_end_planning # - control/multi_object_search # needs CUDA Docker container runs-on: ubuntu-20.04 From f07c4e2624a0745889e062e7a9de916d4993506b Mon Sep 17 00:00:00 2001 From: Nikolaos Passalis Date: Sun, 19 Nov 2023 15:59:16 +0200 Subject: [PATCH 11/36] Added missing dependecies --- .github/workflows/tests_suite.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tests_suite.yml b/.github/workflows/tests_suite.yml index f9f1b4b580..4ed12d2018 100644 --- a/.github/workflows/tests_suite.yml +++ b/.github/workflows/tests_suite.yml @@ -363,8 +363,8 @@ jobs: export ROS_DISTRO=noetic sudo apt-get update - 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 python3-dev python3-six python3-six ffmpeg + python3 -m venv venv source venv/bin/activate python3 -m pip install --upgrade pip @@ -456,7 +456,7 @@ jobs: export ROS_DISTRO=noetic sudo apt-get update - sudo apt -y install python3.8-venv libfreetype6-dev git build-essential cmake python3-dev wget libopenblas-dev libsndfile1 libboost-dev libeigen3-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-dev python3-six ffmpeg python3 -m venv venv source venv/bin/activate From 4d929b5f306b247d46d2e15888553d6f17ce4548 Mon Sep 17 00:00:00 2001 From: Nikolaos Passalis Date: Sun, 19 Nov 2023 16:00:01 +0200 Subject: [PATCH 12/36] Added missing dependecies --- .github/workflows/tests_suite_develop.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests_suite_develop.yml b/.github/workflows/tests_suite_develop.yml index 820f9bf0a2..a085e34b71 100644 --- a/.github/workflows/tests_suite_develop.yml +++ b/.github/workflows/tests_suite_develop.yml @@ -369,7 +369,7 @@ jobs: export ROS_DISTRO=noetic sudo apt-get update - 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 python3-dev python3-six ffmpeg python3 -m venv venv source venv/bin/activate @@ -465,7 +465,7 @@ jobs: export ROS_DISTRO=noetic sudo apt-get update - sudo apt -y install python3.8-venv libfreetype6-dev git build-essential cmake python3-dev wget libopenblas-dev libsndfile1 libboost-dev libeigen3-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-dev python3-six ffmpeg python3 -m venv venv source venv/bin/activate From 32de71a9d837e59005746eb803f3c419883cb389 Mon Sep 17 00:00:00 2001 From: Nikolaos Passalis Date: Sun, 19 Nov 2023 17:09:55 +0200 Subject: [PATCH 13/36] Added gesture_recognition to `packages.txt` --- packages.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/packages.txt b/packages.txt index 3c039a2824..861499af33 100644 --- a/packages.txt +++ b/packages.txt @@ -16,6 +16,7 @@ perception/object_detection_2d perception/object_tracking_2d perception/object_detection_3d perception/object_tracking_3d +perception/gesture_recognition perception/panoptic_segmentation simulation/human_model_generation utils/hyperparameter_tuner From 4908ae346328a276444b1710a17d11ad501d04a7 Mon Sep 17 00:00:00 2001 From: Nikolaos Passalis Date: Sun, 19 Nov 2023 17:13:00 +0200 Subject: [PATCH 14/36] Added dependencies --- .github/workflows/tests_suite.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tests_suite.yml b/.github/workflows/tests_suite.yml index 4ed12d2018..427d800b2c 100644 --- a/.github/workflows/tests_suite.yml +++ b/.github/workflows/tests_suite.yml @@ -363,12 +363,12 @@ jobs: export ROS_DISTRO=noetic sudo apt-get update - sudo apt -y install python3.8-venv libfreetype6-dev git build-essential cmake python3-dev wget libopenblas-dev libsndfile1 libboost-dev python3-dev python3-six python3-six ffmpeg + sudo apt -y install python3.8-venv libfreetype6-dev git build-essential cmake python3-dev wget libopenblas-dev libsndfile1 libboost-dev python3-dev python3-six ffmpeg python3 -m venv venv source venv/bin/activate python3 -m pip install --upgrade pip - python3 -m pip install wheel==0.38.4 + python3 -m pip install wheel==0.38.4 six # install all tools one at a time while read f; do @@ -461,7 +461,7 @@ jobs: python3 -m venv venv source venv/bin/activate python3 -m pip install --upgrade pip - python3 -m pip install wheel==0.38.4 + python3 -m pip install wheel==0.38.4 six # get the name of the wheel to install based on the test being run package=$(sed "s/_/-/g" <<< ${{ matrix.package }}) From 3bb2a28219b41f26d67e9be9b615a7ad8f79a44c Mon Sep 17 00:00:00 2001 From: Nikolaos Passalis Date: Sun, 19 Nov 2023 17:13:38 +0200 Subject: [PATCH 15/36] Added dependecies --- .github/workflows/tests_suite_develop.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests_suite_develop.yml b/.github/workflows/tests_suite_develop.yml index a085e34b71..218b3ff9aa 100644 --- a/.github/workflows/tests_suite_develop.yml +++ b/.github/workflows/tests_suite_develop.yml @@ -374,7 +374,7 @@ jobs: python3 -m venv venv source venv/bin/activate python3 -m pip install --upgrade pip - python3 -m pip install wheel==0.38.4 + python3 -m pip install wheel==0.38.4 six # install all tools one at a time while read f; do @@ -470,7 +470,7 @@ jobs: python3 -m venv venv source venv/bin/activate python3 -m pip install --upgrade pip - python3 -m pip install wheel==0.38.4 + python3 -m pip install wheel==0.38.4 six # get the name of the wheel to install based on the test being run package=$(sed "s/_/-/g" <<< ${{ matrix.package }}) From fef1b9d331ea66f77d6f719cb81e13ff37f5ba39 Mon Sep 17 00:00:00 2001 From: Nikolaos Passalis Date: Sun, 19 Nov 2023 17:14:36 +0200 Subject: [PATCH 16/36] Added mising `__init__.py` --- .../intent_recognition_learner/algorithm/__init__.py | 1 + 1 file changed, 1 insertion(+) create mode 100644 src/opendr/perception/multimodal_human_centric/intent_recognition_learner/algorithm/__init__.py diff --git a/src/opendr/perception/multimodal_human_centric/intent_recognition_learner/algorithm/__init__.py b/src/opendr/perception/multimodal_human_centric/intent_recognition_learner/algorithm/__init__.py new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/src/opendr/perception/multimodal_human_centric/intent_recognition_learner/algorithm/__init__.py @@ -0,0 +1 @@ + From dfac1a20b059f00f8c5732c90c4c8bf3dbddedf5 Mon Sep 17 00:00:00 2001 From: Nikolaos Passalis Date: Sun, 19 Nov 2023 17:15:18 +0200 Subject: [PATCH 17/36] Added mising `__init__.py` --- .../algorithm/methods/MULT/__init__.py | 1 + 1 file changed, 1 insertion(+) create mode 100644 src/opendr/perception/multimodal_human_centric/intent_recognition_learner/algorithm/methods/MULT/__init__.py diff --git a/src/opendr/perception/multimodal_human_centric/intent_recognition_learner/algorithm/methods/MULT/__init__.py b/src/opendr/perception/multimodal_human_centric/intent_recognition_learner/algorithm/methods/MULT/__init__.py new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/src/opendr/perception/multimodal_human_centric/intent_recognition_learner/algorithm/methods/MULT/__init__.py @@ -0,0 +1 @@ + From 1131eb15aa823fb86d7e0a2ea397ee95c21a35ae Mon Sep 17 00:00:00 2001 From: Nikolaos Passalis Date: Sun, 19 Nov 2023 17:15:41 +0200 Subject: [PATCH 18/36] Added mising `__init__.py` --- .../intent_recognition_learner/algorithm/tools/__init__.py | 1 + 1 file changed, 1 insertion(+) create mode 100644 src/opendr/perception/multimodal_human_centric/intent_recognition_learner/algorithm/tools/__init__.py diff --git a/src/opendr/perception/multimodal_human_centric/intent_recognition_learner/algorithm/tools/__init__.py b/src/opendr/perception/multimodal_human_centric/intent_recognition_learner/algorithm/tools/__init__.py new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/src/opendr/perception/multimodal_human_centric/intent_recognition_learner/algorithm/tools/__init__.py @@ -0,0 +1 @@ + From 8f943ac14cb7b8103d1853ec07c2850cd623bc90 Mon Sep 17 00:00:00 2001 From: Nikolaos Passalis Date: Sun, 19 Nov 2023 18:27:34 +0200 Subject: [PATCH 19/36] Added missing ``__init__.py`` --- src/opendr/perception/gesture_recognition/__init__.py | 1 + 1 file changed, 1 insertion(+) create mode 100644 src/opendr/perception/gesture_recognition/__init__.py diff --git a/src/opendr/perception/gesture_recognition/__init__.py b/src/opendr/perception/gesture_recognition/__init__.py new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/src/opendr/perception/gesture_recognition/__init__.py @@ -0,0 +1 @@ + From 6bc7a3fcef3c19e740094683747d8e400b36b6e0 Mon Sep 17 00:00:00 2001 From: Nikolaos Passalis Date: Sun, 19 Nov 2023 18:27:45 +0200 Subject: [PATCH 20/36] Create __init__.py --- src/opendr/perception/gesture_recognition/algorithm/__init__.py | 1 + 1 file changed, 1 insertion(+) create mode 100644 src/opendr/perception/gesture_recognition/algorithm/__init__.py diff --git a/src/opendr/perception/gesture_recognition/algorithm/__init__.py b/src/opendr/perception/gesture_recognition/algorithm/__init__.py new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/src/opendr/perception/gesture_recognition/algorithm/__init__.py @@ -0,0 +1 @@ + From 62ebd453404f802c09c3ecf4a71f837fdb987b54 Mon Sep 17 00:00:00 2001 From: Nikolaos Passalis Date: Sun, 19 Nov 2023 18:27:55 +0200 Subject: [PATCH 21/36] Create __init__.py --- .../perception/gesture_recognition/algorithm/config/__init__.py | 1 + 1 file changed, 1 insertion(+) create mode 100644 src/opendr/perception/gesture_recognition/algorithm/config/__init__.py diff --git a/src/opendr/perception/gesture_recognition/algorithm/config/__init__.py b/src/opendr/perception/gesture_recognition/algorithm/config/__init__.py new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/src/opendr/perception/gesture_recognition/algorithm/config/__init__.py @@ -0,0 +1 @@ + From 01f500d3d827f135e8a8f834c83c82cb97954598 Mon Sep 17 00:00:00 2001 From: Nikolaos Passalis Date: Sun, 19 Nov 2023 18:28:15 +0200 Subject: [PATCH 22/36] Added missing `__init__.py` --- .../perception/gesture_recognition/algorithm/data/__init__.py | 1 + 1 file changed, 1 insertion(+) create mode 100644 src/opendr/perception/gesture_recognition/algorithm/data/__init__.py diff --git a/src/opendr/perception/gesture_recognition/algorithm/data/__init__.py b/src/opendr/perception/gesture_recognition/algorithm/data/__init__.py new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/src/opendr/perception/gesture_recognition/algorithm/data/__init__.py @@ -0,0 +1 @@ + From 7a5fd90fdf0fde998e490977de9250b7c229f585 Mon Sep 17 00:00:00 2001 From: Nikolaos Passalis Date: Sun, 19 Nov 2023 18:37:26 +0200 Subject: [PATCH 23/36] Added missing intra-OpenDR dependency --- src/opendr/perception/gesture_recognition/dependencies.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/src/opendr/perception/gesture_recognition/dependencies.ini b/src/opendr/perception/gesture_recognition/dependencies.ini index aac7b3d043..52077b448f 100644 --- a/src/opendr/perception/gesture_recognition/dependencies.ini +++ b/src/opendr/perception/gesture_recognition/dependencies.ini @@ -16,3 +16,4 @@ python=torch>=1.9.0 tensorboard opendr=opendr-toolkit-engine + opendr-object-detection-2d From 912d9aa81c3e9efd94c9f7487988fd46ff116ad0 Mon Sep 17 00:00:00 2001 From: Nikolaos Passalis Date: Sun, 19 Nov 2023 18:39:23 +0200 Subject: [PATCH 24/36] Fix individual tool installation --- .github/workflows/tests_suite.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/tests_suite.yml b/.github/workflows/tests_suite.yml index 427d800b2c..b9aa29f3f1 100644 --- a/.github/workflows/tests_suite.yml +++ b/.github/workflows/tests_suite.yml @@ -481,6 +481,8 @@ jobs: python3 -m pip install --find-links ./artifact/wheel-artifact/ ./artifact/wheel-artifact/opendr-toolkit-pose-estimation-*.tar.gz elif [ ${{ matrix.package }} == "perception/heart_anomaly_detection" ]; then python3 -m pip install --find-links ./artifact/wheel-artifact/ ./artifact/wheel-artifact/opendr-toolkit-compressive-learning-*.tar.gz + elif [ ${{ matrix.package }} == "perception/gesture_recognition" ]; then + python3 -m pip install --find-links ./artifact/wheel-artifact/ ./artifact/wheel-artifact/opendr-toolkit-object-detection-2d-*.tar.gz elif [ ${{ matrix.package }} == "perception/multimodal_human_centric" ]; then python3 -m pip install --find-links ./artifact/wheel-artifact/ ./artifact/wheel-artifact/opendr-toolkit-compressive-learning-*.tar.gz python3 -m pip install --find-links ./artifact/wheel-artifact/ ./artifact/wheel-artifact/opendr-toolkit-object-detection-2d-*.tar.gz From 5ff8cfaef2b0ee17c73a6c87bbcad519ef6d8203 Mon Sep 17 00:00:00 2001 From: Nikolaos Passalis Date: Sun, 19 Nov 2023 18:40:00 +0200 Subject: [PATCH 25/36] Fix dependencies --- .github/workflows/tests_suite_develop.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/tests_suite_develop.yml b/.github/workflows/tests_suite_develop.yml index 218b3ff9aa..076a34750b 100644 --- a/.github/workflows/tests_suite_develop.yml +++ b/.github/workflows/tests_suite_develop.yml @@ -490,6 +490,8 @@ jobs: python3 -m pip install --find-links ./artifact/wheel-artifact/ ./artifact/wheel-artifact/opendr-toolkit-pose-estimation-*.tar.gz elif [ ${{ matrix.package }} == "perception/heart_anomaly_detection" ]; then python3 -m pip install --find-links ./artifact/wheel-artifact/ ./artifact/wheel-artifact/opendr-toolkit-compressive-learning-*.tar.gz + elif [ ${{ matrix.package }} == "perception/gesture_recognition" ]; then + python3 -m pip install --find-links ./artifact/wheel-artifact/ ./artifact/wheel-artifact/opendr-toolkit-object-detection-2d-*.tar.gz elif [ ${{ matrix.package }} == "perception/multimodal_human_centric" ]; then python3 -m pip install --find-links ./artifact/wheel-artifact/ ./artifact/wheel-artifact/opendr-toolkit-compressive-learning-*.tar.gz python3 -m pip install --find-links ./artifact/wheel-artifact/ ./artifact/wheel-artifact/opendr-toolkit-object-detection-2d-*.tar.gz From cd6156f1dfea0769e9b200e814421de5b23f85ec Mon Sep 17 00:00:00 2001 From: Nikolaos Passalis Date: Sun, 19 Nov 2023 19:01:00 +0200 Subject: [PATCH 26/36] Fixed typo in dependecies --- src/opendr/perception/gesture_recognition/dependencies.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/opendr/perception/gesture_recognition/dependencies.ini b/src/opendr/perception/gesture_recognition/dependencies.ini index 52077b448f..fa5c4c2e83 100644 --- a/src/opendr/perception/gesture_recognition/dependencies.ini +++ b/src/opendr/perception/gesture_recognition/dependencies.ini @@ -16,4 +16,4 @@ python=torch>=1.9.0 tensorboard opendr=opendr-toolkit-engine - opendr-object-detection-2d + opendr-toolkit-object-detection-2d From 2068a2212e5e3a77689fdc6491953208bf65a9e3 Mon Sep 17 00:00:00 2001 From: Nikolaos Passalis Date: Sun, 19 Nov 2023 20:23:47 +0200 Subject: [PATCH 27/36] Update __init__.py From fd248601b99c07cd18f0b1b7ce0fedbc769c26cb Mon Sep 17 00:00:00 2001 From: Nikolaos Passalis Date: Sun, 19 Nov 2023 20:24:01 +0200 Subject: [PATCH 28/36] Update __init__.py From ddf0da72b05081c0266907be68b8f561354c22ed Mon Sep 17 00:00:00 2001 From: Nikolaos Passalis Date: Sun, 19 Nov 2023 20:24:16 +0200 Subject: [PATCH 29/36] Update __init__.py From 2a39492eea40f3fb68cb8ccb6e9e997e5f38ca79 Mon Sep 17 00:00:00 2001 From: Nikolaos Passalis Date: Sun, 19 Nov 2023 20:24:29 +0200 Subject: [PATCH 30/36] Update __init__.py From 997fc7262a95f965e733cb09c0bfd24e56612ebd Mon Sep 17 00:00:00 2001 From: Nikolaos Passalis Date: Sun, 19 Nov 2023 20:24:43 +0200 Subject: [PATCH 31/36] Update __init__.py From 61d6226acddde038af5aaac8f98338f6f363000a Mon Sep 17 00:00:00 2001 From: Nikolaos Passalis Date: Sun, 19 Nov 2023 20:24:55 +0200 Subject: [PATCH 32/36] Update __init__.py From 25d823c724d56f98cd5e4344d01ce71c8a0913d5 Mon Sep 17 00:00:00 2001 From: Nikolaos Passalis Date: Sun, 19 Nov 2023 20:25:15 +0200 Subject: [PATCH 33/36] pep8 fixes From e2b0380a1e0a031308e04e3957bd04010fce119e Mon Sep 17 00:00:00 2001 From: Nikolaos Passalis Date: Sun, 19 Nov 2023 21:13:35 +0200 Subject: [PATCH 34/36] Fix pep8 issues --- src/opendr/perception/gesture_recognition/__init__.py | 1 - src/opendr/perception/gesture_recognition/algorithm/__init__.py | 1 - .../perception/gesture_recognition/algorithm/config/__init__.py | 1 - .../perception/gesture_recognition/algorithm/data/__init__.py | 1 - .../intent_recognition_learner/algorithm/__init__.py | 1 - .../algorithm/methods/MULT/__init__.py | 1 - .../intent_recognition_learner/algorithm/tools/__init__.py | 1 - 7 files changed, 7 deletions(-) diff --git a/src/opendr/perception/gesture_recognition/__init__.py b/src/opendr/perception/gesture_recognition/__init__.py index 8b13789179..e69de29bb2 100644 --- a/src/opendr/perception/gesture_recognition/__init__.py +++ b/src/opendr/perception/gesture_recognition/__init__.py @@ -1 +0,0 @@ - diff --git a/src/opendr/perception/gesture_recognition/algorithm/__init__.py b/src/opendr/perception/gesture_recognition/algorithm/__init__.py index 8b13789179..e69de29bb2 100644 --- a/src/opendr/perception/gesture_recognition/algorithm/__init__.py +++ b/src/opendr/perception/gesture_recognition/algorithm/__init__.py @@ -1 +0,0 @@ - diff --git a/src/opendr/perception/gesture_recognition/algorithm/config/__init__.py b/src/opendr/perception/gesture_recognition/algorithm/config/__init__.py index 8b13789179..e69de29bb2 100644 --- a/src/opendr/perception/gesture_recognition/algorithm/config/__init__.py +++ b/src/opendr/perception/gesture_recognition/algorithm/config/__init__.py @@ -1 +0,0 @@ - diff --git a/src/opendr/perception/gesture_recognition/algorithm/data/__init__.py b/src/opendr/perception/gesture_recognition/algorithm/data/__init__.py index 8b13789179..e69de29bb2 100644 --- a/src/opendr/perception/gesture_recognition/algorithm/data/__init__.py +++ b/src/opendr/perception/gesture_recognition/algorithm/data/__init__.py @@ -1 +0,0 @@ - diff --git a/src/opendr/perception/multimodal_human_centric/intent_recognition_learner/algorithm/__init__.py b/src/opendr/perception/multimodal_human_centric/intent_recognition_learner/algorithm/__init__.py index 8b13789179..e69de29bb2 100644 --- a/src/opendr/perception/multimodal_human_centric/intent_recognition_learner/algorithm/__init__.py +++ b/src/opendr/perception/multimodal_human_centric/intent_recognition_learner/algorithm/__init__.py @@ -1 +0,0 @@ - diff --git a/src/opendr/perception/multimodal_human_centric/intent_recognition_learner/algorithm/methods/MULT/__init__.py b/src/opendr/perception/multimodal_human_centric/intent_recognition_learner/algorithm/methods/MULT/__init__.py index 8b13789179..e69de29bb2 100644 --- a/src/opendr/perception/multimodal_human_centric/intent_recognition_learner/algorithm/methods/MULT/__init__.py +++ b/src/opendr/perception/multimodal_human_centric/intent_recognition_learner/algorithm/methods/MULT/__init__.py @@ -1 +0,0 @@ - diff --git a/src/opendr/perception/multimodal_human_centric/intent_recognition_learner/algorithm/tools/__init__.py b/src/opendr/perception/multimodal_human_centric/intent_recognition_learner/algorithm/tools/__init__.py index 8b13789179..e69de29bb2 100644 --- a/src/opendr/perception/multimodal_human_centric/intent_recognition_learner/algorithm/tools/__init__.py +++ b/src/opendr/perception/multimodal_human_centric/intent_recognition_learner/algorithm/tools/__init__.py @@ -1 +0,0 @@ - From 53cbf332bfd3b552c09fee908b815a29ad5bd424 Mon Sep 17 00:00:00 2001 From: Nikolaos Passalis Date: Sat, 2 Dec 2023 23:48:02 +0200 Subject: [PATCH 35/36] Allow more recent OpenCV versions --- src/opendr/engine/dependencies.ini | 2 +- src/opendr/perception/binary_high_resolution/dependencies.ini | 2 +- src/opendr/perception/face_recognition/dependencies.ini | 2 +- src/opendr/perception/object_detection_2d/detr/dependencies.ini | 2 +- src/opendr/perception/object_detection_2d/gem/dependencies.ini | 2 +- .../voxel_object_detection_3d/dependencies.ini | 2 +- src/opendr/perception/object_tracking_2d/dependencies.ini | 2 +- .../single_object_tracking/vpit/dependencies.ini | 2 +- src/opendr/perception/pose_estimation/dependencies.ini | 2 +- src/opendr/simulation/human_model_generation/dependencies.ini | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/opendr/engine/dependencies.ini b/src/opendr/engine/dependencies.ini index cf05585aad..5383338718 100644 --- a/src/opendr/engine/dependencies.ini +++ b/src/opendr/engine/dependencies.ini @@ -5,4 +5,4 @@ python=torch==1.13.1 wheel Cython numpy<=1.23.5 - opencv-python==4.5.1.48 + opencv-python>=4.5.1.48 diff --git a/src/opendr/perception/binary_high_resolution/dependencies.ini b/src/opendr/perception/binary_high_resolution/dependencies.ini index a0d226e406..b02188952c 100644 --- a/src/opendr/perception/binary_high_resolution/dependencies.ini +++ b/src/opendr/perception/binary_high_resolution/dependencies.ini @@ -4,7 +4,7 @@ python=torch==1.13.1 torchsampler torchvision==0.14.1 - opencv-python==4.5.1.48 + opencv-python>=4.5.1.48 protobuf<=3.20.0 onnx==1.8.0 onnxruntime==1.3.0 diff --git a/src/opendr/perception/face_recognition/dependencies.ini b/src/opendr/perception/face_recognition/dependencies.ini index b6dcb9f5a2..3244c86110 100644 --- a/src/opendr/perception/face_recognition/dependencies.ini +++ b/src/opendr/perception/face_recognition/dependencies.ini @@ -9,7 +9,7 @@ python=torch==1.13.1 onnxruntime==1.3.0 tensorboard>=2.4.1 pillow>=8.3.2 - opencv-python==4.5.1.48 + opencv-python>=4.5.1.48 matplotlib>=2.2.2 tqdm scikit-learn==0.22 diff --git a/src/opendr/perception/object_detection_2d/detr/dependencies.ini b/src/opendr/perception/object_detection_2d/detr/dependencies.ini index cafa7d0295..270b08b9ba 100644 --- a/src/opendr/perception/object_detection_2d/detr/dependencies.ini +++ b/src/opendr/perception/object_detection_2d/detr/dependencies.ini @@ -12,6 +12,6 @@ python=torch==1.13.1 pillow>=8.3.2 imantics tensorboard - opencv-python==4.5.1.48 + opencv-python>=4.5.1.48 opendr=opendr-toolkit-engine diff --git a/src/opendr/perception/object_detection_2d/gem/dependencies.ini b/src/opendr/perception/object_detection_2d/gem/dependencies.ini index 09a8dd9dd1..7272ab9043 100644 --- a/src/opendr/perception/object_detection_2d/gem/dependencies.ini +++ b/src/opendr/perception/object_detection_2d/gem/dependencies.ini @@ -5,7 +5,7 @@ python=torch==1.13.1 torchvision==0.14.1 protobuf<=3.20.0 pillow>=8.3.2 - opencv-python==4.5.1.48 + opencv-python>=4.5.1.48 pycocotools>=2.0.4 git+https://github.com/cocodataset/panopticapi.git#egg=panopticapi scipy diff --git a/src/opendr/perception/object_detection_3d/voxel_object_detection_3d/dependencies.ini b/src/opendr/perception/object_detection_3d/voxel_object_detection_3d/dependencies.ini index 487c185ac1..30236bcf17 100644 --- a/src/opendr/perception/object_detection_3d/voxel_object_detection_3d/dependencies.ini +++ b/src/opendr/perception/object_detection_3d/voxel_object_detection_3d/dependencies.ini @@ -6,7 +6,7 @@ python=torch==1.13.1 torchvision==0.14.1 protobuf<=3.20.0 tensorboardX>=2.0 - opencv-python==4.5.1.48 + opencv-python>=4.5.1.48 matplotlib>=2.2.2 tqdm onnx==1.8.0 diff --git a/src/opendr/perception/object_tracking_2d/dependencies.ini b/src/opendr/perception/object_tracking_2d/dependencies.ini index c62adb39b1..b66248bc32 100644 --- a/src/opendr/perception/object_tracking_2d/dependencies.ini +++ b/src/opendr/perception/object_tracking_2d/dependencies.ini @@ -5,7 +5,7 @@ python=torch==1.13.1 torchvision==0.14.1 protobuf<=3.20.0 tensorboardX>=2.0 - opencv-python==4.5.1.48 + opencv-python>=4.5.1.48 matplotlib>=2.2.2 tqdm onnx==1.8.0 diff --git a/src/opendr/perception/object_tracking_3d/single_object_tracking/vpit/dependencies.ini b/src/opendr/perception/object_tracking_3d/single_object_tracking/vpit/dependencies.ini index 4d41d3c277..8ac0c8f7f1 100644 --- a/src/opendr/perception/object_tracking_3d/single_object_tracking/vpit/dependencies.ini +++ b/src/opendr/perception/object_tracking_3d/single_object_tracking/vpit/dependencies.ini @@ -5,7 +5,7 @@ python=torch==1.13.1 torchvision==0.14.1 protobuf<=3.20.0 tensorboardX>=2.0 - opencv-python==4.5.1.48 + opencv-python>=4.5.1.48 matplotlib>=2.2.2 tqdm onnx==1.8.0 diff --git a/src/opendr/perception/pose_estimation/dependencies.ini b/src/opendr/perception/pose_estimation/dependencies.ini index 17ea818e67..47bcd81753 100644 --- a/src/opendr/perception/pose_estimation/dependencies.ini +++ b/src/opendr/perception/pose_estimation/dependencies.ini @@ -6,7 +6,7 @@ python=torch==1.13.1 torchvision==0.14.1 protobuf<=3.20.0 tensorboardX>=2.0 - opencv-python==4.5.1.48 + opencv-python>=4.5.1.48 matplotlib>=2.2.2 tqdm onnx==1.8.0 diff --git a/src/opendr/simulation/human_model_generation/dependencies.ini b/src/opendr/simulation/human_model_generation/dependencies.ini index 7e03725f99..104bf22486 100644 --- a/src/opendr/simulation/human_model_generation/dependencies.ini +++ b/src/opendr/simulation/human_model_generation/dependencies.ini @@ -4,7 +4,7 @@ python=torch==1.13.1 torchvision==0.14.1 pyglet>=1.5.16 - opencv-python==4.5.1.48 + opencv-python>=4.5.1.48 pillow>=8.3.2 trimesh==3.5.23 scikit-image>0.16.2 From 460198d36d69ee3139de622ef0b835ccf954fc65 Mon Sep 17 00:00:00 2001 From: Nikolaos Passalis Date: Mon, 4 Dec 2023 10:08:24 +0200 Subject: [PATCH 36/36] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b5a4d3f026..63cd38d7e2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ # OpenDR Toolkit Change Log ## Version 3.0.0 -Released on Dec, XXX, 2023. +Released on Dec, 4, 2023. - New Features: - Binary High Resolution Learner ([#402](https://github.com/opendr-eu/opendr/pull/402)) - ROS2 node for EfficientLPS ([#404](https://github.com/opendr-eu/opendr/pull/404))