Skip to content

Commit 71475a5

Browse files
authored
[bugfix] Support habitat-lab requirements.txt after split (#1890)
* Habitat-lab requirements.txt has been moved to habitat-lab/habitat-lab/ directory * update requirements path in colab installer * change install from setup.py to pip * install mock manually in CI
1 parent f9d7446 commit 71475a5

2 files changed

Lines changed: 12 additions & 10 deletions

File tree

.circleci/config.yml

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,8 @@ commands:
124124
# For whatever reason we have to install pytorch first. If it isn't
125125
# it installs the 1.4 cpuonly version. Which is no good.
126126
conda install -q -y pytorch torchvision cudatoolkit=11.3 -c pytorch
127-
conda install -q -y -c conda-forge ninja numpy pytest pytest-cov ccache hypothesis
128-
pip install pytest-sugar pytest-xdist pytest-benchmark opencv-python cython
127+
conda install -q -y -c conda-forge ninja numpy pytest pytest-cov ccache hypothesis pytest-mock
128+
pip install pytest-sugar pytest-xdist pytest-benchmark opencv-python cython mock
129129
fi
130130
- run:
131131
name: Install emscripten
@@ -439,7 +439,7 @@ jobs:
439439
git clone -q --depth 1 https://github.com/facebookresearch/habitat-lab.git
440440
fi
441441
cd habitat-lab
442-
pip install -r requirements.txt --progress-bar off
442+
pip install -r habitat-lab/requirements.txt --progress-bar off
443443
ln -s ../habitat-sim/data data
444444
touch ~/miniconda/pip_deps_installed
445445
- run:
@@ -448,8 +448,11 @@ jobs:
448448
command: |
449449
export PATH=$HOME/miniconda/bin:$PATH
450450
. activate habitat; cd habitat-lab
451-
python -u setup.py develop --all
452-
python -u setup.py test
451+
pip install -e habitat-lab
452+
pip install -e habitat-baselines
453+
export PYTHONPATH=.:$PYTHONPATH
454+
export MULTI_PROC_OFFSET=0 && export MAGNUM_LOG=quiet && export HABITAT_SIM_LOG=quiet
455+
python -m pytest
453456
- save_cache:
454457
key: habitat-lab-{{ checksum "./hablab_sha" }}
455458
background: true
@@ -461,8 +464,8 @@ jobs:
461464
export PATH=$HOME/miniconda/bin:/usr/local/cuda/bin:$PATH
462465
. activate habitat; cd habitat-lab
463466
# Install requirments first to avoid errors related to gym
464-
pip install -r requirements.txt --progress-bar off
465-
python setup.py develop --all
467+
pip install -r habitat-lab/requirements.txt --progress-bar off
468+
pip install -e habitat-lab
466469
467470
cd docs
468471
conda install -y -c conda-forge doxygen

examples/colab_utils/colab_install.sh

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,11 @@ git clone https://github.com/facebookresearch/habitat-sim --depth 1
4343
#Install Requirements.
4444
cd /content/habitat-lab/
4545
set +e
46-
pip install -r ./requirements.txt
46+
pip install -r ./habitat-lab/requirements.txt
4747
reqs=(./habitat_baselines/**/requirements.txt)
4848
pip install "${reqs[@]/#/-r}"
4949
set -e
50-
python setup.py develop --all
51-
pip install . #Reinstall to trigger sys.path update
50+
pip install -e habitat-lab
5251
cd /content/habitat-sim/
5352

5453
#Download Assets

0 commit comments

Comments
 (0)