Skip to content

Commit 58bcdae

Browse files
authored
Fix retinanet wrong visualization with torch1.13+openvino (#1977)
* fix * fix ci * fix dead links
1 parent 4bb9bc7 commit 58bcdae

File tree

10 files changed

+24
-23
lines changed

10 files changed

+24
-23
lines changed

.circleci/test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ commands:
8585
cd mmdeploy
8686
python -m mim install -r requirements/codebases.txt
8787
python -m pip install -r requirements.txt
88-
python -m pip install -U numpy clip numba
88+
python -m pip install -U numpy clip numba transformers
8989
cd ..
9090
perform_model_converter_ut:
9191
steps:
@@ -145,7 +145,7 @@ jobs:
145145
docker exec mmdeploy pip install onnxruntime==1.8.1
146146
docker exec mmdeploy mim install -r mmdeploy/requirements/codebases.txt
147147
docker exec mmdeploy pip install -r mmdeploy/requirements.txt
148-
docker exec mmdeploy pip install -U numpy clip numba
148+
docker exec mmdeploy pip install -U numpy clip numba transformers
149149
- run:
150150
name: Perform Model Converter unittests
151151
command: |

.github/workflows/backend-ort.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ concurrency:
1717
cancel-in-progress: true
1818

1919
jobs:
20-
buils_ort:
20+
build_ort:
2121
runs-on: ubuntu-20.04
2222
strategy:
2323
matrix:

.github/workflows/build.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
python -m pip install -r requirements/backends.txt
5050
python -m mim install "mmcv>=2.0.0rc1"
5151
python -m mim install -r requirements/codebases.txt
52-
python -m pip install -U numpy clip numba
52+
python -m pip install -U numpy clip numba transformers
5353
python -m pip list
5454
- name: Install mmyolo
5555
run: |
@@ -149,7 +149,7 @@ jobs:
149149
python -m pip install -r requirements/backends.txt
150150
python -m mim install "mmcv>=2.0.0rc1"
151151
CFLAGS=$CFLAGS python -m mim install -r requirements/codebases.txt
152-
python -m pip install -U pycuda numpy clip numba
152+
python -m pip install -U pycuda numpy clip numba transformers
153153
python -m pip list
154154
- name: Build and install
155155
run: |
@@ -194,7 +194,7 @@ jobs:
194194
python -m pip install -r requirements/backends.txt
195195
python -m mim install "mmcv>=2.0.0rc1"
196196
python -m mim install -r requirements/codebases.txt
197-
python -m pip install -U pycuda numpy clip numba
197+
python -m pip install -U pycuda numpy clip numba transformers
198198
python -m pip list
199199
- name: Build and install
200200
run: |
@@ -232,7 +232,7 @@ jobs:
232232
apt update && apt install unzip
233233
python3 -V
234234
python3 -m pip install opencv-python==4.5.4.60 opencv-python-headless==4.5.4.60 opencv-contrib-python==4.5.4.60
235-
python3 -m pip install openmim numpy pycuda clip
235+
python3 -m pip install openmim numpy pycuda clip transformers
236236
python3 -m pip install -r requirements.txt
237237
python3 -m mim install $(cat requirements/codebases.txt | grep mmcls)
238238
python3 -m pip list

docs/en/04-supported-codebases/mmaction2.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ ______________________________________________________________________
2121

2222
### Install mmaction2
2323

24-
Please follow the [installation guide](https://github.com/open-mmlab/mmaction2/tree/1.x#installation) to install mmaction2.
24+
Please follow the [installation guide](https://github.com/open-mmlab/mmaction2/tree/main#installation) to install mmaction2.
2525

2626
### Install mmdeploy
2727

@@ -184,7 +184,7 @@ Besides python API, mmdeploy SDK also provides other FFI (Foreign Function Inter
184184
185185
## Supported models
186186

187-
| Model | TorchScript | ONNX Runtime | TensorRT | ncnn | PPLNN | OpenVINO |
188-
| :---------------------------------------------------------------------------------------- | :---------: | :----------: | :------: | :--: | :---: | :------: |
189-
| [TSN](https://github.com/open-mmlab/mmaction2/tree/1.x/configs/recognition/tsn) | N | Y | Y | N | N | N |
190-
| [SlowFast](https://github.com/open-mmlab/mmaction2/tree/1.x/configs/recognition/slowfast) | N | Y | Y | N | N | N |
187+
| Model | TorchScript | ONNX Runtime | TensorRT | ncnn | PPLNN | OpenVINO |
188+
| :----------------------------------------------------------------------------------------- | :---------: | :----------: | :------: | :--: | :---: | :------: |
189+
| [TSN](https://github.com/open-mmlab/mmaction2/tree/main/configs/recognition/tsn) | N | Y | Y | N | N | N |
190+
| [SlowFast](https://github.com/open-mmlab/mmaction2/tree/main/configs/recognition/slowfast) | N | Y | Y | N | N | N |

docs/en/04-supported-codebases/mmocr.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ ______________________________________________________________________
2424

2525
### Install mmocr
2626

27-
Please follow the [installation guide](https://mmocr.readthedocs.io/en/latest/install.html) to install mmocr.
27+
Please follow the [installation guide](https://mmocr.readthedocs.io/en/latest/get_started/install.html) to install mmocr.
2828

2929
### Install mmdeploy
3030

docs/en/07-developer-guide/architecture.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ Operators customized for ncnn are in the `csrc/mmdeploy/backend_ops/ncnn/` direc
9393

9494
- topk
9595
- tensorslice
96-
- shpe
96+
- shape
9797
- gather
9898
- expand
9999
- constantofshape

docs/zh_cn/04-supported-codebases/mmaction2.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ ______________________________________________________________________
2121

2222
### 安装 mmaction2
2323

24-
请参考[官网安装指南](https://github.com/open-mmlab/mmaction2/tree/1.x#installation).
24+
请参考[官网安装指南](https://github.com/open-mmlab/mmaction2/tree/main#installation).
2525

2626
### 安装 mmdeploy
2727

@@ -187,7 +187,7 @@ for label_id, score in result:
187187
188188
## 模型支持列表
189189

190-
| Model | TorchScript | ONNX Runtime | TensorRT | ncnn | PPLNN | OpenVINO |
191-
| :---------------------------------------------------------------------------------------- | :---------: | :----------: | :------: | :--: | :---: | :------: |
192-
| [TSN](https://github.com/open-mmlab/mmaction2/tree/1.x/configs/recognition/tsn) | N | Y | Y | N | N | N |
193-
| [SlowFast](https://github.com/open-mmlab/mmaction2/tree/1.x/configs/recognition/slowfast) | N | Y | Y | N | N | N |
190+
| Model | TorchScript | ONNX Runtime | TensorRT | ncnn | PPLNN | OpenVINO |
191+
| :----------------------------------------------------------------------------------------- | :---------: | :----------: | :------: | :--: | :---: | :------: |
192+
| [TSN](https://github.com/open-mmlab/mmaction2/tree/main/configs/recognition/tsn) | N | Y | Y | N | N | N |
193+
| [SlowFast](https://github.com/open-mmlab/mmaction2/tree/main/configs/recognition/slowfast) | N | Y | Y | N | N | N |

docs/zh_cn/04-supported-codebases/mmocr.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ ______________________________________________________________________
2424

2525
### 安装 mmocr
2626

27-
请参考[官网安装指南](https://mmocr.readthedocs.io/en/latest/install.html).
27+
请参考[官网安装指南](https://mmocr.readthedocs.io/en/latest/get_started/install.html).
2828

2929
### 安装 mmdeploy
3030

docs/zh_cn/07-developer-guide/architecture.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ $ tree -L 1
9393

9494
- topk
9595
- tensorslice
96-
- shpe
96+
- shape
9797
- gather
9898
- expand
9999
- constantofshape

mmdeploy/codebase/mmdet/models/task_modules/coders/delta_xywh_bbox_coder.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,9 @@ def delta2bbox(rois,
101101
dxy = denorm_deltas[..., :2]
102102
dwh = denorm_deltas[..., 2:]
103103

104-
xy1 = rois[..., None, :2]
105-
xy2 = rois[..., None, 2:]
104+
# fix openvino on torch1.13
105+
xy1 = rois[..., :2].unsqueeze(2)
106+
xy2 = rois[..., 2:].unsqueeze(2)
106107

107108
pxy = (xy1 + xy2) * 0.5
108109
pwh = xy2 - xy1

0 commit comments

Comments
 (0)