diff --git a/README.md b/README.md index 1f46d36..f85c5d4 100644 --- a/README.md +++ b/README.md @@ -36,12 +36,13 @@ Understanding how humans leverage semantic knowledge to navigate unfamiliar envi ## :hammer_and_wrench: Installation ### Getting Started - Create the conda environment: ```bash conda_env_name=vlfm -conda create -n $conda_env_name python=3.9 -y && -conda activate $conda_env_name +conda create -n conda_env_name python=3.9 -y +conda activate conda_env_name +pip install torch==1.12.1+cu113 torchvision==0.13.1+cu113 -f https://download.pytorch.org/whl/torch_stable.html +pip install git+https://github.com/IDEA-Research/GroundingDINO.git@eeba084341aaa454ce13cb32fa7fd9282fc73a67 salesforce-lavis==1.0.2 ``` If you are using habitat and are doing simulation experiments, install this repo into your env with the following: ```bash @@ -51,34 +52,10 @@ If you are using the Spot robot, install this repo into your env with the follow ```bash pip install -e .[reality] ``` -Install all the dependencies: -```bash -git clone git@github.com:IDEA-Research/GroundingDINO.git -git clone git@github.com:WongKinYiu/yolov7.git # if using YOLOv7 -``` -Follow the original install directions for GroundingDINO, which can be found here: https://github.com/IDEA-Research/GroundingDINO. - -Nothing needs to be done for YOLOv7, but it needs to be cloned into the repo. - -### Installing GroundingDINO (Only if using conda-installed CUDA) -Only attempt if the installation instructions in the GroundingDINO repo do not work. - -To install GroundingDINO, you will need `CUDA_HOME` set as an environment variable. If you would like to install a certain version of CUDA that is compatible with the one used to compile your version of pytorch, and you are using conda, you can run the following commands to install CUDA and set `CUDA_HOME`: +#### [Whether you're using conda or not] +Clone the following repo within this one (simply cloning will suffice): ```bash -# This example is specifically for CUDA 11.8 -mamba install \ - cub \ - thrust \ - cuda-runtime \ - cudatoolkit=11.8 \ - cuda-nvcc==11.8.89 \ - -c "nvidia/label/cuda-11.8.0" \ - -c nvidia && -ln -s ${CONDA_PREFIX}/lib/python3.9/site-packages/nvidia/cuda_runtime/include/* ${CONDA_PREFIX}/include/ && -ln -s ${CONDA_PREFIX}/lib/python3.9/site-packages/nvidia/cusparse/include/* ${CONDA_PREFIX}/include/ && -ln -s ${CONDA_PREFIX}/lib/python3.9/site-packages/nvidia/cublas/include/* ${CONDA_PREFIX}/include/ && -ln -s ${CONDA_PREFIX}/lib/python3.9/site-packages/nvidia/cusolver/include/* ${CONDA_PREFIX}/include/ && -export CUDA_HOME=${CONDA_PREFIX} +git clone git@github.com:WongKinYiu/yolov7.git ``` ## :dart: Downloading the HM3D dataset diff --git a/pyproject.toml b/pyproject.toml index 3fe19df..6943b2f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -14,17 +14,17 @@ authors = [ readme = "README.md" requires-python = ">=3.9" dependencies = [ - "torch >= 1.10.1", + "torch == 1.12.1", + "torchvision == 0.13.1", "numpy >= 1.22.4", "flask >= 2.3.2", "seaborn >= 0.12.2", # required by yolov7 "open3d >= 0.17.0", "transformers == 4.26.0", # higher versions than 4.26.0 "break" BLIP-2 in LAVIS - "salesforce-lavis >= 1.0.2", # for BLIP-2 "frontier_exploration @ git+https://github.com/naokiyokoyama/frontier_exploration.git", "mobile_sam @ git+https://github.com/ChaoningZhang/MobileSAM.git", "depth_camera_filtering @ git+https://github.com/naokiyokoyama/depth_camera_filtering", - "groundingdino @ git+https://github.com/IDEA-Research/GroundingDINO.git", + "timm == 0.4.12", ] [project.optional-dependencies] @@ -132,4 +132,4 @@ warn_unreachable = true warn_redundant_casts = true no_implicit_optional = true files = ['vlfm','test','scripts'] -exclude = "^(docker|.*external|.*thirdparty|.*install|.*build|.*_experimental|.*_pb2.py|.*_pb2_grpc.py)" +exclude = "^(docker|.*external|.*thirdparty|.*install|.*build|.*_experimental|.*_pb2.py|.*_pb2_grpc.py)" \ No newline at end of file