From 709c1313e839691cc8ae24d41b0e62c5c6694cb9 Mon Sep 17 00:00:00 2001 From: Chen Bainian Date: Wed, 7 Feb 2024 12:04:48 +0800 Subject: [PATCH 1/6] Update onnx model paths Signed-off-by: Chen Bainian --- easy_perception_deployment/CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/easy_perception_deployment/CMakeLists.txt b/easy_perception_deployment/CMakeLists.txt index 3b048e3..bec2401 100644 --- a/easy_perception_deployment/CMakeLists.txt +++ b/easy_perception_deployment/CMakeLists.txt @@ -51,12 +51,12 @@ if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/data/model/MaskRCNN-10.onnx") message(AUTHOR_WARNING "Pretrained models are downloaded.") else() message(AUTHOR_WARNING "Downloading pretrained ONNX model from ONNX Model Zoo.") - file(DOWNLOAD https://github.com/onnx/models/raw/master/vision/classification/squeezenet/model/squeezenet1.1-7.onnx + file(DOWNLOAD https://github.com/onnx/models/raw/main/validated/vision/classification/squeezenet/model/squeezenet1.1-7.onnx ${CMAKE_CURRENT_LIST_DIR}/data/model/squeezenet1.1-7.onnx) - file(DOWNLOAD https://github.com/onnx/models/raw/main/vision/object_detection_segmentation/faster-rcnn/model/FasterRCNN-10.onnx + file(DOWNLOAD https://github.com/onnx/models/raw/main/validated/vision/object_detection_segmentation/faster-rcnn/model/FasterRCNN-10.onnx ${CMAKE_CURRENT_LIST_DIR}/data/model/FasterRCNN-10.onnx) file(DOWNLOAD - https://github.com/onnx/models/raw/main/vision/object_detection_segmentation/mask-rcnn/model/MaskRCNN-10.onnx + https://github.com/onnx/models/raw/main/validated/vision/object_detection_segmentation/mask-rcnn/model/MaskRCNN-10.onnx ${CMAKE_CURRENT_LIST_DIR}/data/model/MaskRCNN-10.onnx) endif() From e172d8f4bff68149215966cb78e83b944c67ba25 Mon Sep 17 00:00:00 2001 From: Chen Bainian Date: Wed, 7 Feb 2024 12:15:43 +0800 Subject: [PATCH 2/6] Update path for eps_onnxruntime_vendor Signed-off-by: Chen Bainian --- onnxruntime.repos | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/onnxruntime.repos b/onnxruntime.repos index bbbdb8d..05bfc59 100644 --- a/onnxruntime.repos +++ b/onnxruntime.repos @@ -1,5 +1,5 @@ repositories: epd_onnxruntime_vendor: type: git - url: https://github.com/Briancbn/epd_onnxruntime_vendor + url: https://github.com/ros-industrial/epd_onnxruntime_vendor version: main From c075ca1ee09328d72ada7fc0832922b5ce54f19b Mon Sep 17 00:00:00 2001 From: Chen Bainian Date: Wed, 7 Feb 2024 12:16:16 +0800 Subject: [PATCH 3/6] Renew token and move them to secrets instead Signed-off-by: Chen Bainian --- .github/workflows/industrial_ci_action.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/industrial_ci_action.yml b/.github/workflows/industrial_ci_action.yml index a80dfb5..2bd4d44 100644 --- a/.github/workflows/industrial_ci_action.yml +++ b/.github/workflows/industrial_ci_action.yml @@ -17,7 +17,6 @@ jobs: # Use custom public docker image UPSTREAM_WORKSPACE: onnxruntime.repos ISOLATION: docker - CODECOV_TOKEN: b56af58a-9b3b-49a9-800d-65746dbfb346 runs-on: ubuntu-20.04 steps: @@ -31,4 +30,6 @@ jobs: - uses: 'cardboardcode/industrial_ci@pr-coverage' env: ${{ matrix.env }} # Generate and upload code coverage report to codecov. - - uses: codecov/codecov-action@v1.0.6 + - uses: codecov/codecov-action@v3 + with: + token: ${{ secrets.CODECOV_TOKEN }} From 8bf775bb71f1db2bcfd705bddc97090b922076a8 Mon Sep 17 00:00:00 2001 From: Carlo Wiesse <41552909+carlowiesse@users.noreply.github.com> Date: Tue, 6 Feb 2024 22:26:51 +0800 Subject: [PATCH 4/6] Update gui_ci_action.yml Signed-off-by: Chen Bainian Fixed broken CI due to problematic python library versions on pip --- .github/workflows/gui_ci_action.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/gui_ci_action.yml b/.github/workflows/gui_ci_action.yml index 45cf854..8e6478a 100644 --- a/.github/workflows/gui_ci_action.yml +++ b/.github/workflows/gui_ci_action.yml @@ -25,11 +25,11 @@ jobs: pip install pycodestyle pip install PySide2==5.15.0 pip install dateutils==0.6.12 - pip install pycocotools==2.0.2 + pip install pycocotools==2.0.5 pip install labelme==5.0.1 pip install pytest==6.0.1 pip install pytest-qt==3.3.0 - pip install pyyaml==5.3.1 + pip install pyyaml==5.4.1 - name: Static Analysis run: | pycodestyle --show-source easy_perception_deployment/gui/main.py \ From c9b5bd5dbee4295c6e46489f56a68b3a4ceec797 Mon Sep 17 00:00:00 2001 From: Chen Bainian Date: Wed, 7 Feb 2024 12:58:52 +0800 Subject: [PATCH 5/6] Disable codecov checks Signed-off-by: Chen Bainian --- codecov.yaml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 codecov.yaml diff --git a/codecov.yaml b/codecov.yaml new file mode 100644 index 0000000..6586cd9 --- /dev/null +++ b/codecov.yaml @@ -0,0 +1,4 @@ +coverage: + status: + patch: false + project: false From fd2c9f47d70aaed4ef7c2f7ac2a1750845ff4ea9 Mon Sep 17 00:00:00 2001 From: Chen Bainian Date: Wed, 7 Feb 2024 12:59:19 +0800 Subject: [PATCH 6/6] Update codecov badge icon Signed-off-by: Chen Bainian --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3b6953b..d7288c3 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ # **easy_perception_deployment** [![CI](https://github.com/ros-industrial/easy_perception_deployment/actions/workflows/industrial_ci_action.yml/badge.svg)](https://github.com/ros-industrial/easy_perception_deployment/actions/workflows/industrial_ci_action.yml) -[![codecov](https://codecov.io/gh/cardboardcode/easy_perception_deployment/branch/master/graph/badge.svg)](https://codecov.io/gh/cardboardcode/easy_perception_deployment) +[![codecov](https://codecov.io/gh/ros-industrial/easy_perception_deployment/branch/master/graph/badge.svg)](https://codecov.io/gh/ros-industrial/easy_perception_deployment) [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) [![Documentation Status](https://readthedocs.org/projects/epd-docs/badge/?version=latest)](https://epd-docs.readthedocs.io/en/latest/?badge=latest)