From c176e6cd371b8509b4a135be913146ae44819956 Mon Sep 17 00:00:00 2001 From: x0s Date: Thu, 10 Mar 2022 18:17:07 +0100 Subject: [PATCH 1/6] Merge multiple conda install commands into one --- Setup.md | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Setup.md b/Setup.md index ff758fc..b960f54 100644 --- a/Setup.md +++ b/Setup.md @@ -55,11 +55,12 @@ Follow the installation steps for installing pytorch with CUDA/GPU support here: ### 8. ... More conda installations - conda install -c conda-forge imageio - conda install -c conda-forge pytorch-lightning - conda install -c conda-forge kornia - conda install -c huggingface transformers - conda install scikit-learn pandas + conda install conda-forge::imageio \ + conda-forge::pytorch-lightning \ + conda-forge::kornia \ + huggingface::transformers \ + defaults::scikit-learn \ + defaults::pandas ### 9. Install pip dependencies @@ -125,4 +126,4 @@ pip install ./pytti-core/vendor/taming-transformers pip install ./pytti-core python -m pytti.warmup -``` \ No newline at end of file +``` From 75aba19110de278147130e4fb13f11c60b4843d7 Mon Sep 17 00:00:00 2001 From: x0s Date: Thu, 31 Mar 2022 15:02:44 +0200 Subject: [PATCH 2/6] Group install commands for pytti-core submodules --- Setup.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Setup.md b/Setup.md index b960f54..2cf6748 100644 --- a/Setup.md +++ b/Setup.md @@ -71,11 +71,11 @@ Follow the installation steps for installing pytorch with CUDA/GPU support here: git clone --recurse-submodules -j8 https://github.com/pytti-tools/pytti-core ### 11. Install pytti-core - pip install ./pytti-core/vendor/AdaBins - pip install ./pytti-core/vendor/CLIP - pip install ./pytti-core/vendor/GMA - pip install ./pytti-core/vendor/taming-transformers - pip install ./pytti-core + pip install ./pytti-core/vendor/AdaBins \ + ./pytti-core/vendor/CLIP \ + ./pytti-core/vendor/GMA \ + ./pytti-core/vendor/taming-transformers \ + ./pytti-core ### 12. (optional) Build local configs From 0af5c2299b0a86a33b0b0c5785be8f4e22930061 Mon Sep 17 00:00:00 2001 From: x0s Date: Thu, 31 Mar 2022 15:20:57 +0200 Subject: [PATCH 3/6] Fix and group uninstall command --- Setup.md | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/Setup.md b/Setup.md index 2cf6748..3f019e9 100644 --- a/Setup.md +++ b/Setup.md @@ -99,11 +99,7 @@ If you want to "factory reset" your default.yaml, just delete the config folder ### 1. Uninstall PyTTI ``` -pip uninstall -y ./pytti-core/vendor/AdaBins -pip uninstall -y ./pytti-core/vendor/CLIP -pip uninstall -y ./pytti-core/vendor/GMA -pip uninstall -y ./pytti-core/vendor/taming-transformers -pip uninstall -y pyttitools-core; +pip uninstall -y pyttitools-adabins pyttitools-gma pyttitools-taming-transformers clip pyttitools-core ``` ### 2. Delete PyTTI and any remaining build artifacts from installing it From 5d3b6f39f5bbbdf100840b15d52ffe07c202370d Mon Sep 17 00:00:00 2001 From: x0s Date: Thu, 31 Mar 2022 15:22:03 +0200 Subject: [PATCH 4/6] Group reinstall command and delete directories at unistall --- Setup.md | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/Setup.md b/Setup.md index 3f019e9..ea5e373 100644 --- a/Setup.md +++ b/Setup.md @@ -105,9 +105,7 @@ pip uninstall -y pyttitools-adabins pyttitools-gma pyttitools-taming-transformer ### 2. Delete PyTTI and any remaining build artifacts from installing it ``` -rm -rf build -rm -rf config -rm -rf pytti-core +rm -rf build config pytti-core ``` ### 3. Downloaded the latest pytti-core and re-install @@ -116,10 +114,10 @@ rm -rf pytti-core git clone --recurse-submodules -j8 https://github.com/pytti-tools/pytti-core pip install ./pytti-core/vendor/AdaBins -pip install ./pytti-core/vendor/CLIP -pip install ./pytti-core/vendor/GMA -pip install ./pytti-core/vendor/taming-transformers -pip install ./pytti-core + ./pytti-core/vendor/CLIP \ + ./pytti-core/vendor/GMA \ + ./pytti-core/vendor/taming-transformers \ + ./pytti-core python -m pytti.warmup ``` From 6959811e6b0f202e79cf52635035c67a315d9921 Mon Sep 17 00:00:00 2001 From: x0s Date: Thu, 31 Mar 2022 15:30:21 +0200 Subject: [PATCH 5/6] Make git clone more concise --- Setup.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/Setup.md b/Setup.md index ea5e373..d6e3ae7 100644 --- a/Setup.md +++ b/Setup.md @@ -69,6 +69,19 @@ Follow the installation steps for installing pytorch with CUDA/GPU support here: ### 10. Download pytti-core git clone --recurse-submodules -j8 https://github.com/pytti-tools/pytti-core +<<<<<<< HEAD +======= + +Your local directory structure probably looks like this now: + + ├── pytti-notebook + │ ├── config + │ ├── images_out + │ ├── pretrained + │ ├── pytti-core + │ └── videos + +>>>>>>> Make git clone more concise ### 11. Install pytti-core pip install ./pytti-core/vendor/AdaBins \ From 43e06b699a4ca2ed2fb1a9eb3565bf787abd957a Mon Sep 17 00:00:00 2001 From: x0s Date: Thu, 31 Mar 2022 15:44:02 +0200 Subject: [PATCH 6/6] Resolve Treeview conflict --- Setup.md | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/Setup.md b/Setup.md index d6e3ae7..ea5e373 100644 --- a/Setup.md +++ b/Setup.md @@ -69,19 +69,6 @@ Follow the installation steps for installing pytorch with CUDA/GPU support here: ### 10. Download pytti-core git clone --recurse-submodules -j8 https://github.com/pytti-tools/pytti-core -<<<<<<< HEAD -======= - -Your local directory structure probably looks like this now: - - ├── pytti-notebook - │ ├── config - │ ├── images_out - │ ├── pretrained - │ ├── pytti-core - │ └── videos - ->>>>>>> Make git clone more concise ### 11. Install pytti-core pip install ./pytti-core/vendor/AdaBins \