diff --git a/README.md b/README.md index b0ff55b..73773c1 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ git submodule update --init --recursive 2. Set up conda environment ``` conda env create -f env.yaml -conda activate slahmr +conda activate slahmr5 ``` Install current source repo @@ -33,12 +33,12 @@ pip install -e . Install ViTPose ``` -pip install -v -e third_party/PHALP_plus/ViTPose +pip install -v -e third-party/PHALP_plus/ViTPose ``` and DROID-SLAM (will take a while) ``` -cd third_party/DROID-SLAM +cd third-party/DROID-SLAM python setup.py install ``` diff --git a/run_setup.sh b/run_setup.sh index a82fefc..8e3af1d 100755 --- a/run_setup.sh +++ b/run_setup.sh @@ -3,9 +3,9 @@ conda env create -f env.yaml # install source pip install -e . # install ViTPose -conda run -n slahmr5 --live-stream pip install -v -e third_party/PHALP_plus/ViTPose +conda run -n slahmr5 --live-stream pip install -v -e third-party/PHALP_plus/ViTPose # install DROID-SLAM -cd third_party/DROID-SLAM +cd third-party/DROID-SLAM conda run -n slahmr5 --live-stream python setup.py install cd ../.. diff --git a/slahmr/preproc/launch_phalp.py b/slahmr/preproc/launch_phalp.py index a950a00..baef743 100644 --- a/slahmr/preproc/launch_phalp.py +++ b/slahmr/preproc/launch_phalp.py @@ -17,7 +17,7 @@ def launch_phalp(gpus, seq, img_dir, res_dir, overwrite=False): worker_id = cur_proc._identity[0] - 1 if len(cur_proc._identity) > 0 else 0 gpu = gpus[worker_id % len(gpus)] - PHALP_DIR = os.path.abspath(f"{__file__}/../../../third_party/PHALP_plus") + PHALP_DIR = os.path.abspath(f"{__file__}/../../../third-party/PHALP_plus") print("PHALP DIR", PHALP_DIR) base_path, sample = img_dir.split(seq)[:2] diff --git a/slahmr/preproc/run_slam.py b/slahmr/preproc/run_slam.py index ee9d39e..2fcd16e 100644 --- a/slahmr/preproc/run_slam.py +++ b/slahmr/preproc/run_slam.py @@ -1,7 +1,7 @@ import os ROOT_DIR = os.path.abspath(f"{__file__}/../../../") -SRC_DIR = os.path.join(ROOT_DIR, "third_party/DROID-SLAM") +SRC_DIR = os.path.join(ROOT_DIR, "third-party/DROID-SLAM") print("PROJ SRC", ROOT_DIR) print("DROID SRC", SRC_DIR) diff --git a/third-party/PHALP_plus/README.md b/third-party/PHALP_plus/README.md index 81df4dc..0c09a7d 100644 --- a/third-party/PHALP_plus/README.md +++ b/third-party/PHALP_plus/README.md @@ -29,7 +29,7 @@ pip install timm==0.4.9 einops Also, you need to copy the large model weight in the ViTPose folder: ``` -cp -r /home/pavlakos/Projects/slahmr/third_party/PHALP_plus/ViTPose/models ./ViTPose +cp -r /home/pavlakos/Projects/slahmr/third-party/PHALP_plus/ViTPose/models ./ViTPose ``` We recommend creating a clean [conda](https://docs.conda.io/) environment and install all dependencies. diff --git a/third-party/PHALP_plus/models/pose_model.py b/third-party/PHALP_plus/models/pose_model.py index f9f44db..795744c 100644 --- a/third-party/PHALP_plus/models/pose_model.py +++ b/third-party/PHALP_plus/models/pose_model.py @@ -10,7 +10,7 @@ # project root directory ROOT_DIR = os.path.abspath(f"{__file__}/../../../../") -VIT_DIR = os.path.join(ROOT_DIR, "third_party/PHALP_plus/ViTPose") +VIT_DIR = os.path.join(ROOT_DIR, "third-party/PHALP_plus/ViTPose") class PoseModel(object): MODEL_DICT = {