From 46fa98d88c0f7c19a54dd568ad8c9f511fb17a6a Mon Sep 17 00:00:00 2001 From: Tai-Wang Date: Tue, 23 Jan 2024 14:49:52 +0800 Subject: [PATCH 01/12] Update CI config --- .github/workflows/merge_stage_test.yml | 31 +------------------------- .github/workflows/pr_stage_test.yml | 10 ++++----- 2 files changed, 6 insertions(+), 35 deletions(-) diff --git a/.github/workflows/merge_stage_test.yml b/.github/workflows/merge_stage_test.yml index 432d4b0..3e62fb0 100644 --- a/.github/workflows/merge_stage_test.yml +++ b/.github/workflows/merge_stage_test.yml @@ -23,36 +23,7 @@ jobs: image: pytorch/pytorch:1.13.0-cuda11.6-cudnn8-devel strategy: matrix: - python-version: [3.7] - 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 - - 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] + python-version: [3.8] steps: - uses: actions/checkout@v3 - name: Set up Python ${{ matrix.python-version }} diff --git a/.github/workflows/pr_stage_test.yml b/.github/workflows/pr_stage_test.yml index ed033b6..90c4fca 100644 --- a/.github/workflows/pr_stage_test.yml +++ b/.github/workflows/pr_stage_test.yml @@ -13,13 +13,13 @@ concurrency: cancel-in-progress: true jobs: - build_cu117: + build_cu116: runs-on: ubuntu-22.04 container: - image: pytorch/pytorch:2.0.0-cuda11.7-cudnn8-devel + image: pytorch/pytorch:1.13.0-cuda11.6-cudnn8-devel strategy: matrix: - python-version: [3.9] + python-version: [3.8] steps: - uses: actions/checkout@v3 - name: Set up Python ${{ matrix.python-version }} @@ -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 git ffmpeg libturbojpeg - 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 run --branch --source embodiedscan -m pytest tests coverage xml coverage report -m From 45430ec465eaf3b2d4e5b05b387dd954ad15f212 Mon Sep 17 00:00:00 2001 From: Tai-Wang Date: Tue, 23 Jan 2024 14:52:36 +0800 Subject: [PATCH 02/12] Fix linting (by fixing readme) --- README.md | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 457f3c1..0a860b7 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,6 @@

