diff --git a/CHANGELOG.md b/CHANGELOG.md index b8156706d..09f1ed913 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,21 @@ # Change Log for SD.Next +## Update for 2023-08-07 + +- diffusers: + - **prompt attention** for sd and sd-xl + native `compel` implementation and standrd -> compel translation + thanks @ai-casanova + - advanced **lora load/apply** methods + in addition to standard lora loading that was recently added to sd-xl using diffusers, now we have + - **sequential apply** (load & apply multiple loras in sequential manner) and + - **merge and apply** (load multiple loras and merge before applying to model) + see *settings -> diffusers -> lora methods* + thanks @hameerabbasi and @ai-casanova +- general: + - updated requirements + this time its a bigger change so upgrade may take longer to install new requirements + ## Update for 2023-08-05 Another minor update, but it unlocks some cool new items... @@ -11,7 +27,6 @@ Another minor update, but it unlocks some cool new items... - new torch 2.0 with ipex (intel arc) - additional callbacks for extensions enables latest comfyui extension - - update requirements ## Update for 2023-07-30 diff --git a/README.md b/README.md index 73b78ebed..10283289a 100644 --- a/README.md +++ b/README.md @@ -71,15 +71,15 @@ Additional models will be added as they become available and there is public int - *Intel Arc* GPUs using *Intel OneAPI* **Ipex/XPU** libraries - *Apple M1/M2* on *OSX* using built-in support in Torch with **MPS** optimizations -## [Installation Instructions](https://github.com/vladmandic/automatic/wiki/Installation) +## Install & Run -### Common Problems - -- [Common Installation Errors ](https://github.com/vladmandic/automatic/discussions/1627) -- [Q&A Discussions](https://github.com/vladmandic/automatic/discussions/1011) +- [Step-by-step install guide](https://github.com/vladmandic/automatic/wiki/Installation) +- [Advanced install notes](https://github.com/vladmandic/automatic/wiki/Advanced-Install) ### Installation Notes +- [Common installation errors](https://github.com/vladmandic/automatic/discussions/1627) +- [FAQ](https://github.com/vladmandic/automatic/discussions/1011) - Server can run without virtual environment, but it is recommended to use it to avoid library version conflicts with other applications - **nVidia/CUDA** and **AMD/ROCm** are auto-detected if present and available, @@ -87,6 +87,10 @@ Additional models will be added as they become available and there is public int as installer will assume CPU-only environment - Full startup sequence is logged in `sdnext.log`, so if you encounter any issues, please check it first +### Run + +Once SD.Next is installed, simply run `webui.bat` (*Windows*) or `webui.sh` (*Linux or MacOS*) + Below is partial list of all available parameters, run `webui --help` for the full list: Setup options: diff --git a/installer.py b/installer.py index 67390b382..60ba1dfb2 100644 --- a/installer.py +++ b/installer.py @@ -428,8 +428,10 @@ def install_packages(): install(invisiblewatermark_package, 'invisible-watermark') install('onnxruntime==1.15.1', 'onnxruntime', ignore=True) install('pi-heif', 'pi_heif', ignore=True) - tensorflow_package = os.environ.get('TENSORFLOW_PACKAGE', 'tensorflow==2.12.0') + tensorflow_package = os.environ.get('TENSORFLOW_PACKAGE', 'tensorflow==2.13.0') install(tensorflow_package, 'tensorflow', ignore=True) + # bitsandbytes_package = os.environ.get('BITSANDBYTES_PACKAGE', 'bitsandbytes==0.39.1') + # install(bitsandbytes_package, 'bitsandbytes', ignore=True) if args.profile: print_profile(pr, 'Packages') diff --git a/requirements.txt b/requirements.txt index 713365b0a..7dac5b439 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,6 @@ aiohttp anyio appdirs astunparse -bitsandbytes blendmodes clean-fid easydev @@ -47,15 +46,15 @@ typing-extensions==4.7.1 antlr4-python3-runtime==4.9.3 requests==2.31.0 tqdm==4.65.0 -accelerate==0.20.3 +accelerate==0.21.0 opencv-python-headless==4.7.0.72 diffusers==0.19.3 einops==0.4.1 gradio==3.32.0 huggingface_hub==0.16.4 numexpr==2.8.4 -numpy==1.23.5 -numba==0.57.0 +numpy==1.24.4 +numba==0.57.1 pandas==1.5.3 protobuf==3.20.3 pytorch_lightning==1.9.4 diff --git a/wiki b/wiki index 35142f02a..d7cd33058 160000 --- a/wiki +++ b/wiki @@ -1 +1 @@ -Subproject commit 35142f02aee984aac261d1e1f563768d008398f6 +Subproject commit d7cd33058c4b7e09460cc58ee62850bf7705bef5