Merge master into develop branch

.github/workflows/test_packages.yml

@@ -7,21 +7,17 @@ on:
   schedule:
     - cron:  '0 23 * * *'
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 defaults:
   run:
     shell: bash
 
 
 jobs:
-  cleanup-runs:
-    if: ${{ contains(github.event.pull_request.labels.*.name, 'test packages') || github.event_name == 'schedule' }}
-    runs-on: ubuntu-latest
-    steps:
-    - uses: rokroskar/workflow-run-cleanup-action@master
-      env:
-        GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
   test-wheel:
-    needs: cleanup-runs
     if: ${{ contains(github.event.pull_request.labels.*.name, 'test packages') || github.event_name == 'schedule' }}
     strategy:
       matrix:
@@ -70,7 +66,6 @@ jobs:
         pip install opendr-toolkit
         python -m unittest discover -s tests/sources/tools/${{ matrix.package }}
   test-docker:
-    needs: cleanup-runs
     if: ${{ contains(github.event.pull_request.labels.*.name, 'test packages') || github.event_name == 'schedule' }}
     strategy:
       matrix:

.github/workflows/tests_suite.yml

@@ -6,20 +6,16 @@ on:
   schedule:
     - cron:  '0 23 * * *'
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 defaults:
   run:
     shell: bash
 
 jobs:
-  cleanup-runs:
-    if: ${{ contains(github.event.pull_request.labels.*.name, 'test sources') || contains(github.event.pull_request.labels.*.name, 'test tools') || contains(github.event.pull_request.labels.*.name, 'test release') || github.event_name == 'schedule' }}
-    runs-on: ubuntu-latest
-    steps:
-    - uses: rokroskar/workflow-run-cleanup-action@master
-      env:
-        GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
   test-sources:
-    needs: cleanup-runs
     if: ${{ contains(github.event.pull_request.labels.*.name, 'test sources') || github.event_name == 'schedule' }}
     strategy:
       matrix:
@@ -51,9 +47,9 @@ jobs:
         pip install -r tests/requirements.txt
         python -m unittest discover -s tests
   test-tools:
-    needs: cleanup-runs
     if: ${{ contains(github.event.pull_request.labels.*.name, 'test tools') || github.event_name == 'schedule' }}
     strategy:
+      fail-fast: false
       matrix:
         os: [ubuntu-20.04]
         package:
@@ -115,7 +111,6 @@ jobs:
             python -m unittest discover -s tests/sources/tools/${{ matrix.package }}
         fi
   build-wheel:
-    needs: cleanup-runs
     if: ${{ contains(github.event.pull_request.labels.*.name, 'test release') || github.event_name == 'schedule' }}
     runs-on: ubuntu-20.04
     steps:
