Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
  • Loading branch information
RunningLeon committed Dec 21, 2023
1 parent b856b42 commit 962a828
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 8 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
python -m pip install openmim
python -m pip install -r requirements.txt
python -m pip install -r requirements/backends.txt
python -m mim install "mmcv>=2.0.0"
python -m mim install "mmcv==2.0.1"
python -m mim install -r requirements/codebases.txt
python -m pip install clip numba transformers numpy==1.23 albumentations
python -m pip list
Expand Down Expand Up @@ -178,7 +178,7 @@ jobs:
python -m pip install --no-cache-dir openmim
python -m pip install --no-cache-dir -r requirements.txt
python -m pip install --no-cache-dir -r requirements/backends.txt
python -m mim install "mmcv>=2.0.0"
python -m mim install "mmcv==2.0.1"
python -m pip install --no-cache-dir -r requirements/codebases.txt
python -m pip install --no-cache-dir -U pycuda numpy==1.23 clip numba transformers albumentations
python -m pip list
Expand Down Expand Up @@ -243,7 +243,7 @@ jobs:
python -m pip install --no-cache-dir openmim
python -m pip install --no-cache-dir -r requirements.txt
python -m pip install --no-cache-dir -r requirements/backends.txt
python -m mim install --no-cache-dir "mmcv>=2.0.0"
python -m mim install --no-cache-dir "mmcv==2.0.1"
python -m pip install --no-cache-dir -r requirements/codebases.txt
python -m pip install --no-cache-dir -U pycuda numpy clip numba transformers albumentations
python -m pip list
Expand Down
2 changes: 1 addition & 1 deletion docs/en/01-how-to-build/rockchip.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ It is recommended to create a virtual environment for the project.
git clone [email protected]:rockchip-linux/rknn-toolkit2.git
```

2. Install RKNN python package following [rknn-toolkit2 doc](https://github.com/rockchip-linux/rknn-toolkit2/tree/master/doc) or [rknn-toolkit doc](https://github.com/rockchip-linux/rknn-toolkit/tree/master/doc). When installing rknn python package, it is better to append `--no-deps` after the commands to avoid dependency conflicts. RKNN-Toolkit2 package for example:
2. Install RKNN python package following [rknn-toolkit2 doc](https://github.com/rockchip-linux/rknn-toolkit2/tree/master/doc) or [rknn-toolkit doc](https://github.com/rockchip-linux/rknn-toolkit/tree/master/docs). When installing rknn python package, it is better to append `--no-deps` after the commands to avoid dependency conflicts. RKNN-Toolkit2 package for example:

```
pip install packages/rknn_toolkit2-1.4.0_22dcfef4-cp36-cp36m-linux_x86_64.whl --no-deps
Expand Down
2 changes: 1 addition & 1 deletion docs/zh_cn/01-how-to-build/rockchip.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ MMDeploy 支持把模型部署到瑞芯微设备上。已支持的芯片:RV112
<tr>
<td>RK3566 / RK3568 / RK3588 / RV1103 / RV1106</td>
<td><code>git clone https://github.com/rockchip-linux/rknn-toolkit2</code></td>
<td><a href="https://github.com/rockchip-linux/rknn-toolkit/tree/master/doc">安装指南</a></td>
<td><a href="https://github.com/rockchip-linux/rknn-toolkit/tree/master/docs">安装指南</a></td>
</tr>
</tbody>
</table>
Expand Down
2 changes: 2 additions & 0 deletions mmdeploy/mmcv/ops/nms.py
Original file line number Diff line number Diff line change
Expand Up @@ -368,6 +368,8 @@ def _multiclass_nms_single(boxes: Tensor,
bbox_index = box_inds.unsqueeze(0)
if pre_top_k > 0:
bbox_index = pre_topk_inds[None, box_inds]
# pad index to keep same dim as dets and labels
bbox_index = torch.cat([bbox_index, -bbox_index.new_ones((1, 1))], 1)
if keep_top_k > 0:
bbox_index = bbox_index[:, topk_inds]
return dets, labels, bbox_index
Expand Down
6 changes: 3 additions & 3 deletions requirements/codebases.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
mmagic==1.0.0
mmdet==3.0.0
mmdet3d==1.1.0rc2
mmdet3d==1.1.0
mmocr==1.0.0
mmpose==1.0.0
mmpretrain==1.0.0rc7
mmrotate==1.0.0rc0
mmpretrain==1.0.0
mmrotate==1.0.0rc1
mmsegmentation==1.0.0

0 comments on commit 962a828

Please sign in to comment.