diff --git a/.github/workflows/publisher.yml b/.github/workflows/publisher.yml index 0f30b75b7d..f35f2bd2da 100644 --- a/.github/workflows/publisher.yml +++ b/.github/workflows/publisher.yml @@ -16,11 +16,11 @@ jobs: publish-wheel: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v7 with: submodules: true - name: Set up Python 3.8 - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: python-version: 3.8 - name: Install prerequisites @@ -39,16 +39,16 @@ jobs: publish-docker-cpu: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: submodules: true - name: Get branch name id: branch-name - uses: tj-actions/branch-names@v5.1 + uses: tj-actions/branch-names@v7 - name: Build Docker Image run: docker build --tag opendr-toolkit:cpu_$OPENDR_VERSION --build-arg branch=${{ steps.branch-name.outputs.current_branch }} --file Dockerfile . - name: Login to Docker Hub - uses: docker/login-action@v1 + uses: docker/login-action@v2 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_PASSWORD }} @@ -59,16 +59,16 @@ jobs: publish-docker-cuda: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: submodules: true - name: Get branch name id: branch-name - uses: tj-actions/branch-names@v5.1 + uses: tj-actions/branch-names@v7 - name: Build Docker Image run: docker build --tag opendr-toolkit:cuda_$OPENDR_VERSION --build-arg branch=${{ steps.branch-name.outputs.current_branch }} --file Dockerfile-cuda . - name: Login to Docker Hub - uses: docker/login-action@v1 + uses: docker/login-action@v2 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_PASSWORD }} diff --git a/.github/workflows/test_packages.yml b/.github/workflows/test_packages.yml index 3a13dd4521..f5c3ff2468 100644 --- a/.github/workflows/test_packages.yml +++ b/.github/workflows/test_packages.yml @@ -126,6 +126,6 @@ jobs: python-version: 3.8 - name: Test Docker run: | - docker run --name toolkit -i opendr/opendr-toolkit:cpu_v2.1.0 bash + docker run --name toolkit -i opendr/opendr-toolkit:cpu_v2.2.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/.github/workflows/tests_suite.yml b/.github/workflows/tests_suite.yml index 13c5c6521c..95ab60c122 100644 --- a/.github/workflows/tests_suite.yml +++ b/.github/workflows/tests_suite.yml @@ -139,12 +139,14 @@ jobs: if: ${{ contains(github.event.pull_request.labels.*.name, 'test release') || github.event_name == 'schedule' }} runs-on: ubuntu-20.04 steps: + - name: Free Disk Space + uses: jlumbroso/free-disk-space@v1.2.0 - uses: actions/checkout@v3 with: submodules: true - name: Get branch name id: branch-name - uses: tj-actions/branch-names@v5.1 + uses: tj-actions/branch-names@v7 - name: Build image run: | docker build --no-cache --tag opendr/opendr-toolkit:cpu_test --build-arg branch=${{ steps.branch-name.outputs.current_branch }} --build-arg ros_distro=noetic --file Dockerfile . @@ -213,12 +215,13 @@ jobs: path: artifact - name: Get branch name id: branch-name - uses: tj-actions/branch-names@v5.1 + uses: tj-actions/branch-names@v7 - name: Test Wheel run: | export OPENDR_HOME=$PWD export DISABLE_BCOLZ_AVX2=true export OPENDR_DEVICE=cpu + export PYTHONPATH=$OPENDR_HOME/src:$PYTHONPATH export ROS_DISTRO=noetic sudo apt -y install python3.8-venv libfreetype6-dev git build-essential cmake python3-dev wget libopenblas-dev libsndfile1 libboost-dev python3-dev @@ -235,10 +238,12 @@ jobs: if [ ! -z ${package[1]} ]; then package=${package[1]}; fi if [ "$package" != "opendr" ]; then - python3 -m pip install ./artifact/wheel-artifact/opendr-toolkit-$package-*.tar.gz + python3 -m pip install --find-links ./artifact/wheel-artifact/ ./artifact/wheel-artifact/opendr-toolkit-$package-*.tar.gz fi done < packages.txt + cd src/opendr/perception/object_detection_2d/retinaface; make; cd $OPENDR_HOME + # run the test python3 -m unittest discover -s tests/sources/tools/${{ matrix.package }} test-wheel-separate: @@ -299,7 +304,7 @@ jobs: path: artifact - name: Get branch name id: branch-name - uses: tj-actions/branch-names@v5.1 + uses: tj-actions/branch-names@v7 - name: Test Wheel Separate run: | export OPENDR_HOME=$PWD @@ -320,27 +325,31 @@ jobs: if [ ! -z ${package[1]} ]; then package=${package[1]}; fi # all packages require the engine - python3 -m pip install ./artifact/wheel-artifact/opendr-toolkit-engine-*.tar.gz + python3 -m pip install --find-links ./artifact/wheel-artifact/ ./artifact/wheel-artifact/opendr-toolkit-engine-*.tar.gz # install specific package if [ ${{ matrix.package }} == "utils" ]; then - python3 -m pip install ./artifact/wheel-artifact/opendr-toolkit-hyperparameter-tuner-*.tar.gz - python3 -m pip install ./artifact/wheel-artifact/opendr-toolkit-ambiguity-measure-*.tar.gz + python3 -m pip install --find-links ./artifact/wheel-artifact/ ./artifact/wheel-artifact/opendr-toolkit-hyperparameter-tuner-*.tar.gz + python3 -m pip install --find-links ./artifact/wheel-artifact/ ./artifact/wheel-artifact/opendr-toolkit-ambiguity-measure-*.tar.gz else # install required dependencies for derived tools, we do so manually to ensure the local one is used if [ ${{ matrix.package }} == "perception/fall_detection" ]; then - python3 -m pip install ./artifact/wheel-artifact/opendr-toolkit-pose-estimation-*.tar.gz + 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 ./artifact/wheel-artifact/opendr-toolkit-compressive-learning-*.tar.gz + python3 -m pip install --find-links ./artifact/wheel-artifact/ ./artifact/wheel-artifact/opendr-toolkit-compressive-learning-*.tar.gz elif [ ${{ matrix.package }} == "perception/multimodal_human_centric" ]; then - python3 -m pip install ./artifact/wheel-artifact/opendr-toolkit-compressive-learning-*.tar.gz - python3 -m pip install ./artifact/wheel-artifact/opendr-toolkit-object-detection-2d-*.tar.gz + 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 elif [ ${{ matrix.package }} == "perception/object_tracking_3d" ]; then - python3 -m pip install ./artifact/wheel-artifact/opendr-toolkit-object-detection-3d-*.tar.gz + python3 -m pip install --find-links ./artifact/wheel-artifact/ ./artifact/wheel-artifact/opendr-toolkit-object-detection-3d-*.tar.gz fi # install the package itself - python3 -m pip install ./artifact/wheel-artifact/opendr-toolkit-$package-*.tar.gz + python3 -m pip install --find-links ./artifact/wheel-artifact/ ./artifact/wheel-artifact/opendr-toolkit-$package-*.tar.gz + fi + + if [[ ${{ matrix.package }} == "perception/object_detection_2d/retinaface" ]]; then + cd src/opendr/perception/object_detection_2d/retinaface; make; cd $OPENDR_HOME fi # run the test @@ -387,9 +396,11 @@ jobs: - control/mobile_manipulation - control/single_demo_grasp - planning/end_to_end_planning - - control/multi_object_search + # - control/multi_object_search # needs CUDA Docker container runs-on: ubuntu-20.04 steps: + - name: Free Disk Space + uses: jlumbroso/free-disk-space@v1.2.0 - name: Download artifact uses: actions/download-artifact@v2 with: diff --git a/.github/workflows/tests_suite_develop.yml b/.github/workflows/tests_suite_develop.yml index 84910016be..40ef3f7358 100644 --- a/.github/workflows/tests_suite_develop.yml +++ b/.github/workflows/tests_suite_develop.yml @@ -142,13 +142,15 @@ jobs: if: ${{ contains(github.event.pull_request.labels.*.name, 'test release') || github.event_name == 'schedule' }} runs-on: ubuntu-20.04 steps: + - name: Free Disk Space + uses: jlumbroso/free-disk-space@v1.2.0 - uses: actions/checkout@v3 with: submodules: true ref: develop - name: Get branch name id: branch-name - uses: tj-actions/branch-names@v5.1 + uses: tj-actions/branch-names@v7 - name: Build image run: | docker build --no-cache --tag opendr/opendr-toolkit:cpu_test --build-arg branch=${{ steps.branch-name.outputs.current_branch }} --build-arg ros_distro=noetic --file Dockerfile . @@ -218,7 +220,7 @@ jobs: path: artifact - name: Get branch name id: branch-name - uses: tj-actions/branch-names@v5.1 + uses: tj-actions/branch-names@v7 - name: Test Wheel run: | export OPENDR_HOME=$PWD @@ -241,7 +243,7 @@ jobs: if [ ! -z ${package[1]} ]; then package=${package[1]}; fi if [ "$package" != "opendr" ]; then - python3 -m pip install ./artifact/wheel-artifact/opendr-toolkit-$package-*.tar.gz + python3 -m pip install --find-links ./artifact/wheel-artifact/ ./artifact/wheel-artifact/opendr-toolkit-$package-*.tar.gz fi done < packages.txt @@ -288,10 +290,10 @@ jobs: # - perception/object_detection_3d # passes, but disabled due to free() crash - perception/facial_expression_recognition - simulation/human_model_generation + #- control/multi_object_search #- control/mobile_manipulation #- control/single_demo_grasp #- planning/end_to_end_planning - #- control/multi_object_search runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v3 @@ -308,7 +310,7 @@ jobs: path: artifact - name: Get branch name id: branch-name - uses: tj-actions/branch-names@v5.1 + uses: tj-actions/branch-names@v7 - name: Test Wheel Separate run: | export OPENDR_HOME=$PWD @@ -330,29 +332,29 @@ jobs: if [ ! -z ${package[1]} ]; then package=${package[1]}; fi # all packages require the engine - python3 -m pip install ./artifact/wheel-artifact/opendr-toolkit-engine-*.tar.gz + python3 -m pip install --find-links ./artifact/wheel-artifact/ ./artifact/wheel-artifact/opendr-toolkit-engine-*.tar.gz # install specific package if [ ${{ matrix.package }} == "utils" ]; then - python3 -m pip install ./artifact/wheel-artifact/opendr-toolkit-hyperparameter-tuner-*.tar.gz - python3 -m pip install ./artifact/wheel-artifact/opendr-toolkit-ambiguity-measure-*.tar.gz + python3 -m pip install --find-links ./artifact/wheel-artifact/ ./artifact/wheel-artifact/opendr-toolkit-hyperparameter-tuner-*.tar.gz + python3 -m pip install --find-links ./artifact/wheel-artifact/ ./artifact/wheel-artifact/opendr-toolkit-ambiguity-measure-*.tar.gz else # install required dependencies for derived tools, we do so manually to ensure the local one is used if [ ${{ matrix.package }} == "perception/fall_detection" ]; then - python3 -m pip install ./artifact/wheel-artifact/opendr-toolkit-pose-estimation-*.tar.gz + 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 ./artifact/wheel-artifact/opendr-toolkit-compressive-learning-*.tar.gz + python3 -m pip install --find-links ./artifact/wheel-artifact/ ./artifact/wheel-artifact/opendr-toolkit-compressive-learning-*.tar.gz elif [ ${{ matrix.package }} == "perception/multimodal_human_centric" ]; then - python3 -m pip install ./artifact/wheel-artifact/opendr-toolkit-compressive-learning-*.tar.gz - python3 -m pip install ./artifact/wheel-artifact/opendr-toolkit-object-detection-2d-*.tar.gz + 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 elif [ ${{ matrix.package }} == "perception/object_tracking_3d" ]; then - python3 -m pip install ./artifact/wheel-artifact/opendr-toolkit-object-detection-3d-*.tar.gz + python3 -m pip install --find-links ./artifact/wheel-artifact/ ./artifact/wheel-artifact/opendr-toolkit-object-detection-3d-*.tar.gz fi # install the package itself - python3 -m pip install ./artifact/wheel-artifact/opendr-toolkit-$package-*.tar.gz + python3 -m pip install --find-links ./artifact/wheel-artifact/ ./artifact/wheel-artifact/opendr-toolkit-$package-*.tar.gz fi - + if [[ ${{ matrix.package }} == "perception/object_detection_2d/retinaface" ]]; then cd src/opendr/perception/object_detection_2d/retinaface; make; cd $OPENDR_HOME fi @@ -401,9 +403,11 @@ jobs: - control/mobile_manipulation - control/single_demo_grasp - planning/end_to_end_planning - - control/multi_object_search + # - control/multi_object_search # needs CUDA Docker container runs-on: ubuntu-20.04 steps: + - name: Free Disk Space + uses: jlumbroso/free-disk-space@v1.2.0 - name: Download artifact uses: actions/download-artifact@v2 with: diff --git a/CHANGELOG.md b/CHANGELOG.md index bdf99fff80..169383c7fc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,10 +1,18 @@ # OpenDR Toolkit Change Log +## Version 2.2.0 +Released on May, 16th, 2023. + + - Dependency Updates ([#431](https://github.com/opendr-eu/opendr/pull/431)): + - Updated PyTorch version from 1.9.0 to 1.13.1. + - Updated Torchvision version from 0.10.0 to 0.14.1. + - Updated Torchaudio version from 0.9.0 to 0.13.1. + - Downgraded wheel version to 0.38.4 due to bug in recent version. + ## Version 2.1.0 Released on February, 22nd, 2023. - New Features: - - Added YOLOv5 as an inference-only tool ([#360](https://github.com/opendr-eu/opendr/pull/360)). - Added Efficient LiDAR Panoptic Segmentation ([#359](https://github.com/opendr-eu/opendr/pull/359)). - Added Nanodet 2D Object Detection tool ([#352](https://github.com/opendr-eu/opendr/pull/352)). - Added C API implementations of NanoDet 2D Object Detection tool ([#352](https://github.com/opendr-eu/opendr/pull/352)). diff --git a/docs/reference/index.md b/docs/reference/index.md index 300a9693c2..62101a63f8 100644 --- a/docs/reference/index.md +++ b/docs/reference/index.md @@ -1,6 +1,6 @@ # OpenDR Toolkit Reference Manual -*Release 2.1.0* +*Release 2.2.0*
diff --git a/docs/reference/installation.md b/docs/reference/installation.md index 10c8938cde..6698d69566 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.1.0 +sudo docker run -p 8888:8888 opendr/opendr-toolkit:cpu_v2.2.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.1.0 /bin/bash +sudo docker run -it opendr/opendr-toolkit:cpu_v2.2.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.1.0 /bin/bash +sudo docker run -it -v /tmp/.X11-unix:/tmp/.X11-unix -e DISPLAY=unix$DISPLAY opendr/opendr-toolkit:cpu_v2.2.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.1.0 +sudo docker run --gpus all -p 8888:8888 opendr/opendr-toolkit:cuda_v2.2.0 ``` or, for an interactive session: ```bash -sudo docker run --gpus all -it opendr/opendr-toolkit:cuda_v2.1.0 /bin/bash +sudo docker run --gpus all -it opendr/opendr-toolkit:cuda_v2.2.0 /bin/bash ``` In this case, do not forget to enable the virtual environment with: ```bash @@ -249,4 +249,4 @@ To use the docker on an embedded device with a monitor and a usb camera attached ``` xhost +local:root sudo docker run -it --privileged --network host -v /tmp/.X11-unix:/tmp/.X11-unix -e DISPLAY=unix$DSIPLAY -v /dev/video0:/dev/video0 opendr/opendr-toolkit:nx_v2 /bin/bash -``` \ No newline at end of file +``` diff --git a/projects/opendr_ws/src/opendr_bridge/package.xml b/projects/opendr_ws/src/opendr_bridge/package.xml index a3af22c792..c292a0debc 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.1.0 + 2.2.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 2cc9475e84..14085a0028 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.1.0 + 2.2.0 OpenDR's ROS nodes for data generation package OpenDR Project Coordinator Apache License v2.0 @@ -22,4 +22,3 @@ - diff --git a/projects/opendr_ws/src/opendr_perception/package.xml b/projects/opendr_ws/src/opendr_perception/package.xml index 51a2ed4939..ec8779a900 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.1.0 + 2.2.0 OpenDR's ROS nodes for perception package OpenDR Project Coordinator Apache License v2.0 @@ -25,4 +25,3 @@ - diff --git a/projects/opendr_ws/src/opendr_planning/package.xml b/projects/opendr_ws/src/opendr_planning/package.xml index 924647fed1..8729d66a62 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.1.0 + 2.2.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 07e536889a..92cfb597fc 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.1.0 + 2.2.0 OpenDR's ROS nodes for simulation package OpenDR Project Coordinator Apache License v2.0 @@ -23,4 +23,3 @@ - diff --git a/projects/opendr_ws_2/src/opendr_bridge/package.xml b/projects/opendr_ws_2/src/opendr_bridge/package.xml index 6c57ce332c..8885f5f33f 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.1.0 + 2.2.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 e5fbdd3f08..b6b6d6eb0d 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.1.0', + version='2.2.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 ac173cad2e..18eb967fdf 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.1.0 + 2.2.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 fba3558123..a7633bba5d 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.1.0', + version='2.2.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 12f8981888..5fa99dd88e 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.1.0 + 2.2.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 cbc4884b22..32c7c19813 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.1.0 + 2.2.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 a2a21291ee..e0c2454755 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.1.0', + version='2.2.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 911bb1d73e..3e121fe9a6 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.1.0 + 2.2.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 114001154f..6db08e9a4a 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.1.0', + version='2.2.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 0ac0562043..8553ea6ccb 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.1.0 + 2.2.0 OpenDR ROS2 nodes for the simulation package OpenDR Project Coordinator Apache License v2.0 @@ -29,8 +29,3 @@ ament_python - - - - - diff --git a/projects/opendr_ws_2/src/opendr_simulation/setup.py b/projects/opendr_ws_2/src/opendr_simulation/setup.py index 8a6db1324c..00173ac7fd 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.1.0', + version='2.2.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 26fb997c8e..60786c9b56 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.1.0 + 2.2.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 fe54265a15..e851203959 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.1.0 + 2.2.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 0190df43a6..f61d044d64 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.1.0" +__version__ = "2.2.0" diff --git a/tests/sources/tools/perception/object_tracking_2d/fair_mot/test_object_tracking_2d_fair_mot.py b/tests/sources/tools/perception/object_tracking_2d/fair_mot/test_object_tracking_2d_fair_mot.py index 6a265ce07b..475632fa18 100644 --- a/tests/sources/tools/perception/object_tracking_2d/fair_mot/test_object_tracking_2d_fair_mot.py +++ b/tests/sources/tools/perception/object_tracking_2d/fair_mot/test_object_tracking_2d_fair_mot.py @@ -91,6 +91,7 @@ def test_model(name): learner = ObjectTracking2DFairMotLearner( iters=1, + batch_size=2, num_epochs=1, checkpoint_after_iter=3, temp_path=self.temp_dir, @@ -122,6 +123,7 @@ def test_model(name): learner = ObjectTracking2DFairMotLearner( iters=1, + batch_size=2, num_epochs=1, checkpoint_after_iter=3, temp_path=self.temp_dir, @@ -154,6 +156,7 @@ def test_model(name): learner = ObjectTracking2DFairMotLearner( iters=1, + batch_size=2, num_epochs=1, checkpoint_after_iter=3, temp_path=self.temp_dir, @@ -175,6 +178,7 @@ def test_model(name): learner = ObjectTracking2DFairMotLearner( iters=1, + batch_size=2, num_epochs=1, checkpoint_after_iter=3, temp_path=self.temp_dir, @@ -204,6 +208,7 @@ def test_model(name): learner = ObjectTracking2DFairMotLearner( iters=1, + batch_size=2, num_epochs=1, checkpoint_after_iter=3, temp_path=self.temp_dir, @@ -216,6 +221,7 @@ def test_model(name): learner2 = ObjectTracking2DFairMotLearner( iters=1, + batch_size=2, num_epochs=1, checkpoint_after_iter=3, temp_path=self.temp_dir, @@ -235,6 +241,7 @@ def test_model(name): learner = ObjectTracking2DFairMotLearner( iters=1, + batch_size=2, num_epochs=1, checkpoint_after_iter=3, temp_path=self.temp_dir,