Skip to content

Commit aa10365

Browse files
sunjiahao1999sunjiahao1999
authored
[CI]Fix CI with pip install wheel (#2445)
* fix ci * fix build cu102 * fix o3d visualizer when have not any display equipment * fix mmocr typo
1 parent c0c5007 commit aa10365

File tree

6 files changed

+21
-20
lines changed

6 files changed

+21
-20
lines changed

‎.circleci/test.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ jobs:
6868
python -m pip install git+ssh://[email protected]/open-mmlab/mmengine.git@main
6969
pip install -U openmim
7070
mim install 'mmcv >= 2.0.0rc4'
71-
pip install git+ssh://[email protected]/open-mmlab/[email protected]
71+
mim install 'mmdet >= 3.0.0'
7272
pip install -r requirements.txt
7373
- run:
7474
name: Build and install

‎.dev_scripts/diff_coverage_test.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ done
3535
if [ ! -z "${PY_FILES}" ]
3636
then
3737
if [ "$REUSE_COVERAGE_REPORT" == "0" ]; then
38-
coverage run --branch --source mmocr -m pytest tests/
38+
coverage run --branch --source mmdet3d -m pytest tests/
3939
fi
4040
coverage report --fail-under 80 -m $PY_FILES
4141
interrogate -v --ignore-init-method --ignore-module --ignore-nested-functions --ignore-magic --ignore-regex "__repr__" --fail-under 95 $PY_FILES

‎.github/workflows/merge_stage_test.yml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
with:
3434
python-version: ${{ matrix.python-version }}
3535
- name: Upgrade pip
36-
run: pip install pip --upgrade
36+
run: pip install pip --upgrade && pip install wheel
3737
- name: Install PyTorch
3838
run: pip install torch==${{matrix.torch}}+cpu torchvision==${{matrix.torchvision}}+cpu -f https://download.pytorch.org/whl/cpu/torch_stable.html
3939
- name: Install MMEngine
@@ -43,7 +43,7 @@ jobs:
4343
pip install -U openmim
4444
mim install 'mmcv >= 2.0.0rc4'
4545
- name: Install MMDet
46-
run: pip install git+https://github.com/open-mmlab/[email protected]
46+
run: mim install 'mmdet>=3.0.0'
4747
- name: Install other dependencies
4848
run: pip install -r requirements/tests.txt
4949
- name: Build and install
@@ -87,7 +87,7 @@ jobs:
8787
with:
8888
python-version: ${{ matrix.python-version }}
8989
- name: Upgrade pip
90-
run: pip install pip --upgrade
90+
run: pip install pip --upgrade && pip install wheel
9191
- name: Install PyTorch
9292
run: pip install torch==${{matrix.torch}}+cpu torchvision==${{matrix.torchvision}}+cpu -f https://download.pytorch.org/whl/cpu/torch_stable.html
9393
- name: Install MMEngine
@@ -97,7 +97,7 @@ jobs:
9797
pip install -U openmim
9898
mim install 'mmcv >= 2.0.0rc4'
9999
- name: Install MMDet
100-
run: pip install git+https://github.com/open-mmlab/[email protected]
100+
run: mim install 'mmdet>=3.0.0'
101101
- name: Install other dependencies
102102
run: pip install -r requirements/tests.txt
103103
- name: Build and install
@@ -135,7 +135,7 @@ jobs:
135135
with:
136136
python-version: ${{ matrix.python-version }}
137137
- name: Upgrade pip
138-
run: pip install pip --upgrade
138+
run: pip install pip --upgrade && pip install wheel
139139
- name: Fetch GPG keys
140140
run: |
141141
apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/cuda/repos/ubuntu1804/x86_64/3bf863cc.pub
@@ -147,7 +147,7 @@ jobs:
147147
pip install git+https://github.com/open-mmlab/mmengine.git@main
148148
pip install -U openmim
149149
mim install 'mmcv >= 2.0.0rc4'
150-
pip install git+https://github.com/open-mmlab/[email protected]
150+
mim install 'mmdet>=3.0.0'
151151
pip install -r requirements/tests.txt
152152
- name: Build and install
153153
run: pip install -e .
@@ -171,7 +171,7 @@ jobs:
171171
with:
172172
python-version: ${{ matrix.python-version }}
173173
- name: Upgrade pip
174-
run: pip install pip --upgrade
174+
run: pip install pip --upgrade && pip install wheel
175175
- name: Fetch GPG keys
176176
run: |
177177
apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/cuda/repos/ubuntu1804/x86_64/3bf863cc.pub
@@ -183,7 +183,7 @@ jobs:
183183
pip install git+https://github.com/open-mmlab/mmengine.git@main
184184
pip install -U openmim
185185
mim install 'mmcv >= 2.0.0rc4'
186-
pip install git+https://github.com/open-mmlab/[email protected]
186+
mim install 'mmdet>=3.0.0'
187187
pip install -r requirements/tests.txt
188188
- name: Build and install
189189
run: pip install -e .
@@ -208,7 +208,7 @@ jobs:
208208
with:
209209
python-version: ${{ matrix.python }}
210210
- name: Upgrade pip
211-
run: pip install pip --upgrade
211+
run: pip install pip --upgrade && pip install wheel
212212
- name: Install lmdb
213213
run: pip install lmdb
214214
- name: Install PyTorch
@@ -218,7 +218,7 @@ jobs:
218218
pip install git+https://github.com/open-mmlab/mmengine.git@main
219219
pip install -U openmim
220220
mim install 'mmcv >= 2.0.0rc4'
221-
pip install git+https://github.com/open-mmlab/[email protected]
221+
mim install 'mmdet>=3.0.0'
222222
pip install -r requirements/tests.txt
223223
- name: Build and install
224224
run: pip install -e .

‎.github/workflows/pr_stage_test.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
with:
3131
python-version: ${{ matrix.python-version }}
3232
- name: Upgrade pip
33-
run: python -m pip install pip --upgrade
33+
run: python -m pip install pip --upgrade && pip install wheel
3434
- name: Install PyTorch
3535
run: pip install torch==${{matrix.torch}}+cpu torchvision==${{matrix.torchvision}}+cpu -f https://download.pytorch.org/whl/cpu/torch_stable.html
3636
- name: Install MMEngine
@@ -40,7 +40,7 @@ jobs:
4040
pip install -U openmim
4141
mim install 'mmcv >= 2.0.0rc4'
4242
- name: Install MMDet
43-
run: pip install git+https://github.com/open-mmlab/[email protected]
43+
run: mim install 'mmdet>=3.0.0'
4444
- name: Install other dependencies
4545
run: pip install -r requirements/tests.txt
4646
- name: Build and install
@@ -74,7 +74,7 @@ jobs:
7474
with:
7575
python-version: ${{ matrix.python-version }}
7676
- name: Upgrade pip
77-
run: pip install pip --upgrade
77+
run: pip install pip --upgrade && pip install wheel
7878
- name: Fetch GPG keys
7979
run: |
8080
apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/cuda/repos/ubuntu1804/x86_64/3bf863cc.pub
@@ -86,7 +86,7 @@ jobs:
8686
pip install git+https://github.com/open-mmlab/mmengine.git@main
8787
pip install -U openmim
8888
mim install 'mmcv >= 2.0.0rc4'
89-
pip install git+https://github.com/open-mmlab/[email protected]
89+
mim install 'mmdet>=3.0.0'
9090
pip install -r requirements/tests.txt
9191
- name: Build and install
9292
run: pip install -e .
@@ -111,7 +111,7 @@ jobs:
111111
with:
112112
python-version: ${{ matrix.python-version }}
113113
- name: Upgrade pip
114-
run: python -m pip install pip --upgrade
114+
run: python -m pip install pip --upgrade && pip install wheel
115115
- name: Install lmdb
116116
run: pip install lmdb
117117
- name: Install PyTorch
@@ -121,7 +121,7 @@ jobs:
121121
pip install git+https://github.com/open-mmlab/mmengine.git@main
122122
pip install -U openmim
123123
mim install 'mmcv >= 2.0.0rc4'
124-
pip install git+https://github.com/open-mmlab/[email protected]
124+
mim install 'mmdet>=3.0.0'
125125
pip install -r requirements/tests.txt
126126
- name: Build and install
127127
run: pip install -e .

‎.github/workflows/test_mim.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
with:
3434
python-version: ${{ matrix.python-version }}
3535
- name: Upgrade pip
36-
run: pip install pip --upgrade
36+
run: pip install pip --upgrade && pip install wheel
3737
- name: Install PyTorch
3838
run: pip install torch==${{matrix.torch}}+cpu torchvision==${{matrix.torchvision}}+cpu -f https://download.pytorch.org/whl/cpu/torch_stable.html
3939
- name: Install openmim

‎mmdet3d/visualization/local_visualizer.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,8 @@ def set_points(self,
204204
self.o3d_vis.remove_geometry(self.pcd)
205205

206206
# set points size in Open3D
207-
self.o3d_vis.get_render_option().point_size = points_size
207+
if self.o3d_vis.get_render_option() is not None:
208+
self.o3d_vis.get_render_option().point_size = points_size
208209

209210
points = points.copy()
210211
pcd = geometry.PointCloud()

0 commit comments

Comments
 (0)