Skip to content

Update CI config#9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Tai-Wang wants to merge 12 commits into
base:main
Choose a base branch
from
Open

Update CI config #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
46fa98d
Update CI config
Tai-Wang Jan 23, 2024
45430ec
Fix linting (by fixing readme)
Tai-Wang Jan 23, 2024
bde7dec
Try to fix the system dependencies
Tai-Wang Jan 23, 2024
b4f9abf
add apt-get install libc6 for CI
Tai-Wang Jan 23, 2024
67682eb
Only python install.py run in CI to avoid installing Open3D
Tai-Wang Jan 23, 2024
357c1e2
Try python 3.9 env in CI
Tai-Wang Jan 23, 2024
9971859
Try python 3.9 env in pr_stage_test
Tai-Wang Jan 24, 2024
33c65a1
Fix Mink Engine install
Tai-Wang Feb 2, 2024
0cdddfe
downgrade the CI pytorch image version
Tai-Wang Feb 2, 2024
570154e
Downgrade ubuntu version 22.04 to 20.04
Tai-Wang Feb 2, 2024
5e1f697
Add libc6 installation in the CI
Tai-Wang Feb 2, 2024
f3792f4
downgrade ubuntu to 18.04
Tai-Wang Feb 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 5 additions & 34 deletions .github/workflows/merge_stage_test.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,10 +17,10 @@ concurrency:
cancel-in-progress: true

jobs:
build_cu116:
runs-on: ubuntu-22.04
build_cu113:
runs-on: ubuntu-18.04
container:
image: pytorch/pytorch:1.13.0-cuda11.6-cudnn8-devel
image: pytorch/pytorch:1.11.0-cuda11.3-cudnn8-devel
strategy:
matrix:
python-version: [3.7]
Expand All@@ -37,38 +37,9 @@ jobs:
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/machine-learning/repos/ubuntu1804/x86_64/7fa2af80.pub
- name: Install system dependencies
run: apt-get update && apt-get install -y git ffmpeg libturbojpeg
run: apt-get update && apt-get install -y git ffmpeg libturbojpeg libc6
- name: Install dependencies and EmbodiedScan
run: python install.py all
- name: Run unittests and generate coverage report
run: |
coverage run --branch --source embodiedscan -m pytest tests
coverage xml
coverage report -m

build_cu117:
runs-on: ubuntu-22.04
container:
image: pytorch/pytorch:2.0.0-cuda11.7-cudnn8-devel
strategy:
matrix:
python-version: [3.9]
steps:
- uses: actions/checkout@v3
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
- name: Upgrade pip
run: pip install pip --upgrade && pip install wheel
- name: Fetch GPG keys
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/machine-learning/repos/ubuntu1804/x86_64/7fa2af80.pub
- name: Install system dependencies
run: apt-get update && apt-get install -y git ffmpeg libturbojpeg
- name: Install dependencies and EmbodiedScan
run: python install.py all
run: python install.py run
- name: Run unittests and generate coverage report
run: |
coverage run --branch --source embodiedscan -m pytest tests
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/pr_stage_test.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,13 +13,13 @@ concurrency:
cancel-in-progress: true

jobs:
build_cu117:
runs-on: ubuntu-22.04
build_cu113:
runs-on: ubuntu-18.04
container:
image: pytorch/pytorch:2.0.0-cuda11.7-cudnn8-devel
image: pytorch/pytorch:1.11.0-cuda11.3-cudnn8-devel
strategy:
matrix:
python-version: [3.9]
python-version: [3.7]
steps:
- uses: actions/checkout@v3
- name: Set up Python ${{ matrix.python-version }}
Expand All@@ -33,11 +33,11 @@ jobs:
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/machine-learning/repos/ubuntu1804/x86_64/7fa2af80.pub
- name: Install system dependencies
run: apt-get update && apt-get install -y ffmpeg libsm6 libxext6 git ninja-build libglib2.0-0 libsm6 libxrender-dev libxext6
run: apt-get update && apt-get install -y ffmpeg libsm6 libxext6 git ninja-build libglib2.0-0 libsm6 libxrender-dev libxext6 libc6
- name: Install dependencies and EmbodiedScan
run: python install.py all
run: python install.py run
- name: Run unittests and generate coverage report
run: |
coverage run --branch --source embodiedscan -m pytest tests/
coverage run --branch --source embodiedscan -m pytest tests
coverage xml
coverage report -m
10 changes: 4 additions & 6 deletions README.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,6 @@
</p>
</p>


<!-- <p align="center">
<a href="https://arxiv.org/abs/2312.16170" target='_blank'>
<img src="https://img.shields.io/badge/arXiv-2312.16170-blue?">
Expand All@@ -38,13 +37,12 @@
</p> -->

<div id="top" align="center">

[![arXiv](https://img.shields.io/badge/arXiv-2312.16170-blue?)](https://arxiv.org/abs/2312.16170)
[![](https://img.shields.io/badge/Paper-📖-blue?)](./assets/EmbodiedScan.pdf)
[![](https://img.shields.io/badge/Project-&#x1F680-blue)](https://tai-wang.github.io/embodiedscan)

</div>
[![arXiv](https://img.shields.io/badge/arXiv-2312.16170-blue)](https://arxiv.org/abs/2312.16170)
[![](https://img.shields.io/badge/Paper-%F0%9F%93%96-blue)](./assets/EmbodiedScan.pdf)
[![](https://img.shields.io/badge/Project-%F0%9F%9A%80-blue)](https://tai-wang.github.io/embodiedscan)

</div>

## 🤖 [Demo](https://tai-wang.github.io/embodiedscan)

Expand Down
6 changes: 6 additions & 0 deletions install.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -84,6 +84,12 @@ def install_package(line):
links = mmcv_links()
run_subprocess(
[sys.executable, '-m', 'pip', 'install', line, '-f', links])
elif package_name == 'MinkowskiEngine':
run_subprocess([sys.executable, '-m', 'pip', 'install', 'ninja'])
run_subprocess([
sys.executable, '-m', 'pip', 'install', '-U',
'git+https://github.com/NVIDIA/MinkowskiEngine', '--no-deps'
]) # noqa: E501
else:
run_subprocess([sys.executable, '-m', 'pip', 'install', line])

Expand Down