-
- -[![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-🚀-blue)](https://tai-wang.github.io/embodiedscan) -
+[![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) + ## 🤖 [Demo](https://tai-wang.github.io/embodiedscan) From bde7dec92524d5c41ec1b30defd199511f2bf4a7 Mon Sep 17 00:00:00 2001 From: Tai-Wang Date: Tue, 23 Jan 2024 15:04:58 +0800 Subject: [PATCH 03/12] Try to fix the system dependencies --- .github/workflows/pr_stage_test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr_stage_test.yml b/.github/workflows/pr_stage_test.yml index 90c4fca..bb63a73 100644 --- a/.github/workflows/pr_stage_test.yml +++ b/.github/workflows/pr_stage_test.yml @@ -33,7 +33,7 @@ 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 ffmpeg libsm6 libxext6 git ninja-build libglib2.0-0 libsm6 libxrender-dev libxext6 - name: Install dependencies and EmbodiedScan run: python install.py all - name: Run unittests and generate coverage report From b4f9abf19a33959ca85fc07e7c81e41195d0dc82 Mon Sep 17 00:00:00 2001 From: Tai-Wang Date: Tue, 23 Jan 2024 17:46:13 +0800 Subject: [PATCH 04/12] add apt-get install libc6 for CI --- .github/workflows/merge_stage_test.yml | 2 +- .github/workflows/pr_stage_test.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/merge_stage_test.yml b/.github/workflows/merge_stage_test.yml index 3e62fb0..74e2609 100644 --- a/.github/workflows/merge_stage_test.yml +++ b/.github/workflows/merge_stage_test.yml @@ -37,7 +37,7 @@ 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 diff --git a/.github/workflows/pr_stage_test.yml b/.github/workflows/pr_stage_test.yml index bb63a73..8199aef 100644 --- a/.github/workflows/pr_stage_test.yml +++ b/.github/workflows/pr_stage_test.yml @@ -33,7 +33,7 @@ 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 - name: Run unittests and generate coverage report From 67682eb5551818ad8f3dda11635f95702adb96b8 Mon Sep 17 00:00:00 2001 From: Tai-Wang Date: Tue, 23 Jan 2024 17:57:08 +0800 Subject: [PATCH 05/12] Only python install.py run in CI to avoid installing Open3D --- .github/workflows/merge_stage_test.yml | 4 ++-- .github/workflows/pr_stage_test.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/merge_stage_test.yml b/.github/workflows/merge_stage_test.yml index 74e2609..3bcbf4d 100644 --- a/.github/workflows/merge_stage_test.yml +++ b/.github/workflows/merge_stage_test.yml @@ -37,9 +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 libc6 + 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 diff --git a/.github/workflows/pr_stage_test.yml b/.github/workflows/pr_stage_test.yml index 8199aef..9ee72a8 100644 --- a/.github/workflows/pr_stage_test.yml +++ b/.github/workflows/pr_stage_test.yml @@ -33,9 +33,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 ffmpeg libsm6 libxext6 git ninja-build libglib2.0-0 libsm6 libxrender-dev libxext6 libc6 + run: apt-get update && apt-get install -y ffmpeg libsm6 libxext6 git ninja-build libglib2.0-0 libsm6 libxrender-dev libxext6 - 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 From 357c1e2b00c421f21467f5568210323abcd6bcc5 Mon Sep 17 00:00:00 2001 From: Tai-Wang Date: Tue, 23 Jan 2024 18:40:04 +0800 Subject: [PATCH 06/12] Try python 3.9 env in CI --- .github/workflows/merge_stage_test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/merge_stage_test.yml b/.github/workflows/merge_stage_test.yml index 3bcbf4d..fbf80f4 100644 --- a/.github/workflows/merge_stage_test.yml +++ b/.github/workflows/merge_stage_test.yml @@ -23,7 +23,7 @@ jobs: image: pytorch/pytorch:1.13.0-cuda11.6-cudnn8-devel strategy: matrix: - python-version: [3.8] + python-version: [3.9] steps: - uses: actions/checkout@v3 - name: Set up Python ${{ matrix.python-version }} From 997185926faddd5f312d94626383a45246073ea5 Mon Sep 17 00:00:00 2001 From: Tai-Wang Date: Wed, 24 Jan 2024 13:06:10 +0800 Subject: [PATCH 07/12] Try python 3.9 env in pr_stage_test --- .github/workflows/pr_stage_test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr_stage_test.yml b/.github/workflows/pr_stage_test.yml index 9ee72a8..bf98b84 100644 --- a/.github/workflows/pr_stage_test.yml +++ b/.github/workflows/pr_stage_test.yml @@ -19,7 +19,7 @@ jobs: image: pytorch/pytorch:1.13.0-cuda11.6-cudnn8-devel strategy: matrix: - python-version: [3.8] + python-version: [3.9] steps: - uses: actions/checkout@v3 - name: Set up Python ${{ matrix.python-version }} From 33c65a1165af911fe8805d46e7705eddeb79bbe4 Mon Sep 17 00:00:00 2001 From: Tai-Wang Date: Fri, 2 Feb 2024 12:59:07 +0800 Subject: [PATCH 08/12] Fix Mink Engine install --- install.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/install.py b/install.py index 41bcfd1..536e11a 100644 --- a/install.py +++ b/install.py @@ -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]) From 0cdddfe3eab5a10988d747b7f38c9b616ead91ea Mon Sep 17 00:00:00 2001 From: Tai-Wang Date: Fri, 2 Feb 2024 13:14:01 +0800 Subject: [PATCH 09/12] downgrade the CI pytorch image version --- .github/workflows/merge_stage_test.yml | 4 ++-- .github/workflows/pr_stage_test.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/merge_stage_test.yml b/.github/workflows/merge_stage_test.yml index fbf80f4..00e09b4 100644 --- a/.github/workflows/merge_stage_test.yml +++ b/.github/workflows/merge_stage_test.yml @@ -20,10 +20,10 @@ jobs: build_cu116: runs-on: ubuntu-22.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.9] + python-version: [3.7] steps: - uses: actions/checkout@v3 - name: Set up Python ${{ matrix.python-version }} diff --git a/.github/workflows/pr_stage_test.yml b/.github/workflows/pr_stage_test.yml index bf98b84..63035ae 100644 --- a/.github/workflows/pr_stage_test.yml +++ b/.github/workflows/pr_stage_test.yml @@ -16,10 +16,10 @@ jobs: build_cu116: runs-on: ubuntu-22.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.9] + python-version: [3.7] steps: - uses: actions/checkout@v3 - name: Set up Python ${{ matrix.python-version }} From 570154e02a551d6dc4045f93a75454d8ac13ae8d Mon Sep 17 00:00:00 2001 From: Tai-Wang Date: Fri, 2 Feb 2024 13:42:25 +0800 Subject: [PATCH 10/12] Downgrade ubuntu version 22.04 to 20.04 --- .github/workflows/merge_stage_test.yml | 4 ++-- .github/workflows/pr_stage_test.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/merge_stage_test.yml b/.github/workflows/merge_stage_test.yml index 00e09b4..29456e1 100644 --- a/.github/workflows/merge_stage_test.yml +++ b/.github/workflows/merge_stage_test.yml @@ -17,8 +17,8 @@ concurrency: cancel-in-progress: true jobs: - build_cu116: - runs-on: ubuntu-22.04 + build_cu113: + runs-on: ubuntu-20.04 container: image: pytorch/pytorch:1.11.0-cuda11.3-cudnn8-devel strategy: diff --git a/.github/workflows/pr_stage_test.yml b/.github/workflows/pr_stage_test.yml index 63035ae..a7322ab 100644 --- a/.github/workflows/pr_stage_test.yml +++ b/.github/workflows/pr_stage_test.yml @@ -13,8 +13,8 @@ concurrency: cancel-in-progress: true jobs: - build_cu116: - runs-on: ubuntu-22.04 + build_cu113: + runs-on: ubuntu-20.04 container: image: pytorch/pytorch:1.11.0-cuda11.3-cudnn8-devel strategy: From 5e1f6972de3d3bee19f36158ec4cd1b0782a6b40 Mon Sep 17 00:00:00 2001 From: Tai-Wang Date: Fri, 2 Feb 2024 13:49:42 +0800 Subject: [PATCH 11/12] Add libc6 installation in the CI --- .github/workflows/merge_stage_test.yml | 2 +- .github/workflows/pr_stage_test.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/merge_stage_test.yml b/.github/workflows/merge_stage_test.yml index 29456e1..15e0274 100644 --- a/.github/workflows/merge_stage_test.yml +++ b/.github/workflows/merge_stage_test.yml @@ -37,7 +37,7 @@ 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 run - name: Run unittests and generate coverage report diff --git a/.github/workflows/pr_stage_test.yml b/.github/workflows/pr_stage_test.yml index a7322ab..8723194 100644 --- a/.github/workflows/pr_stage_test.yml +++ b/.github/workflows/pr_stage_test.yml @@ -33,7 +33,7 @@ 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 run - name: Run unittests and generate coverage report From f3792f434984ea377f7d1a8d0bfe65ad117ff443 Mon Sep 17 00:00:00 2001 From: Tai-Wang Date: Fri, 2 Feb 2024 13:56:04 +0800 Subject: [PATCH 12/12] downgrade ubuntu to 18.04 --- .github/workflows/merge_stage_test.yml | 2 +- .github/workflows/pr_stage_test.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/merge_stage_test.yml b/.github/workflows/merge_stage_test.yml index 15e0274..3ce9c3e 100644 --- a/.github/workflows/merge_stage_test.yml +++ b/.github/workflows/merge_stage_test.yml @@ -18,7 +18,7 @@ concurrency: jobs: build_cu113: - runs-on: ubuntu-20.04 + runs-on: ubuntu-18.04 container: image: pytorch/pytorch:1.11.0-cuda11.3-cudnn8-devel strategy: diff --git a/.github/workflows/pr_stage_test.yml b/.github/workflows/pr_stage_test.yml index 8723194..a475932 100644 --- a/.github/workflows/pr_stage_test.yml +++ b/.github/workflows/pr_stage_test.yml @@ -14,7 +14,7 @@ concurrency: jobs: build_cu113: - runs-on: ubuntu-20.04 + runs-on: ubuntu-18.04 container: image: pytorch/pytorch:1.11.0-cuda11.3-cudnn8-devel strategy: