From 6eff9f9789ad3abffc16e0bfb42cec5ffec84a2f Mon Sep 17 00:00:00 2001 From: Akbar Nurlybayev Date: Fri, 16 Sep 2022 16:32:27 -0600 Subject: [PATCH 1/5] Update checksums for new model --- analyzer/habitat/data/checksums | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/analyzer/habitat/data/checksums b/analyzer/habitat/data/checksums index 1e028f4..8da7700 100644 --- a/analyzer/habitat/data/checksums +++ b/analyzer/habitat/data/checksums @@ -1,5 +1,5 @@ -d445af3308bc67a087446bed3d7c160fcde458cb bmm/model.pth -b7c4a4ccd2a447a6a9d63e6658461f1f1a9dc08b conv2d/model.pth +b2c102539c05fd9169774c9fc32f0732a82b679e bmm/model.pth +376bd8d9233c3384be01e638191e842ebc212f5f conv2d/model.pth 659a00c6cff529613b40d5166fe7d93f42e8327d kernels.sqlite -930d5a79b35755ae7a8ab72a9b5585423dc02ab7 linear/model.pth -2da58bcea595de031584da214b29510b9e897466 lstm/model.pth +9f17fb74321fe1a82d9d647cd8c976b724b69a94 linear/model.pth +ef93bb74178d38660b31ac0bef262c39b1e6ba16 lstm/model.pth From 9d389f6bc4d2732f853d5334308cfc2a5c4db9db Mon Sep 17 00:00:00 2001 From: Akbar Nurlybayev Date: Fri, 16 Sep 2022 16:33:38 -0600 Subject: [PATCH 2/5] Remove habitat models from gitignore --- .gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitignore b/.gitignore index 69962a8..6bd84e7 100644 --- a/.gitignore +++ b/.gitignore @@ -8,7 +8,6 @@ analyzer/habitat/data/LICENSE analyzer/habitat/data/NOTICE analyzer/habitat/data/README.md analyzer/habitat/data/kernels.sqlite -analyzer/habitat/data/**/*.pth # Python *.pyc From 3d332e2c6e139a10a96326e2f80332c834a37274 Mon Sep 17 00:00:00 2001 From: Akbar Nurlybayev Date: Fri, 16 Sep 2022 16:34:57 -0600 Subject: [PATCH 3/5] Start tracking habitat models with Git LFS --- analyzer/habitat/data/.gitattributes | 1 + analyzer/habitat/data/bmm/model.pth | 3 +++ analyzer/habitat/data/conv2d/model.pth | 3 +++ analyzer/habitat/data/linear/model.pth | 3 +++ analyzer/habitat/data/lstm/model.pth | 3 +++ 5 files changed, 13 insertions(+) create mode 100644 analyzer/habitat/data/.gitattributes create mode 100644 analyzer/habitat/data/bmm/model.pth create mode 100644 analyzer/habitat/data/conv2d/model.pth create mode 100644 analyzer/habitat/data/linear/model.pth create mode 100644 analyzer/habitat/data/lstm/model.pth diff --git a/analyzer/habitat/data/.gitattributes b/analyzer/habitat/data/.gitattributes new file mode 100644 index 0000000..ec4a626 --- /dev/null +++ b/analyzer/habitat/data/.gitattributes @@ -0,0 +1 @@ +*.pth filter=lfs diff=lfs merge=lfs -text diff --git a/analyzer/habitat/data/bmm/model.pth b/analyzer/habitat/data/bmm/model.pth new file mode 100644 index 0000000..4ab0141 --- /dev/null +++ b/analyzer/habitat/data/bmm/model.pth @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:40f460aab2babcdfbb686d5c8c6ddfefd7e0815bb33ccae0a484a715addd46f0 +size 33634793 diff --git a/analyzer/habitat/data/conv2d/model.pth b/analyzer/habitat/data/conv2d/model.pth new file mode 100644 index 0000000..497cfb1 --- /dev/null +++ b/analyzer/habitat/data/conv2d/model.pth @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:14b30d81e4df6fb40bba5006e9ef7f01d7eb0eb2edb063ab770e9963ae0739e8 +size 33651241 diff --git a/analyzer/habitat/data/linear/model.pth b/analyzer/habitat/data/linear/model.pth new file mode 100644 index 0000000..c27c0f6 --- /dev/null +++ b/analyzer/habitat/data/linear/model.pth @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f0cc01b6684dbce5e322a010de219d0daccdb171e35a0440f96e9e3d545642e7 +size 33634793 diff --git a/analyzer/habitat/data/lstm/model.pth b/analyzer/habitat/data/lstm/model.pth new file mode 100644 index 0000000..006f7dc --- /dev/null +++ b/analyzer/habitat/data/lstm/model.pth @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cf50e632cb66f3f8585f65a14d44f36b373ea320f60fb27ab1477d5e6983c249 +size 33647145 From 629a5cdf958da3bb2b46f0309dea8aabcc457981 Mon Sep 17 00:00:00 2001 From: Akbar Nurlybayev Date: Fri, 16 Sep 2022 16:52:29 -0600 Subject: [PATCH 4/5] Remove all mentions of model extraction --- README.md | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index c3e8d12..3384c97 100644 --- a/README.md +++ b/README.md @@ -49,25 +49,18 @@ Prerequsites: - A system equiped with an Nvidia GPU with properly configured CUDA - [CUDA Toolkit](https://developer.nvidia.com/cuda-toolkit-archive) - [cmake v3.17+](https://github.com/Kitware/CMake/releases) -- [Habitat pre-trained models](https://zenodo.org/record/4876277) +- [Git Large File Storage](https://git-lfs.github.com/) - which contains pre-trained habitat models ```zsh git clone https://github.com/CentML/habitat.git && cd habitat git submodule init && git submodule update - -# Download the pre-trained models -cd analyzer -curl -O https://zenodo.org/record/4876277/files/habitat-models.tar.gz\?download\=1 - -# Install the models -./extract-models.sh ``` **Note:** Habitat needs access to your GPU's performance counters, which requires special permissions if you are running with a recent driver (418.43 or later). If you encounter a `CUPTI_ERROR_INSUFFICIENT_PRIVILEGES` error when running Habitat, please follow the instructions [here](https://developer.nvidia.com/ERR_NVGPUCTRPERM) and in [issue #5](https://github.com/geoffxy/habitat/issues/5). ### Building with Docker -Habitat has been tested to work on the latest version of [NVIDIA NGC PyTorch containers](https://catalog.ngc.nvidia.com/orgs/nvidia/containers/pytorch). +Habitat has been tested to work on the latest version of [NVIDIA NGC PyTorch containers](https://catalog.ngc.nvidia.com/orgs/nvidia/containers/pytorch). 1. To build Habitat with Docker, first run the NGC container. ```bash @@ -78,7 +71,6 @@ docker run --gpus all -it --rm nvcr.io/nvidia/pytorch:22.08-py3 git clone --recursive https://github.com/centml/habitat ./habitat/analyzer/install-dev.sh ``` -3. Download and extract the pretrained models by following the steps in the previous section. ### Building without Docker @@ -87,10 +79,10 @@ git clone --recursive https://github.com/centml/habitat CUPTI is a profiling interface required by Habitat. Select the correct version of CUDA [here](https://developer.nvidia.com/cuda-toolkit-archive) and following the instructions to add NVIDIA's repository. Then, install CUPTI with: ```bash sudo apt-get install cuda-cupti-11-x -``` +``` where `11-x` represents the version of CUDA you have installed. -2. Install `CMake` 3.17+. +2. Install `CMake` 3.17+. Follow these steps to download and install a precompiled version of CMake: ```bash @@ -109,7 +101,6 @@ cmake --version git clone https://github.com/centml/habitat ./habitat/analyzer/install-dev.sh ``` -4. Download and extract the pretrained models by following the steps in the previous section.

Usage example

From 41c39dc744ac981ecebca6e00d1b1f3c697b9f33 Mon Sep 17 00:00:00 2001 From: Akbar Nurlybayev Date: Fri, 16 Sep 2022 16:53:08 -0600 Subject: [PATCH 5/5] Remove extract-models.sh since it is not required anymore --- analyzer/extract-models.sh | 20 -------------------- 1 file changed, 20 deletions(-) delete mode 100755 analyzer/extract-models.sh diff --git a/analyzer/extract-models.sh b/analyzer/extract-models.sh deleted file mode 100755 index dc88037..0000000 --- a/analyzer/extract-models.sh +++ /dev/null @@ -1,20 +0,0 @@ -#! /bin/bash - -set -e - -if [ -z $1 ]; then - >&2 echo "Usage: $0 path/to/habitat-models.tar.gz" - >&2 echo "" - >&2 echo "This script extracts and installs Habitat's pre-trained models." - exit 1 -fi - -archive_loc=$(pwd)/$1 - -script_loc=$(cd $(dirname $0) && pwd -P) -cd $script_loc - -tar xzf $archive_loc -C habitat/data/ -cd habitat/data/ - -./verify.sh