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

The Merge #1201

Merged
merged 299 commits into from
Sep 18, 2022
Merged

The Merge #1201

merged 299 commits into from
Sep 18, 2022

Conversation

codedealer
Copy link
Collaborator

No description provided.

codedealer and others added 30 commits September 8, 2022 13:27
…ult one, if you want to use a custom model just place your .ckpt file in "models/custom" and the UI will detect it and let you switch between stable diffusion and your custom model, make sure to give the filename a proper name that is easy to distinguish from other models because that name will be used on the UI.

- Implemented basic Text To Video tab, will continue to improve it as it is really basic right now.
- Improved the model loading, you now should see less frequently errors about it not been loaded correctly.
Added option to support custom models and implemented basic Text To Video tab.
refactor js_Call hook to take all gradio arguments
…to the config file from the txt2vid tab calling txt2img instead.
Added "num_inference_steps" to config file and fixed some small bugs.
I want people of all skill levels to be able to contribute
This is one way the code could be split up with the aim of making it easy to understand and contribute especially for people on the lower end of the skill spectrum
All i've done is split things, I think renaming and reorganising is still needed
Changed `update_preview_frequency` from every 1 step to every 5 steps. This results in a massive gain in performance (roughly going from 2-3 times slower to only 10-15% slower) while still showing good image generation output.

Changed default GFPGAN and realESRGAN settings to be off by default. That way, users can decide if they want to use them on, and what images they wish to do so.
Streamlit: Fix loading of YAML defaults and allow user defaults to be specified in a userconfig_stream…
Fixed the user config path in webui_streamlit.py
* 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>
ZeroCool940711 and others added 17 commits September 16, 2022 16:36
This is a collection of several changes to enhance image display:

* When using GFPGAN or RealESRGAN, only the final output will be
  displayed.
* In batch>1 mode, each final image will be collected into an image grid
  for display
* The image is constrained to a reasonable size to ensure that batch
  grids of RealESRGAN'd images don't end up spitting out a massive image
  that the browser then has to handle.
* Additionally, the progress bar indicator is updated as each image is
  post-processed.
Better handling for final displays of images
Added a config option to use embeddings from the huggingface stable diffusion concept library.
…mory_usage, this for now only works on txt2vid which uses diffusers.
Added option to enable enable_attention_slicing and enable_minimal_memory_usage, this for now only works on txt2vid which uses diffusers.
Basic implementation for the Concept Library tab made by cloning the Home tab.
# Conflicts:
#	.gitignore
#	README.md
#	configs/webui/webui_streamlit.yaml
#	environment.yaml
#	frontend/css/streamlit.main.css
#	frontend/frontend.py
#	scripts/webui_streamlit.py
Used loaded_model state variable in .yaml generation
* Some options on the Streamlit txt2img page now follow the defaults from the relevant config files.

* Fixed a copy-paste gone wrong in my previous commit.

* st.session_state["defaults"] fix

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

hlky commented Sep 18, 2022

image

😬

@codedealer
Copy link
Collaborator Author

@hlky squash it 😂

@codedealer codedealer marked this pull request as ready for review September 18, 2022 10:09
@hlky hlky self-requested a review September 18, 2022 12:54
Copy link
Contributor

@hlky hlky left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🔥 🚀 🥳

@hlky hlky merged commit a797312 into Sygil-Dev:master Sep 18, 2022
hlky added a commit that referenced this pull request Sep 18, 2022
This reverts commit a797312.
hlky added a commit that referenced this pull request Sep 18, 2022
@codedealer codedealer deleted the the-merge branch September 19, 2022 20:15
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.