extern/easydiffusion
1
0
Fork 1
mirror of https://github.com/easydiffusion/easydiffusion.git synced 2025-06-20 01:48:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix whitespace during git apply

Browse Source
This commit is contained in:
cmdr2 2022-11-22 22:25:36 +05:30
parent d425dac499
commit ab4e371524
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/on_sd_start.bat
View File

@ -37,8 +37,8 @@ if exist "Open Developer Console.cmd" del "Open Developer Console.cmd"
@call git pull @call git pull
@call git -c advice.detachedHead=false checkout f6cfebffa752ee11a7b07497b8529d5971de916c @call git -c advice.detachedHead=false checkout f6cfebffa752ee11a7b07497b8529d5971de916c
@call git apply --whitespace=nowarn ..\ui\sd_internal\ddim_callback.patch @call git apply --whitespace=fix ..\ui\sd_internal\ddim_callback.patch
@call git apply --whitespace=nowarn ..\ui\sd_internal\env_yaml.patch @call git apply --whitespace=fix ..\ui\sd_internal\env_yaml.patch
@cd .. @cd ..
) else ( ) else (
@ -55,8 +55,8 @@ if exist "Open Developer Console.cmd" del "Open Developer Console.cmd"
@cd stable-diffusion @cd stable-diffusion
@call git -c advice.detachedHead=false checkout f6cfebffa752ee11a7b07497b8529d5971de916c @call git -c advice.detachedHead=false checkout f6cfebffa752ee11a7b07497b8529d5971de916c
@call git apply --whitespace=nowarn ..\ui\sd_internal\ddim_callback.patch @call git apply --whitespace=fix ..\ui\sd_internal\ddim_callback.patch
@call git apply --whitespace=nowarn ..\ui\sd_internal\env_yaml.patch @call git apply --whitespace=fix ..\ui\sd_internal\env_yaml.patch
@cd .. @cd ..
) )

8
scripts/on_sd_start.sh
View File

@ -30,8 +30,8 @@ if [ -e "scripts/install_status.txt" ] && [ `grep -c sd_git_cloned scripts/insta
git pull git pull
git -c advice.detachedHead=false checkout f6cfebffa752ee11a7b07497b8529d5971de916c git -c advice.detachedHead=false checkout f6cfebffa752ee11a7b07497b8529d5971de916c
git apply --whitespace=nowarn ../ui/sd_internal/ddim_callback.patch || fail "ddim patch failed" git apply --whitespace=fix ../ui/sd_internal/ddim_callback.patch || fail "ddim patch failed"
git apply --whitespace=nowarn ../ui/sd_internal/env_yaml.patch || fail "yaml patch failed" git apply --whitespace=fix ../ui/sd_internal/env_yaml.patch || fail "yaml patch failed"
cd .. cd ..
else else
@ -46,8 +46,8 @@ else
cd stable-diffusion cd stable-diffusion
git -c advice.detachedHead=false checkout f6cfebffa752ee11a7b07497b8529d5971de916c git -c advice.detachedHead=false checkout f6cfebffa752ee11a7b07497b8529d5971de916c
git apply --whitespace=nowarn ../ui/sd_internal/ddim_callback.patch || fail "ddim patch failed" git apply --whitespace=fix ../ui/sd_internal/ddim_callback.patch || fail "ddim patch failed"
git apply --whitespace=nowarn ../ui/sd_internal/env_yaml.patch || fail "yaml patch failed" git apply --whitespace=fix ../ui/sd_internal/env_yaml.patch || fail "yaml patch failed"
cd .. cd ..
fi fi

6
ui/sd_internal/ddim_callback.patch
View File

@ -17,7 +17,7 @@ index b967b55..35ef520 100644
# sampling # sampling
+ if sampler in ('ddim', 'dpm2', 'heun', 'dpm2_a', 'lms') and not hasattr(self, 'ddim_timesteps'): + if sampler in ('ddim', 'dpm2', 'heun', 'dpm2_a', 'lms') and not hasattr(self, 'ddim_timesteps'):
+ self.make_schedule(ddim_num_steps=S, ddim_eta=eta, verbose=False) + self.make_schedule(ddim_num_steps=S, ddim_eta=eta, verbose=False)
if sampler == "plms": if sampler == "plms":
self.make_schedule(ddim_num_steps=S, ddim_eta=eta, verbose=False) self.make_schedule(ddim_num_steps=S, ddim_eta=eta, verbose=False)
@@ -528,39 +530,46 @@ class UNet(DDPM): @@ -528,39 +530,46 @@ class UNet(DDPM):
@ -103,7 +103,7 @@ index b967b55..35ef520 100644
@@ -730,10 +740,13 @@ class UNet(DDPM): @@ -730,10 +740,13 @@ class UNet(DDPM):
unconditional_guidance_scale=unconditional_guidance_scale, unconditional_guidance_scale=unconditional_guidance_scale,
unconditional_conditioning=unconditional_conditioning) unconditional_conditioning=unconditional_conditioning)
+ if callback: yield from callback(i) + if callback: yield from callback(i)
+ if img_callback: yield from img_callback(x_dec, i) + if img_callback: yield from img_callback(x_dec, i)
+ +
@ -239,7 +239,7 @@ index b967b55..35ef520 100644
- -
+ if img_callback: yield from img_callback(x, i) + if img_callback: yield from img_callback(x, i)
d = to_d(x, sigma_hat, denoised) d = to_d(x, sigma_hat, denoised)
# Midpoint method, where the midpoint is chosen according to a rho=3 Karras schedule # Midpoint method, where the midpoint is chosen according to a rho=3 Karras schedule
@@ -945,11 +982,13 @@ class UNet(DDPM): @@ -945,11 +982,13 @@ class UNet(DDPM):