Release codes related to models and improve the installation scripts (#2

) * Reproduce model * implement install.py * Config Beta * fix bug: import error * fix: equal interval sampling * support multiview model * add docstring * Data preparation * E501 * remove default path * install embodiedscan itself * Reorg configs * Refine the data organization readme * Rename the occ ann converter filename * Add contact link for downloading EmbodiedScan data * add docstring * remove bbox_loss2 * rename functions and add docstring * fix docstring * Remove the deprecated comment * update docstring * remove debug code * fix docstring * update docstring * update copyright * remove deprecated box type * update docstring * update docstring * Remove deprecated docstring. * update docstring * update docstring * remove deprecated with_yaw argument. * keep commented code for monocular benchmark. * fix docstring * Fix linting, and update some docstring * Add docstrings * add docstring * update docstring * code regulation * remove unused variable * Update the installation script in CI and update related instructions in the README * remove unused variable * remove unused variable --------- Co-authored-by: Tai-Wang <tab_wang@outlook.com>
OpenRobotLab · Jan 22, 2024 · 193f547 · 193f547
1 parent 05152f9
commit 193f547
Show file tree

Hide file tree

Showing 70 changed files with 9,373 additions and 508 deletions.
diff --git a/.github/workflows/merge_stage_test.yml b/.github/workflows/merge_stage_test.yml
@@ -17,128 +17,6 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  build_cpu_py:
-    runs-on: ubuntu-22.04
-    strategy:
-      matrix:
-        python-version: [3.8, 3.9]
-        torch: [1.8.1]
-        include:
-          - torch: 1.8.1
-            torchvision: 0.9.1
-    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: Install PyTorch
-        run: pip install torch==${{matrix.torch}}+cpu torchvision==${{matrix.torchvision}}+cpu -f https://download.pytorch.org/whl/cpu/torch_stable.html
-      - name: Install MMEngine
-        run: pip install git+https://github.com/open-mmlab/mmengine.git@main
-      - name: Install other dependencies
-        run: pip install -r requirements/tests.txt
-      - name: Build and install
-        run: rm -rf .eggs && pip install -e .
-      - name: Run unittests and generate coverage report
-        run: |
-          coverage run --branch --source embodiedscan -m pytest tests/
-          coverage xml
-          coverage report -m
-
-  build_cpu_pt:
-    runs-on: ubuntu-22.04
-    strategy:
-      matrix:
-        python-version: [3.7]
-        torch: [1.8.1, 1.9.1, 1.10.1, 1.11.0, 1.12.0, 1.13.0]
-        include:
-          - torch: 1.8.1
-            torchvision: 0.9.1
-          - torch: 1.9.1
-            torchvision: 0.10.1
-          - torch: 1.10.1
-            torchvision: 0.11.2
-          - torch: 1.11.0
-            torchvision: 0.12.0
-          - torch: 1.12.0
-            torchvision: 0.13.0
-          - torch: 1.13.0
-            torchvision: 0.14.0
-          - python-version: 3.8
-            torch: 2.0.0
-            torchvision: 0.15.1
-    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: Install PyTorch
-        run: pip install torch==${{matrix.torch}}+cpu torchvision==${{matrix.torchvision}}+cpu -f https://download.pytorch.org/whl/cpu/torch_stable.html
-      - name: Install MMEngine
-        run: pip install git+https://github.com/open-mmlab/mmengine.git@main
-      - name: Install other dependencies
-        run: pip install -r requirements/tests.txt
-      - name: Build and install
-        run: rm -rf .eggs && pip install -e .
-      - name: Run unittests and generate coverage report
-        run: |
-          coverage run --branch --source embodiedscan -m pytest tests/
-          coverage xml
-          coverage report -m
-      # Only upload coverage report for python3.7 && pytorch1.8.1 cpu
-      - name: Upload coverage to Codecov
-        if: ${{matrix.torch == '1.8.1' && matrix.python-version == '3.7'}}
-        uses: codecov/codecov-action@v1.0.14
-        with:
-          file: ./coverage.xml
-          flags: unittests
-          env_vars: OS,PYTHON
-          name: codecov-umbrella
-          fail_ci_if_error: false
-
-  build_cu102:
-    runs-on: ubuntu-22.04
-    container:
-      image: pytorch/pytorch:1.8.1-cuda10.2-cudnn7-devel
-    strategy:
-      matrix:
-        python-version: [3.7]
-        include:
-          - torch: 1.8.1
-            cuda: 10.2
-    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 ffmpeg libsm6 libxext6 git ninja-build libglib2.0-0 libsm6 libxrender-dev libxext6
-      - name: Install embodiedscan dependencies
-        run: |
-          pip install git+https://github.com/open-mmlab/mmengine.git@main
-          pip install -U openmim
-          pip install -r requirements/tests.txt
-      - name: Build and install
-        run: pip install -e .
-      - name: Run unittests and generate coverage report
-        run: |
-          coverage run --branch --source embodiedscan -m pytest tests/
-          coverage xml
-          coverage report -m
-
   build_cu116:
     runs-on: ubuntu-22.04
     container:
@@ -160,13 +38,8 @@ jobs:
           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 embodiedscan dependencies
-        run: |
-          pip install git+https://github.com/open-mmlab/mmengine.git@main
-          pip install -U openmim
-          pip install -r requirements/tests.txt
-      - name: Build and install
-        run: pip install -e .
+      - name: Install dependencies and EmbodiedScan
+        run: python install.py
       - name: Run unittests and generate coverage report
         run: |
           coverage run --branch --source embodiedscan -m pytest tests
