Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#913 #1178

Closed
wants to merge 22 commits into from
Closed

#913 #1178

wants to merge 22 commits into from

Conversation

hlky
Copy link
Contributor

@hlky hlky commented Sep 16, 2022

swfsql commented 7 days ago
Adapted changes from CompVis/stable-diffusion@main...Doggettx:stable-diffusion:main.
Similar to https://github.com/sd-webui/stable-diffusion/pull/286.
Mask commented-out because idk how to adapt it.
Note: From what I understood, if the host has enought gpu memory, then this script should not add any extra inner step and it should not have any performance degradation. Otherwise if there is not sufficient free memory, then the script will add the minimum amount of extra inner step as to make sure that the host gpu memory will be sufficient.

I'm tagging as a draft because of the mask thing.

hlky and others added 22 commits September 8, 2022 11:41
* #715 #699 #698 #663 #625 #617 #611 #604 (#716)

* Update README.md

* Add sampler name to metadata (#695)

Co-authored-by: EliEron <example@example.com>

* old-dev-merge

Co-authored-by: EliEron <subanimehd@gmail.com>
Co-authored-by: EliEron <example@example.com>

* img2img-fix (#717)

* Revert "img2img-fix (#717)"

This reverts commit 70d4b1c.

* img2img fixes

* Revert "img2img fixes"

This reverts commit e66eddc.

* Revert "Revert "img2img-fix (#717)""

This reverts commit bf08b61.

* img2img fixed

* - Removed duplicated calls to save_sample.
- Change variables and arguments to be more self-explanatory and easier to understand what they do.

* Moved streamlit files to their proper location, before they were incorrectly added to the repository root folder.

* Added retry dependency for the streamlit version.

* Added .cmd file for easy running and updating the streamlit version of the UI.

* Removed duplicated entry for streamlit on the environment.yaml file.

* Removed some unnecessary lines from the the webui_streamlit.cmd file.

* add gfpgan folder to gitignore, auto gen by imglab

* added placeholder text similar to gradio

* added auto conversion for 4 channel PNG to RGB

* fix: regex escape characters

* Update Readme links to sd-webui when appropriate (#781)

* Update link to sd-webui when appropriate

* added LDSR instruction per devilismyfriend guide

* fix: stack overflow during recursion call (#784)

* Added option to set default sampler name from config file, will be useful for those wanting to change the default sampler and  have it persist even when closing the UI and opening it again.

* Added try and except block to handle basic errors like StopException which is raised by streamlit when you hit the stop button and KeyError which happens also when stopping the generation because it tries to check the model at the end which is not loaded at that time, this can be ignored and so thats the reason for the exception.

* separate css to external file

* Added "git pull" and "git stash" to the commands run by the cmd scripts when launching the UI, this should make it so people who use it can automatically update the code from the repo and be up to date without manually using those commands everytime.

* resolve conflict with master

Co-authored-by: EliEron <subanimehd@gmail.com>
Co-authored-by: EliEron <example@example.com>
Co-authored-by: ZeroCool <ZeroCool940711@users.noreply.github.com>
Co-authored-by: ZeroCool940711 <alejandrogilelias940711@gmail.com>
Co-authored-by: Hafiidz <3688500+Hafiidz@users.noreply.github.com>
Co-authored-by: Thomas Mello <work.mello@gmail.com>
refactor js_Call hook to take all gradio arguments
* automate conda_env_name as per name in yaml

* Embed installation links directly in README.md

Include links to Windows, Linux, and Google Colab installations.

* Fix conda update in webui.sh for pip bug

* Add info about new PRs

Co-authored-by: Hafiidz <3688500+Hafiidz@users.noreply.github.com>
Co-authored-by: Tom Pham <54967380+TomPham97@users.noreply.github.com>
Co-authored-by: GRMrGecko <grmrgecko@gmail.com>
Urgent fix to remove whitespace in conda env name
This reverts commit 67515f0, reversing
changes made to a05a4a9.
Install getting stuck on user prompt:

sd  | Obtaining GFPGAN from git+https://github.com/TencentARC/GFPGAN#egg=GFPGAN (from -r /sd/condaenv.h7qk_3wn.requirements.txt (line 25))
sd  | What to do?  (i)gnore, (w)ipe, (b)ackup 
sd  | failed
sd  | 
sd  | CondaEnvException: Pip failed

this defaults the pip exists action to wiping the already existing lib and re-downloading it
* Update environment on startup always

* Message to explicitly state no environment.yaml update required

Co-authored-by: hlky <106811348+hlky@users.noreply.github.com>

Co-authored-by: Brian Semrau <brian.semrau@gmail.com>
Co-authored-by: hlky <106811348+hlky@users.noreply.github.com>
- Adapted changes from CompVis/stable-diffusion@main...Doggettx:stable-diffusion:main
- Similar to https://github.com/sd-webui/stable-diffusion/pull/286
- Mask commented-out because idk how to adapt it

Note: From what I understood, if the host has enought gpu memory, then this script should not add any extra inner step and it should not have any performance degradation.
Otherwise if there is not sufficient free memory, then the script will add the minimum amount of extra inner step as to make sure that the host gpu memory will be sufficient.
@hlky hlky closed this Sep 16, 2022
@hlky hlky deleted the 913 branch September 16, 2022 11:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants