diff --git a/.github/workflows/ci_iron.yml b/.github/workflows/ci_iron.yml new file mode 100644 index 0000000..4d23679 --- /dev/null +++ b/.github/workflows/ci_iron.yml @@ -0,0 +1,43 @@ +name: ci_iron + +on: + push: + branches: + - "iron" + pull_request: + types: [opened, synchronize, labeled] + +jobs: + ci: + runs-on: ${{ matrix.os }} + if: | + ((github.event.action == 'labeled') && (github.event.label.name == 'TESTING')) || + ((github.event.action == 'synchronize') && contains(github.event.pull_request.labels.*.name, 'TESTING')) + container: + image: osrf/ros:${{ matrix.ros_distribution }}-desktop + timeout-minutes: 20 + strategy: + fail-fast: false + matrix: + os: [ubuntu-22.04] + ros_distribution: [iron] + steps: + - name: Install OpenVINO + run: | + sudo apt-get update + sudo apt-get install -y wget + wget https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB + sudo apt-key add GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB + echo "deb https://apt.repos.intel.com/openvino/2024 ubuntu22 main" | sudo tee /etc/apt/sources.list.d/intel-openvino-2024.list + sudo apt-get update + sudo apt install -y openvino-2024.3.0 + - uses: actions/checkout@v4 + - uses: ros-tooling/setup-ros@v0.7 + with: + required-ros-distributions: ${{ matrix.ros_distribution }} + - name: Build and Test + uses: ros-tooling/action-ros-ci@v0.3 + with: + target-ros2-distro: ${{ matrix.ros_distribution }} + skip-tests: true + extra-cmake-args: "-DYOLOX_USE_OPENVINO=True" \ No newline at end of file diff --git a/.github/workflows/ci_jazzy.yml b/.github/workflows/ci_jazzy.yml new file mode 100644 index 0000000..eaea030 --- /dev/null +++ b/.github/workflows/ci_jazzy.yml @@ -0,0 +1,43 @@ +name: ci_jazzy + +on: + push: + branches: + - "jazzy" + pull_request: + types: [opened, synchronize, labeled] + +jobs: + ci: + runs-on: ${{ matrix.os }} + if: | + ((github.event.action == 'labeled') && (github.event.label.name == 'TESTING')) || + ((github.event.action == 'synchronize') && contains(github.event.pull_request.labels.*.name, 'TESTING')) + container: + image: osrf/ros:${{ matrix.ros_distribution }}-desktop + timeout-minutes: 20 + strategy: + fail-fast: false + matrix: + os: [ubuntu-24.04] + ros_distribution: [jazzy] + steps: + - name: Install OpenVINO + run: | + sudo apt-get update + sudo apt-get install -y wget + wget https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB + sudo apt-key add GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB + echo "deb https://apt.repos.intel.com/openvino/2024 ubuntu24 main" | sudo tee /etc/apt/sources.list.d/intel-openvino-2024.list + sudo apt-get update + sudo apt install -y openvino-2024.3.0 + - uses: actions/checkout@v4 + - uses: ros-tooling/setup-ros@v0.7 + with: + required-ros-distributions: ${{ matrix.ros_distribution }} + - name: Build and Test + uses: ros-tooling/action-ros-ci@v0.3 + with: + target-ros2-distro: ${{ matrix.ros_distribution }} + skip-tests: true + extra-cmake-args: "-DYOLOX_USE_OPENVINO=True" \ No newline at end of file diff --git a/README.md b/README.md index 86ffd02..18a09fc 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # YOLOX-ROS -[YOLOX](https://github.com/Megvii-BaseDetection/YOLOX) + ROS2 Humble demo +[YOLOX](https://github.com/Megvii-BaseDetection/YOLOX) + ROS2 Iron demo ![yolox_s_result](https://github.com/Ar-Ray-code/RenderTexture2ROS2Image/blob/main/images_for_readme/unity-demo.gif?raw=true) @@ -8,6 +8,10 @@ ## Supported List +![Iron](https://github.com/Ar-Ray-code/YOLOX-ROS/actions/workflows/iron.yml/badge.svg) + +![Jazzy](https://github.com/Ar-Ray-code/YOLOX-ROS/actions/workflows/jazzy.yml/badge.svg) + | Base | ROS2 C++ | | --------------- | -------- | diff --git a/yolox_ros_cpp/README.md b/yolox_ros_cpp/README.md index 4bddad8..d368dae 100644 --- a/yolox_ros_cpp/README.md +++ b/yolox_ros_cpp/README.md @@ -1,8 +1,8 @@ # YOLOX-ROS-CPP ## Requirements -- ROS2 Humble - - ros-humble-generate-parameter-library +- ROS2 Iron + - ros-iron-generate-parameter-library - OpenCV 4.x - OpenVINO 2024.* - TensorRT 10.x * @@ -21,7 +21,7 @@ ## Clone YOLOX-ROS ```bash cd ~/ros2_ws/src -git clone --recursive https://github.com/Ar-Ray-code/YOLOX-ROS -b humble +git clone --recursive https://github.com/Ar-Ray-code/YOLOX-ROS -b iron ``` ## Model Convert or Download diff --git a/yolox_ros_cpp/yolox_ros_cpp/include/yolox_ros_cpp/yolox_ros_cpp.hpp b/yolox_ros_cpp/yolox_ros_cpp/include/yolox_ros_cpp/yolox_ros_cpp.hpp index 98556bc..06d1739 100644 --- a/yolox_ros_cpp/yolox_ros_cpp/include/yolox_ros_cpp/yolox_ros_cpp.hpp +++ b/yolox_ros_cpp/yolox_ros_cpp/include/yolox_ros_cpp/yolox_ros_cpp.hpp @@ -4,7 +4,7 @@ #include #include -#include +#include #include #include