@@ -194,50 +67,10 @@ jobs:
           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 embodiedscan dependencies
-        run: |
-          pip install git+https://github.com/open-mmlab/mmengine.git@main
-          pip install -U openmim
-          pip install -r requirements/tests.txt
-      - name: Build and install
-        run: pip install -e .
+      - name: Install dependencies and EmbodiedScan
+        run: python install.py
       - name: Run unittests and generate coverage report
         run: |
           coverage run --branch --source embodiedscan -m pytest tests
           coverage xml
           coverage report -m
-
-  build_windows:
-    runs-on: windows-2022
-    strategy:
-      matrix:
-        python-version: [3.7]
-        platform: [cpu, cu111]
-        torch: [1.8.1]
-        torchvision: [0.9.1]
-        include:
-          - python-version: 3.8
-            platform: cu117
-            torch: 2.0.0
-            torchvision: 0.15.1
-    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: python -m pip install pip --upgrade && pip install wheel
-      - name: Install lmdb
-        run: pip install lmdb
-      - name: Install PyTorch
-        run: pip install torch==${{matrix.torch}}+${{matrix.platform}} torchvision==${{matrix.torchvision}}+${{matrix.platform}} -f https://download.pytorch.org/whl/${{matrix.platform}}/torch_stable.html
-      - name: Install embodiedscan dependencies
-        run: |
-          pip install git+https://github.com/open-mmlab/mmengine.git@main
-          pip install -U openmim
-          pip install -r requirements/tests.txt
-      - name: Build and install
-        run: pip install -e .
-      - name: Run unittests and generate coverage report
-        run: pytest tests/
diff --git a/.github/workflows/pr_stage_test.yml b/.github/workflows/pr_stage_test.yml
@@ -13,79 +13,6 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  build_cpu:
-    runs-on: ubuntu-22.04
-    strategy:
-      matrix:
-        python-version: [3.7]
-        include:
-          - torch: 1.8.1
-            torchvision: 0.9.1
-    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: python -m pip install pip --upgrade && pip install wheel
-      - name: Install PyTorch
-        run: pip install torch==${{matrix.torch}}+cpu torchvision==${{matrix.torchvision}}+cpu -f https://download.pytorch.org/whl/cpu/torch_stable.html
-      - name: Install MMEngine
-        run: pip install git+https://github.com/open-mmlab/mmengine.git@main
-      - name: Install other dependencies
-        run: pip install -r requirements/tests.txt
-      - name: Build and install
-        run: rm -rf .eggs && pip install -e .
-      - name: Run unittests and generate coverage report
-        run: |
-          coverage run --branch --source embodiedscan -m pytest tests/
-          coverage xml
-          coverage report -m
-      # Upload coverage report for python3.7 && pytorch1.8.1 cpu
-      - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v1.0.14
-        with:
-          file: ./coverage.xml
-          flags: unittests
-          env_vars: OS,PYTHON
-          name: codecov-umbrella
-          fail_ci_if_error: false
-
-  build_cu102:
-    runs-on: ubuntu-22.04
-    container:
-      image: pytorch/pytorch:1.8.1-cuda10.2-cudnn7-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 ffmpeg libsm6 libxext6 git ninja-build libglib2.0-0 libsm6 libxrender-dev libxext6
-      - name: Install embodiedscan dependencies
-        run: |
-          pip install git+https://github.com/open-mmlab/mmengine.git@main
-          pip install -U openmim
-          pip install -r requirements/tests.txt
-      - name: Build and install
-        run: pip install -e .
-      - 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:
@@ -107,50 +34,10 @@ jobs:
           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
-      - name: Install embodiedscan dependencies
-        run: |
-          pip install git+https://github.com/open-mmlab/mmengine.git@main
-          pip install -U openmim
-          pip install -r requirements/tests.txt
-      - name: Build and install
-        run: pip install -e .
+      - name: Install dependencies and EmbodiedScan
+        run: python install.py
       - name: Run unittests and generate coverage report
         run: |
           coverage run --branch --source embodiedscan -m pytest tests/
           coverage xml
           coverage report -m
-
-  build_windows:
-    runs-on: windows-2022
-    strategy:
-      matrix:
-        python-version: [3.7]
-        platform: [cpu, cu111]
-        torch: [1.8.1]
-        torchvision: [0.9.1]
-        include:
-          - python-version: 3.8
-            platform: cu117
-            torch: 2.0.0
-            torchvision: 0.15.1
-    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: python -m pip install pip --upgrade && pip install wheel
-      - name: Install lmdb
-        run: pip install lmdb
-      - name: Install PyTorch
-        run: pip install torch==${{matrix.torch}}+${{matrix.platform}} torchvision==${{matrix.torchvision}}+${{matrix.platform}} -f https://download.pytorch.org/whl/${{matrix.platform}}/torch_stable.html
-      - name: Install embodiedscan dependencies
-        run: |
-          pip install git+https://github.com/open-mmlab/mmengine.git@main
-          pip install -U openmim
-          pip install -r requirements/tests.txt
-      - name: Build and install
-        run: pip install -e .
-      - name: Run unittests and generate coverage report
-        run: pytest tests/
diff --git a/.gitignore b/.gitignore
@@ -105,7 +105,6 @@ venv.bak/
 .mypy_cache/
 
 # cython generated cpp
-data
 .vscode
 .idea
 
@@ -121,3 +120,14 @@ demo/data/*
 
 # mac
 .DS_Store
+
+# local data
+data/scannet
+data/3rscan
+data/matterport3d
+data/*.pkl
+exps/
+todo.md
+
+# demo data
+demo/data