From f43779506eff7b59faca9edd30b1b306f7b82e47 Mon Sep 17 00:00:00 2001
From: gessyoo <35972345+gessyoo@users.noreply.github.com>
Date: Sun, 24 Mar 2024 16:00:05 -0400
Subject: [PATCH 1/7] Update README.md

Update python version to 3.10 to resolve dependency conflict hell
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 76402fe..824c3f8 100644
--- a/README.md
+++ b/README.md
@@ -23,7 +23,7 @@
 
 2. Install dependent packages
     ```bash
-    conda create -n SUPIR python=3.8 -y
+    conda create -n SUPIR python=3.10 -y
     conda activate SUPIR
     pip install --upgrade pip
     pip install -r requirements.txt

From 237e34bf3c5e9178fa6a8b81e2926bf06c4bec85 Mon Sep 17 00:00:00 2001
From: gessyoo <35972345+gessyoo@users.noreply.github.com>
Date: Sun, 24 Mar 2024 16:46:20 -0400
Subject: [PATCH 2/7] Update README.md

add xformers dependency
---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 824c3f8..ef9be89 100644
--- a/README.md
+++ b/README.md
@@ -27,6 +27,7 @@
     conda activate SUPIR
     pip install --upgrade pip
     pip install -r requirements.txt
+    pip install torch torchvision torchaudio --index-url https://download.pytorch.org/whl/cu121
     ```
 
 3. Download Checkpoints

From 8540016426ae71f135ba083d26bf6aa815c79059 Mon Sep 17 00:00:00 2001
From: gessyoo <35972345+gessyoo@users.noreply.github.com>
Date: Sun, 24 Mar 2024 16:47:56 -0400
Subject: [PATCH 3/7] Update README.md

revert to python 3.8
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index ef9be89..b76eec7 100644
--- a/README.md
+++ b/README.md
@@ -23,7 +23,7 @@
 
 2. Install dependent packages
     ```bash
-    conda create -n SUPIR python=3.10 -y
+    conda create -n SUPIR python=3.8 -y
     conda activate SUPIR
     pip install --upgrade pip
     pip install -r requirements.txt

From 0db2bbf6b2d6d4496aa10d245222d83aa2b7a6b7 Mon Sep 17 00:00:00 2001
From: gessyoo <35972345+gessyoo@users.noreply.github.com>
Date: Sun, 24 Mar 2024 16:50:54 -0400
Subject: [PATCH 4/7] Update requirements.txt

comment out triton. Not strictly necessary or supported for Windows, causes install errors
---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 11e74eb..ead509b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -33,7 +33,7 @@ pytorch-lightning==2.1.2
 PyYAML==6.0
 scipy==1.9.1
 tqdm==4.65.0
-triton==2.1.0
+# triton==2.1.0
 urllib3==1.26.15
 webdataset==0.2.48
 xformers>=0.0.20

From 8fa40713639c0f9c2044246b975f6e6743286fbe Mon Sep 17 00:00:00 2001
From: gessyoo <35972345+gessyoo@users.noreply.github.com>
Date: Sun, 24 Mar 2024 16:51:58 -0400
Subject: [PATCH 5/7] Update requirements.txt

---
 requirements.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index ead509b..a7a1ee1 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -33,7 +33,6 @@ pytorch-lightning==2.1.2
 PyYAML==6.0
 scipy==1.9.1
 tqdm==4.65.0
-# triton==2.1.0
 urllib3==1.26.15
 webdataset==0.2.48
 xformers>=0.0.20

From c9ad7219083aece7ef6d4bee242804749a6a51b8 Mon Sep 17 00:00:00 2001
From: gessyoo <35972345+gessyoo@users.noreply.github.com>
Date: Sun, 24 Mar 2024 21:15:29 -0400
Subject: [PATCH 6/7] Update SUPIR_v0.yaml

Add example syntax for WSL and  Windows
---
 options/SUPIR_v0.yaml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/options/SUPIR_v0.yaml b/options/SUPIR_v0.yaml
index 99d76e5..2a6ed33 100644
--- a/options/SUPIR_v0.yaml
+++ b/options/SUPIR_v0.yaml
@@ -148,7 +148,11 @@ model:
         'painting, oil painting, illustration, drawing, art, sketch, oil painting, cartoon, CG Style, 3D render, 
         unreal engine, blurring, dirty, messy, worst quality, low quality, frames, watermark, signature, 
         jpeg artifacts, deformed, lowres, over-smooth'
-
+#
+#  The 4 locations below need to be modified to point to the local locations of the models. 
+#  Under WSL, for examole, the syntax is: SDXL_CKPT: './opt/data/Juggernaut-XL_v9_RunDiffusionPhoto_v2.safetensors'
+#  Under Windows, the syntaz is: SDXL_CKPT: A:\SUPIR\opt\data\Juggernaut-XL_v9_RunDiffusionPhoto_v2.safetensors
+#
 SDXL_CKPT: /opt/data/private/AIGC_pretrain/SDXL_cache/sd_xl_base_1.0_0.9vae.safetensors
 SUPIR_CKPT_F: /opt/data/private/AIGC_pretrain/SUPIR_cache/SUPIR-v0F.ckpt
 SUPIR_CKPT_Q: /opt/data/private/AIGC_pretrain/SUPIR_cache/SUPIR-v0Q.ckpt

From 467fbddf5675d6774777eec9ae9010423ae44670 Mon Sep 17 00:00:00 2001
From: gessyoo <35972345+gessyoo@users.noreply.github.com>
Date: Sun, 24 Mar 2024 21:27:59 -0400
Subject: [PATCH 7/7] Update README.md

Clarify that configuration files need to be edit6ed if running locally.
---
 README.md | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index b76eec7..ad965e2 100644
--- a/README.md
+++ b/README.md
@@ -58,7 +58,12 @@ For users who can connect to huggingface, please setting `LLAVA_CLIP_PATH, SDXL_
 4. Edit Custom Path for Checkpoints
     ```
     * [CKPT_PTH.py] --> LLAVA_CLIP_PATH, LLAVA_MODEL_PATH, SDXL_CLIP1_PATH, SDXL_CLIP2_CACHE_DIR 
-    * [options/SUPIR_v0.yaml] --> SDXL_CKPT, SUPIR_CKPT_Q, SUPIR_CKPT_F
+    * [options/SUPIR_v0.yaml] --> SDXL_CKPT, SUPIR_CKPT_Q, SUPIR_CKPT_F    
+
+5. If running locally, you must edit /options/SUPIR_v0.yaml to point to the local locations of the model files.  Example syntax for WSK and Window is in SUPIR_v0.yaml
+
+6. 5. If running locally, you must also edit CKPT_PTH.py to point to the local locations of the model files.
+    
     ```
 ---