@@ -140,7 +135,6 @@ jobs:
         path:
           dist/*.tar.gz
   build-docker:
-    needs: cleanup-runs
     if: ${{ contains(github.event.pull_request.labels.*.name, 'test release') || github.event_name == 'schedule' }}
     runs-on: ubuntu-20.04
     steps:
@@ -164,6 +158,7 @@ jobs:
     needs: build-wheel
     if: ${{ contains(github.event.pull_request.labels.*.name, 'test release') || github.event_name == 'schedule' }}
     strategy:
+      fail-fast: false
       matrix:
         os: [ubuntu-20.04]
         package:
@@ -235,6 +230,7 @@ jobs:
     needs: build-wheel
     if: ${{ contains(github.event.pull_request.labels.*.name, 'test release') || github.event_name == 'schedule' }}
     strategy:
+      fail-fast: false
       matrix:
         os: [ubuntu-20.04]
         package:
@@ -312,6 +308,7 @@ jobs:
     needs: build-docker
     if: ${{ contains(github.event.pull_request.labels.*.name, 'test release') || github.event_name == 'schedule' }}
     strategy:
+      fail-fast: false
       matrix:
         os: [ubuntu-20.04]
         package:

.github/workflows/tests_suite_develop.yml

@@ -6,20 +6,16 @@ on:
   schedule:
     - cron:  '0 23 * * *'
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 defaults:
   run:
     shell: bash
 
 jobs:
-  cleanup-runs:
-    if: ${{ contains(github.event.pull_request.labels.*.name, 'test sources') || contains(github.event.pull_request.labels.*.name, 'test tools') || contains(github.event.pull_request.labels.*.name, 'test release') || github.event_name == 'schedule' }}
-    runs-on: ubuntu-latest
-    steps:
-    - uses: rokroskar/workflow-run-cleanup-action@master
-      env:
-        GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
   test-sources:
-    needs: cleanup-runs
     if: ${{ contains(github.event.pull_request.labels.*.name, 'test sources') || github.event_name == 'schedule' }}
     strategy:
       matrix:
@@ -52,9 +48,9 @@ jobs:
         pip install -r tests/requirements.txt
         python -m unittest discover -s tests
   test-tools:
-    needs: cleanup-runs
     if: ${{ contains(github.event.pull_request.labels.*.name, 'test tools') || github.event_name == 'schedule' }}
     strategy:
+      fail-fast: false
       matrix:
         os: [ubuntu-20.04]
         package:
@@ -117,7 +113,6 @@ jobs:
             python -m unittest discover -s tests/sources/tools/${{ matrix.package }}
         fi
   build-wheel:
-    needs: cleanup-runs
     if: ${{ contains(github.event.pull_request.labels.*.name, 'test release') || github.event_name == 'schedule' }}
     runs-on: ubuntu-20.04
     steps:
@@ -143,7 +138,6 @@ jobs:
         path:
           dist/*.tar.gz
   build-docker:
-    needs: cleanup-runs
     if: ${{ contains(github.event.pull_request.labels.*.name, 'test release') || github.event_name == 'schedule' }}
     runs-on: ubuntu-20.04
     steps:
@@ -168,6 +162,7 @@ jobs:
     needs: build-wheel
     if: ${{ contains(github.event.pull_request.labels.*.name, 'test release') || github.event_name == 'schedule' }}
     strategy:
+      fail-fast: false
       matrix:
         os: [ubuntu-20.04]
         package:
@@ -230,16 +225,17 @@ jobs:
           fi
           echo "Installing $package package"
           if [ "$package" == "opendr" ]; then
-            pip install ./artifact/artifact/opendr-toolkit-*.tar.gz
+            pip install ./artifact/wheel-artifact/opendr-toolkit-*.tar.gz
           else
-            pip install ./artifact/artifact/opendr-toolkit-$package-*.tar.gz
+            pip install ./artifact/wheel-artifact/opendr-toolkit-$package-*.tar.gz
           fi
         done < packages.txt
         python -m unittest discover -s tests/sources/tools/${{ matrix.package }}
   test-wheel-separate:
     needs: build-wheel
     if: ${{ contains(github.event.pull_request.labels.*.name, 'test release') || github.event_name == 'schedule' }}
     strategy:
+      fail-fast: false
       matrix:
         os: [ubuntu-20.04]
         package:
@@ -294,11 +290,11 @@ jobs:
         source venv/bin/activate
         pip install wheel
         # Install engine and requirements for other packages
-        pip install ./artifact/artifact/opendr-toolkit-engine-*.tar.gz
+        pip install ./artifact/wheel-artifact/opendr-toolkit-engine-*.tar.gz
         # The following two are dependecies for some other packages and pip cannot automatically install them if they are not on a repo
-        pip install ./artifact/artifact/opendr-toolkit-compressive-learning-*.tar.gz
-        pip install ./artifact/artifact/opendr-toolkit-object-detection-2d-*.tar.gz
-
+        pip install ./artifact/wheel-artifact/opendr-toolkit-compressive-learning-*.tar.gz
+        pip install ./artifact/wheel-artifact/opendr-toolkit-object-detection-2d-*.tar.gz
+        pip install ./artifact/wheel-artifact/opendr-toolkit-pose-estimation-*.tar.gz
         # Install specific package for testing
         package=$(sed "s/_/-/g" <<< ${{ matrix.package }})
         arr=(${package//// })
@@ -308,16 +304,16 @@ jobs:
         echo "Installing $package package"
         # Utils contains hyperparameter tuning
         if [ "$package" == "utils" ]; then
-              pip install ./artifact/artifact/opendr-toolkit-hyperparameter-tuner-*.tar.gz
-
+              pip install ./artifact/wheel-artifact/opendr-toolkit-hyperparameter-tuner-*.tar.gz
         else
-              pip install ./artifact/artifact/opendr-toolkit-$package-*.tar.gz
+              pip install ./artifact/wheel-artifact/opendr-toolkit-$package-*.tar.gz
         fi
         python -m unittest discover -s tests/sources/tools/${{ matrix.package }}
   test-docker:
     needs: build-docker
     if: ${{ contains(github.event.pull_request.labels.*.name, 'test release') || github.event_name == 'schedule' }}
     strategy:
+      fail-fast: false
       matrix:
         os: [ubuntu-20.04]
         package:

CHANGELOG.md

@@ -1,7 +1,14 @@
 # OpenDR Toolkit Change Log
 
-## Version 1.X
-Released on XX, XXth, 2022.
+## Version 1.1.1
+Released on June, 30th, 2022.
+
+  - Bug Fixes:
+    - Fix Efficient Panoptic Segmentation submodule commit ([#268](https://github.com/opendr-eu/opendr/pull/268)).
+    - Fix Face Recognition compilation error ([#267](https://github.com/opendr-eu/opendr/pull/267)).
+
+## Version 1.1.0
+Released on June, 14th, 2022.
 
   - New Features:
     - Added end-to-end planning tool ([#223](https://github.com/opendr-eu/opendr/pull/223)).

bin/install.sh

@@ -51,7 +51,7 @@ if [[ "${OPENDR_DEVICE}" == "gpu" ]]; then
   echo "[INFO] Replacing torch==1.9.0+cu111 to enable CUDA acceleration."
   pip3 install torch==1.9.0+cu111 torchvision==0.10.0+cu111 torchaudio==0.9.0 -f https://download.pytorch.org/whl/torch_stable.html
   echo "[INFO] Reinstalling detectronv2."
-  pip3 install 'git+https://github.com/facebookresearch/detectron2.git'
+  pip3 install 'git+https://github.com/facebookresearch/detectron2.git@5aeb252b194b93dc2879b4ac34bc51a31b5aee13'
 fi
 
 make libopendr

docs/reference/installation.md

@@ -64,6 +64,10 @@ pip install mxnet-cu112==1.8.0post0
 pip install opendr-toolkit-engine
 pip install opendr-toolkit
 ```
+If you encounter any issue installing the latest version of detectron, then you can try installing a previous commit:
+```bash
+pip install 'git+https://github.com/facebookresearch/detectron2.git@5aeb252b194b93dc2879b4ac34bc51a31b5aee13'
+```
 
 ## Installing only a *particular* tool using *pip* (CPU/GPU)
 

projects/data_generation/synthetic_multi_view_facial_image_generation/requirements.txt

@@ -2,7 +2,7 @@ torch>=1.0.0
 torchvision
 dominate>=2.3.1
 dill
-scikit-image
+scikit-image>0.16.2
 numpy>=1.15.4
 scipy>=1.1.0
 matplotlib>=2.2.2

projects/opendr_ws/src/data_generation/package.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="2">
   <name>data_generation</name>
-  <version>1.0.0</version>
+  <version>1.1.1</version>
   <description>OpenDR's ROS nodes for data generation package</description>
   <maintainer email="[email protected]">OpenDR Project Coordinator</maintainer>
   <license>Apache License v2.0 </license>

projects/opendr_ws/src/perception/package.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="2">
   <name>perception</name>
-  <version>1.0.0</version>
+  <version>1.1.1</version>
   <description>OpenDR's ROS nodes for perception package</description>
   <maintainer email="[email protected]">OpenDR Project Coordinator</maintainer>
   <license>Apache License v2.0 </license>

projects/opendr_ws/src/ros_bridge/package.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="2">
   <name>ros_bridge</name>
-   <version>1.0.0</version>
+   <version>1.1.1</version>
   <description>OpenDR ros_bridge package. This package provides a way to translate ROS messages into OpenDR data types
       and vice versa.
   </description>

projects/opendr_ws/src/simulation/package.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="2">
   <name>simulation</name>
-  <version>1.0.0</version>
+  <version>1.1.1</version>
   <description>OpenDR's ROS nodes for simulation package</description>
   <maintainer email="[email protected]">OpenDR Project Coordinator</maintainer>
   <license>Apache License v2.0 </license>

projects/perception/slam/full_map_posterior_gmapping/src/fmp_slam_eval/package.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="2">
   <name>fmp_slam_eval</name>
-  <version>1.0.0</version>
+  <version>1.1.1</version>
   <description>FMP SLAM Evaluation Package</description>
 
   <maintainer email="[email protected]">Jose Arce</maintainer>

projects/perception/slam/full_map_posterior_gmapping/src/map_simulator/package.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="2">
   <name>map_simulator</name>
-  <version>1.0.0</version>
+  <version>1.1.1</version>
   <description>The 2D Map Simulator package for generating datasets for testing and evaluating SLAM algorithms</description>
 
   <maintainer email="[email protected]">Jose Arce</maintainer>

src/c_api/face_recognition.cpp

@@ -289,20 +289,20 @@ void build_database_face_recognition(const char *database_folder, const char *ou
   // Write number of persons
   int n = person_names.size();
 
-  fout.write(static_cast<char *>(&n), sizeof(int));
+  fout.write(reinterpret_cast<char *>(&n), sizeof(int));
   for (int i = 0; i < n; i++) {
     // Write the name of the person (along with its size)
     int name_length = person_names[i].size() + 1;
-    fout.write(static_cast<char *>(&name_length), sizeof(int));
+    fout.write(reinterpret_cast<char *>(&name_length), sizeof(int));
     fout.write(person_names[i].c_str(), name_length);
   }
 
   cv::Size s = database_out.size();
 
-  fout.write(static_cast<char *>(&s.height), sizeof(int));
-  fout.write(static_cast<char *>(&s.width), sizeof(int));
-  fout.write(static_cast<char *>(database_out.data), sizeof(float) * s.height * s.width);
-  fout.write(static_cast<char *>(&database_ids[0]), sizeof(int) * s.height);
+  fout.write(reinterpret_cast<char *>(&s.height), sizeof(int));
+  fout.write(reinterpret_cast<char *>(&s.width), sizeof(int));
+  fout.write(reinterpret_cast<char *>(database_out.data), sizeof(float) * s.height * s.width);
+  fout.write(reinterpret_cast<char *>(&database_ids[0]), sizeof(int) * s.height);
   fout.flush();
   fout.close();
 }
@@ -318,14 +318,14 @@ void load_database_face_recognition(const char *database_path, face_recognition_
     return;
   }
   int n;
-  fin.read(static_cast<char *>(&n), sizeof(int));
+  fin.read(reinterpret_cast<char *>(&n), sizeof(int));
   char **person_names = new char *[n];
 
   for (int i = 0; i < n; i++) {
     person_names[i] = new char[512];
     // Read person name
     int name_length;
-    fin.read(static_cast<char *>(&name_length), sizeof(int));
+    fin.read(reinterpret_cast<char *>(&name_length), sizeof(int));
     if (name_length > 512) {
       std::cerr << "Person name exceeds max number of characters (512)" << std::endl;
       return;
@@ -334,13 +334,13 @@ void load_database_face_recognition(const char *database_path, face_recognition_
   }
 
   int height, width;
-  fin.read(static_cast<char *>(&height), sizeof(int));
-  fin.read(static_cast<char *>(&width), sizeof(int));
+  fin.read(reinterpret_cast<char *>(&height), sizeof(int));
+  fin.read(reinterpret_cast<char *>(&width), sizeof(int));
 
   float *database_buff = new float[height * width];
   int *features_ids = new int[height];
-  fin.read(static_cast<char *>(database_buff), sizeof(float) * height * width);
-  fin.read(static_cast<char *>(features_ids), sizeof(int) * height);
+  fin.read(reinterpret_cast<char *>(database_buff), sizeof(float) * height * width);
+  fin.read(reinterpret_cast<char *>(features_ids), sizeof(int) * height);
 
   fin.close();
 

src/opendr/_version.py

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "1.0.0"
+__version__ = "1.1.1"