Unverified Commit aa10365c authored by Sun Jiahao's avatar Sun Jiahao Committed by GitHub
Browse files

[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
parent c0c50074
...@@ -68,7 +68,7 @@ jobs: ...@@ -68,7 +68,7 @@ jobs:
python -m pip install git+ssh://git@github.com/open-mmlab/mmengine.git@main python -m pip install git+ssh://git@github.com/open-mmlab/mmengine.git@main
pip install -U openmim pip install -U openmim
mim install 'mmcv >= 2.0.0rc4' mim install 'mmcv >= 2.0.0rc4'
pip install git+ssh://git@github.com/open-mmlab/mmdetection.git@dev-3.x mim install 'mmdet >= 3.0.0'
pip install -r requirements.txt pip install -r requirements.txt
- run: - run:
name: Build and install name: Build and install
......
...@@ -35,7 +35,7 @@ done ...@@ -35,7 +35,7 @@ done
if [ ! -z "${PY_FILES}" ] if [ ! -z "${PY_FILES}" ]
then then
if [ "$REUSE_COVERAGE_REPORT" == "0" ]; then if [ "$REUSE_COVERAGE_REPORT" == "0" ]; then
coverage run --branch --source mmocr -m pytest tests/ coverage run --branch --source mmdet3d -m pytest tests/
fi fi
coverage report --fail-under 80 -m $PY_FILES coverage report --fail-under 80 -m $PY_FILES
interrogate -v --ignore-init-method --ignore-module --ignore-nested-functions --ignore-magic --ignore-regex "__repr__" --fail-under 95 $PY_FILES interrogate -v --ignore-init-method --ignore-module --ignore-nested-functions --ignore-magic --ignore-regex "__repr__" --fail-under 95 $PY_FILES
......
...@@ -33,7 +33,7 @@ jobs: ...@@ -33,7 +33,7 @@ jobs:
with: with:
python-version: ${{ matrix.python-version }} python-version: ${{ matrix.python-version }}
- name: Upgrade pip - name: Upgrade pip
run: pip install pip --upgrade run: pip install pip --upgrade && pip install wheel
- name: Install PyTorch - name: Install PyTorch
run: pip install torch==${{matrix.torch}}+cpu torchvision==${{matrix.torchvision}}+cpu -f https://download.pytorch.org/whl/cpu/torch_stable.html run: pip install torch==${{matrix.torch}}+cpu torchvision==${{matrix.torchvision}}+cpu -f https://download.pytorch.org/whl/cpu/torch_stable.html
- name: Install MMEngine - name: Install MMEngine
...@@ -43,7 +43,7 @@ jobs: ...@@ -43,7 +43,7 @@ jobs:
pip install -U openmim pip install -U openmim
mim install 'mmcv >= 2.0.0rc4' mim install 'mmcv >= 2.0.0rc4'
- name: Install MMDet - name: Install MMDet
run: pip install git+https://github.com/open-mmlab/mmdetection.git@dev-3.x run: mim install 'mmdet>=3.0.0'
- name: Install other dependencies - name: Install other dependencies
run: pip install -r requirements/tests.txt run: pip install -r requirements/tests.txt
- name: Build and install - name: Build and install
...@@ -87,7 +87,7 @@ jobs: ...@@ -87,7 +87,7 @@ jobs:
with: with:
python-version: ${{ matrix.python-version }} python-version: ${{ matrix.python-version }}
- name: Upgrade pip - name: Upgrade pip
run: pip install pip --upgrade run: pip install pip --upgrade && pip install wheel
- name: Install PyTorch - name: Install PyTorch
run: pip install torch==${{matrix.torch}}+cpu torchvision==${{matrix.torchvision}}+cpu -f https://download.pytorch.org/whl/cpu/torch_stable.html run: pip install torch==${{matrix.torch}}+cpu torchvision==${{matrix.torchvision}}+cpu -f https://download.pytorch.org/whl/cpu/torch_stable.html
- name: Install MMEngine - name: Install MMEngine
...@@ -97,7 +97,7 @@ jobs: ...@@ -97,7 +97,7 @@ jobs:
pip install -U openmim pip install -U openmim
mim install 'mmcv >= 2.0.0rc4' mim install 'mmcv >= 2.0.0rc4'
- name: Install MMDet - name: Install MMDet
run: pip install git+https://github.com/open-mmlab/mmdetection.git@dev-3.x run: mim install 'mmdet>=3.0.0'
- name: Install other dependencies - name: Install other dependencies
run: pip install -r requirements/tests.txt run: pip install -r requirements/tests.txt
- name: Build and install - name: Build and install
...@@ -135,7 +135,7 @@ jobs: ...@@ -135,7 +135,7 @@ jobs:
with: with:
python-version: ${{ matrix.python-version }} python-version: ${{ matrix.python-version }}
- name: Upgrade pip - name: Upgrade pip
run: pip install pip --upgrade run: pip install pip --upgrade && pip install wheel
- name: Fetch GPG keys - name: Fetch GPG keys
run: | run: |
apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/cuda/repos/ubuntu1804/x86_64/3bf863cc.pub apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/cuda/repos/ubuntu1804/x86_64/3bf863cc.pub
...@@ -147,7 +147,7 @@ jobs: ...@@ -147,7 +147,7 @@ jobs:
pip install git+https://github.com/open-mmlab/mmengine.git@main pip install git+https://github.com/open-mmlab/mmengine.git@main
pip install -U openmim pip install -U openmim
mim install 'mmcv >= 2.0.0rc4' mim install 'mmcv >= 2.0.0rc4'
pip install git+https://github.com/open-mmlab/mmdetection.git@dev-3.x mim install 'mmdet>=3.0.0'
pip install -r requirements/tests.txt pip install -r requirements/tests.txt
- name: Build and install - name: Build and install
run: pip install -e . run: pip install -e .
...@@ -171,7 +171,7 @@ jobs: ...@@ -171,7 +171,7 @@ jobs:
with: with:
python-version: ${{ matrix.python-version }} python-version: ${{ matrix.python-version }}
- name: Upgrade pip - name: Upgrade pip
run: pip install pip --upgrade run: pip install pip --upgrade && pip install wheel
- name: Fetch GPG keys - name: Fetch GPG keys
run: | run: |
apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/cuda/repos/ubuntu1804/x86_64/3bf863cc.pub apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/cuda/repos/ubuntu1804/x86_64/3bf863cc.pub
...@@ -183,7 +183,7 @@ jobs: ...@@ -183,7 +183,7 @@ jobs:
pip install git+https://github.com/open-mmlab/mmengine.git@main pip install git+https://github.com/open-mmlab/mmengine.git@main
pip install -U openmim pip install -U openmim
mim install 'mmcv >= 2.0.0rc4' mim install 'mmcv >= 2.0.0rc4'
pip install git+https://github.com/open-mmlab/mmdetection.git@dev-3.x mim install 'mmdet>=3.0.0'
pip install -r requirements/tests.txt pip install -r requirements/tests.txt
- name: Build and install - name: Build and install
run: pip install -e . run: pip install -e .
...@@ -208,7 +208,7 @@ jobs: ...@@ -208,7 +208,7 @@ jobs:
with: with:
python-version: ${{ matrix.python }} python-version: ${{ matrix.python }}
- name: Upgrade pip - name: Upgrade pip
run: pip install pip --upgrade run: pip install pip --upgrade && pip install wheel
- name: Install lmdb - name: Install lmdb
run: pip install lmdb run: pip install lmdb
- name: Install PyTorch - name: Install PyTorch
...@@ -218,7 +218,7 @@ jobs: ...@@ -218,7 +218,7 @@ jobs:
pip install git+https://github.com/open-mmlab/mmengine.git@main pip install git+https://github.com/open-mmlab/mmengine.git@main
pip install -U openmim pip install -U openmim
mim install 'mmcv >= 2.0.0rc4' mim install 'mmcv >= 2.0.0rc4'
pip install git+https://github.com/open-mmlab/mmdetection.git@dev-3.x mim install 'mmdet>=3.0.0'
pip install -r requirements/tests.txt pip install -r requirements/tests.txt
- name: Build and install - name: Build and install
run: pip install -e . run: pip install -e .
......
...@@ -30,7 +30,7 @@ jobs: ...@@ -30,7 +30,7 @@ jobs:
with: with:
python-version: ${{ matrix.python-version }} python-version: ${{ matrix.python-version }}
- name: Upgrade pip - name: Upgrade pip
run: python -m pip install pip --upgrade run: python -m pip install pip --upgrade && pip install wheel
- name: Install PyTorch - name: Install PyTorch
run: pip install torch==${{matrix.torch}}+cpu torchvision==${{matrix.torchvision}}+cpu -f https://download.pytorch.org/whl/cpu/torch_stable.html run: pip install torch==${{matrix.torch}}+cpu torchvision==${{matrix.torchvision}}+cpu -f https://download.pytorch.org/whl/cpu/torch_stable.html
- name: Install MMEngine - name: Install MMEngine
...@@ -40,7 +40,7 @@ jobs: ...@@ -40,7 +40,7 @@ jobs:
pip install -U openmim pip install -U openmim
mim install 'mmcv >= 2.0.0rc4' mim install 'mmcv >= 2.0.0rc4'
- name: Install MMDet - name: Install MMDet
run: pip install git+https://github.com/open-mmlab/mmdetection.git@dev-3.x run: mim install 'mmdet>=3.0.0'
- name: Install other dependencies - name: Install other dependencies
run: pip install -r requirements/tests.txt run: pip install -r requirements/tests.txt
- name: Build and install - name: Build and install
...@@ -74,7 +74,7 @@ jobs: ...@@ -74,7 +74,7 @@ jobs:
with: with:
python-version: ${{ matrix.python-version }} python-version: ${{ matrix.python-version }}
- name: Upgrade pip - name: Upgrade pip
run: pip install pip --upgrade run: pip install pip --upgrade && pip install wheel
- name: Fetch GPG keys - name: Fetch GPG keys
run: | run: |
apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/cuda/repos/ubuntu1804/x86_64/3bf863cc.pub apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/cuda/repos/ubuntu1804/x86_64/3bf863cc.pub
...@@ -86,7 +86,7 @@ jobs: ...@@ -86,7 +86,7 @@ jobs:
pip install git+https://github.com/open-mmlab/mmengine.git@main pip install git+https://github.com/open-mmlab/mmengine.git@main
pip install -U openmim pip install -U openmim
mim install 'mmcv >= 2.0.0rc4' mim install 'mmcv >= 2.0.0rc4'
pip install git+https://github.com/open-mmlab/mmdetection.git@dev-3.x mim install 'mmdet>=3.0.0'
pip install -r requirements/tests.txt pip install -r requirements/tests.txt
- name: Build and install - name: Build and install
run: pip install -e . run: pip install -e .
...@@ -111,7 +111,7 @@ jobs: ...@@ -111,7 +111,7 @@ jobs:
with: with:
python-version: ${{ matrix.python-version }} python-version: ${{ matrix.python-version }}
- name: Upgrade pip - name: Upgrade pip
run: python -m pip install pip --upgrade run: python -m pip install pip --upgrade && pip install wheel
- name: Install lmdb - name: Install lmdb
run: pip install lmdb run: pip install lmdb
- name: Install PyTorch - name: Install PyTorch
...@@ -121,7 +121,7 @@ jobs: ...@@ -121,7 +121,7 @@ jobs:
pip install git+https://github.com/open-mmlab/mmengine.git@main pip install git+https://github.com/open-mmlab/mmengine.git@main
pip install -U openmim pip install -U openmim
mim install 'mmcv >= 2.0.0rc4' mim install 'mmcv >= 2.0.0rc4'
pip install git+https://github.com/open-mmlab/mmdetection.git@dev-3.x mim install 'mmdet>=3.0.0'
pip install -r requirements/tests.txt pip install -r requirements/tests.txt
- name: Build and install - name: Build and install
run: pip install -e . run: pip install -e .
......
...@@ -33,7 +33,7 @@ jobs: ...@@ -33,7 +33,7 @@ jobs:
with: with:
python-version: ${{ matrix.python-version }} python-version: ${{ matrix.python-version }}
- name: Upgrade pip - name: Upgrade pip
run: pip install pip --upgrade run: pip install pip --upgrade && pip install wheel
- name: Install PyTorch - name: Install PyTorch
run: pip install torch==${{matrix.torch}}+cpu torchvision==${{matrix.torchvision}}+cpu -f https://download.pytorch.org/whl/cpu/torch_stable.html run: pip install torch==${{matrix.torch}}+cpu torchvision==${{matrix.torchvision}}+cpu -f https://download.pytorch.org/whl/cpu/torch_stable.html
- name: Install openmim - name: Install openmim
......
...@@ -204,7 +204,8 @@ class Det3DLocalVisualizer(DetLocalVisualizer): ...@@ -204,7 +204,8 @@ class Det3DLocalVisualizer(DetLocalVisualizer):
self.o3d_vis.remove_geometry(self.pcd) self.o3d_vis.remove_geometry(self.pcd)
# set points size in Open3D # set points size in Open3D
self.o3d_vis.get_render_option().point_size = points_size if self.o3d_vis.get_render_option() is not None:
self.o3d_vis.get_render_option().point_size = points_size
points = points.copy() points = points.copy()
pcd = geometry.PointCloud() pcd = geometry.PointCloud()
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment