1580158
/
automatic
mirror of https://github.com/vladmandic/automatic
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
5,149 Commits
3 Branches
29 Tags
109 MiB
Commit Graph

361 Commits (0a49961baaaa594313baffba7a000e4e98712c71)

Author SHA1 Message Date
Vladimir Mandic 6981262beb validate script_args 2023-04-25 19:02:43 -04:00
Vladimir Mandic bb438efed4 update geninfo 2023-04-25 09:53:11 -04:00
Vladimir Mandic 986bc340ca
Merge pull request #438 from Sakura-Luna/pr9295 
Add bf16 support for VAE
 2023-04-24 11:36:28 -04:00
Vladimir Mandic 5b9187d38b combo patch 2023-04-24 10:30:23 -04:00
Sakura-Luna 458a78e4de
Merge branch 'master' into pr9295 2023-04-24 13:19:57 +08:00
Vladimir Mandic d3fbd798fb add setup.log note 2023-04-22 09:30:09 -04:00
Vladimir Mandic e02415b41e
Merge pull request #255 from catboxanon/patch/9092 
Patch/9092
 2023-04-21 09:13:11 -04:00
Vladimir Mandic 5739c8892f
Merge pull request #256 from catboxanon/patch/sampler-schedule-fix 
Patch/sampler schedule fix
 2023-04-21 09:12:45 -04:00
papuSpartan 9e8dc9843c port to vlad 2023-04-21 03:18:08 -05:00
Vladimir Mandic 7939a1649d parse model preload 2023-04-20 23:19:25 -04:00
Vladimir Mandic 0e7144186d jump patch 2023-04-20 11:20:27 -04:00
catboxanon 9de7298898
Update processing.py 2023-04-16 21:06:37 -04:00
catboxanon 4d0c816303
Modify step multiplier flow 2023-04-16 20:39:45 -04:00
catboxanon 56f8a6b081
Fix sampler schedules with step multiplier 2023-04-16 20:34:52 -04:00
Vladimir Mandic ed8819b8fc lycoris, strong linting, model keyword, circular imports 2023-04-15 10:28:31 -04:00
catboxanon fbab3fc6d1
Only handle image mask if any option enabled 2023-04-14 17:24:55 -04:00
catboxanon 3af152d488
Fix image mask composite for weird resolutions 2023-04-14 17:17:14 -04:00
Vladimir Mandic 81b8294e93 switch cmdflags to settings 2023-04-12 10:40:11 -04:00
Sakura-Luna d19d227138
Add startup parameters and version check 2023-04-06 19:52:18 +08:00
Sakura-Luna 4aa115d5c1
Add bf16 support. 2023-04-02 17:28:44 +08:00
Vladimir Mandic 86b83fc956
Merge pull request #66 from AUTOMATIC1111/master 
merge from upstream
 2023-03-28 16:43:39 -04:00
AUTOMATIC 433b3ab701 Revert "Merge pull request #7931 from space-nuko/img2img-enhance" 
This reverts commit 4268759370, reversing
changes made to 1b63afbedc.
 2023-03-28 20:36:57 +03:00
AUTOMATIC1111 4268759370
Merge pull request #7931 from space-nuko/img2img-enhance 
Add `Upscale by` and `Upscaler` options to img2img
 2023-03-28 20:21:25 +03:00
AUTOMATIC1111 f1db987e6a
Merge pull request #8958 from MrCheeze/variations-model 
Add support for the unclip (Variations) models, unclip-h and unclip-l
 2023-03-28 19:39:20 +03:00
MrCheeze 8a34671fe9 Add support for the Variations models (unclip-h and unclip-l) 2023-03-25 21:03:07 -04:00
space-nuko 7ea5d395c4 Add upscaler to img2img 2023-03-25 12:52:43 -04:00
space-nuko 68999d0b15 Add upscale slider to img2img 2023-03-25 12:52:35 -04:00
Vladimir Mandic f181885f0c
Merge pull request #57 from AUTOMATIC1111/master 
merge from upstream
 2023-03-25 08:47:00 -04:00
catboxanon caf84e8233 Expose inpainting mask and composite 
For inpainting, this exposes the mask and masked composite and gives
the user the ability to display these in the web UI,
save to disk, or both.
 2023-03-22 17:51:40 +00:00
Vladimir Mandic df51949f3b
Merge pull request #53 from AUTOMATIC1111/master 
merge from upstream
 2023-03-14 07:58:58 -04:00
high_byte 4d26c7da57 initialize extra_network_data before use 2023-03-13 17:37:29 +02:00
Vladimir Mandic 86e89e5446
Merge pull request #46 from AUTOMATIC1111/master 
merge from upstream
 2023-03-11 08:02:09 -05:00
AUTOMATIC1111 da3f942ab2
Merge pull request #8017 from space-nuko/before-process-batch 
Add `before_process_batch` script callback
 2023-03-11 14:33:38 +03:00
space-nuko ac38ad7e60 Merge remote-tracking branch 'origin/master' into unipc 2023-03-10 19:42:46 -05:00
Vladimir Mandic 2dabba9190
Merge pull request #40 from space-nuko/unipc 
integrate unipc sampler
 2023-03-10 09:57:24 -05:00
Vladimir Mandic 679320a764 add profiler 2023-02-28 10:04:25 -05:00
space-nuko a2d635ad13 Add before_process_batch script callback 2023-02-22 01:52:53 -08:00
AUTOMATIC 15f4b217b1 fix the a merge conflict resolve i did that entirely breaks image generation 2023-02-19 09:50:14 +03:00
AUTOMATIC1111 6911deb242
Merge branch 'master' into fix-save-params-2 2023-02-19 09:15:45 +03:00
space-nuko b20737815a Fix params.txt saving for infotexts modified by process_batch 2023-02-16 21:44:46 -08:00
space-nuko 0a4917ac40 Apply extra networks per-batch instead of per-session (fixes wildcards) 2023-02-13 03:33:28 -08:00
space-nuko fb274229b2 bug fix 2023-02-10 14:30:35 -08:00
space-nuko c88dcc20d4 UniPC does not support img2img (for now) 2023-02-10 05:00:54 -08:00
space-nuko 1253199889 Working UniPC (for batch size 1) 2023-02-10 03:30:20 -08:00
Kyle c27c0de0f7 txt2img Hires Fix 2023-02-03 19:15:32 -05:00
Kyle 6c6c6636bb Image CFG Added (Full Implementation) 
Uses separate denoiser for edit (instruct-pix2pix) models

No impact to txt2img or regular img2img

"Image CFG Scale" will only apply to instruct-pix2pix models and metadata will only be added if using such model
 2023-02-03 18:19:56 -05:00
Kyle 3b2ad20ac1 Processing only, no CFGDenoiser change 
Allows instruct-pix2pix
 2023-02-02 19:19:45 -05:00
Kyle cf0cfefe91 Revert "instruct-pix2pix support" 
This reverts commit 269833067d.
 2023-02-02 19:15:38 -05:00
Kyle 269833067d instruct-pix2pix support 2023-02-02 09:37:01 -05:00
AUTOMATIC 040ec7a80e make the program read Eta and Eta DDIM from generation parameters 2023-01-30 10:47:09 +03:00
AUTOMATIC 00dab8f10d remove Batch size and Batch pos from textinfo (goodbye) 2023-01-29 11:53:24 +03:00
AUTOMATIC1111 fecb990deb
Merge pull request #7309 from brkirch/fix-embeddings 
Fix embeddings, upscalers, and refactor `--upcast-sampling`
 2023-01-28 18:44:36 +03:00
brkirch ada17dbd7c Refactor conditional casting, fix upscalers 2023-01-28 04:16:25 -05:00
Max Audron 5eee2ac398 add data-dir flag and set all user data directories based on it 2023-01-27 14:44:30 +01:00
AUTOMATIC 7a14c8ab45 add an option to enable sections from extras tab in txt2img/img2img 
fix some style inconsistenices
 2023-01-26 23:31:32 +03:00
brkirch 10421f93c3 Fix full previews, --no-half-vae 2023-01-26 01:43:35 -05:00
AUTOMATIC d1d6ce2983 add edit_image_conditioning from my earlier edits in case there's an attempt to inegrate pix2pix properly 
this allows to use pix2pix model in img2img though it won't work well this way
 2023-01-25 23:25:25 +03:00
AUTOMATIC1111 1574e96729
Merge pull request #6510 from brkirch/unet16-upcast-precision 
Add upcast options, full precision sampling from float16 UNet and upcasting attention for inference using SD 2.1 models without --no-half
 2023-01-25 19:12:29 +03:00
AUTOMATIC 57c1baa774 change to code for live preview fix on OSX to be bit more obvious 2023-01-25 18:56:23 +03:00
brkirch e3b53fd295 Add UI setting for upcasting attention to float32 
Adds "Upcast cross attention layer to float32" option in Stable Diffusion settings. This allows for generating images using SD 2.1 models without --no-half or xFormers.

In order to make upcasting cross attention layer optimizations possible it is necessary to indent several sections of code in sd_hijack_optimizations.py so that a context manager can be used to disable autocast. Also, even though Stable Diffusion (and Diffusers) only upcast q and k, unfortunately my findings were that most of the cross attention layer optimizations could not function unless v is upcast also.
 2023-01-25 01:13:04 -05:00
brkirch 84d9ce30cb Add option for float32 sampling with float16 UNet 
This also handles type casting so that ROCm and MPS torch devices work correctly without --no-half. One cast is required for deepbooru in deepbooru_model.py, some explicit casting is required for img2img and inpainting. depth_model can't be converted to float16 or it won't work correctly on some systems (it's known to have issues on MPS) so in sd_models.py model.depth_model is removed for model.half().
 2023-01-25 01:13:02 -05:00
brkirch f64af77adc Fix different first gen with Approx NN previews 
The loading of the model for approx nn live previews can change the internal state of PyTorch, resulting in a different image. This can be avoided by preloading the approx nn model in advance.
 2023-01-23 22:49:20 -05:00
AUTOMATIC 78f59a4e01 enable compact view for train tab 
prevent  previews from ruining hypernetwork training
 2023-01-22 00:02:51 +03:00
AUTOMATIC 3deea34135 extract extra network data from prompt earlier 2023-01-21 19:36:08 +03:00
AUTOMATIC 92fb1096db make it so that extra networks are not removed from infotext 2023-01-21 16:41:25 +03:00
AUTOMATIC 40ff6db532 extra networks UI 
rework of hypernets: rather than via settings, hypernets are added directly to prompt as <hypernet:name:weight>
 2023-01-21 08:36:07 +03:00
AUTOMATIC1111 a8322ad75b
Merge pull request #6854 from EllangoK/master 
Saves Extra Generation Parameters to params.txt
 2023-01-18 23:25:56 +03:00
AUTOMATIC b186d44dcd use DDIM in hires fix is the sampler is PLMS 2023-01-18 23:20:23 +03:00
EllangoK 5e15a0b422 Changed params.txt save to after manual init call 2023-01-17 11:42:44 -05:00
AUTOMATIC e0e8005009 make StableDiffusionProcessing class not hold a reference to shared.sd_model object 2023-01-16 23:09:08 +03:00
AUTOMATIC 9991967f40 Add a check and explanation for tensor with all NaNs. 2023-01-16 22:59:46 +03:00
AUTOMATIC f9ac3352cb change hypernets to use sha256 hashes 2023-01-14 10:25:37 +03:00
space-nuko 88416ab5ff Fix extension parameters not being saved to last used parameters 2023-01-12 13:46:59 -08:00
AUTOMATIC d4fd2418ef add an option to use old hiresfix width/height behavior 
add a visual effect to inactive hires fix elements
 2023-01-09 14:57:47 +03:00
noodleanon 50e2536279
Merge branch 'AUTOMATIC1111:master' into img2img-api-scripts 2023-01-07 14:18:09 +00:00
AUTOMATIC 1a5b86ad65 rework hires fix preview for #6437: movie it to where it takes less place, make it actually account for all relevant sliders and calculate dimensions correctly 2023-01-07 09:56:37 +03:00
noodleanon b5253f0dab
allow img2img api to run scripts 2023-01-05 21:21:48 +00:00
AUTOMATIC 847f869c67 experimental optimization 2023-01-05 21:00:52 +03:00
AUTOMATIC 2e30997450 move sd_model assignment to the place where we change the sd_model 2023-01-05 10:21:17 +03:00
Philpax 83ca8dd0c9
Merge branch 'AUTOMATIC1111:master' into fix-sd-arch-switch-in-override-settings 2023-01-05 05:00:58 +01:00
AUTOMATIC 99b67cff0b make hires fix not do anything if the user chooses the second pass resolution to be the same as first pass resolution 2023-01-05 01:25:52 +03:00
AUTOMATIC bc43293c64 fix incorrect display/calculation for number of steps for hires fix in progress bars 2023-01-04 23:56:43 +03:00
AUTOMATIC 8149078094 added the option to specify target resolution with possibility of truncating for hires fix; also sampling steps 2023-01-04 22:04:40 +03:00
AUTOMATIC 097a90b88b add XY plot parameters to grid image and do not add them to individual images 2023-01-04 19:19:11 +03:00
AUTOMATIC 525cea9245 use shared function from processing for creating dummy mask when training inpainting model 2023-01-04 17:58:07 +03:00
AUTOMATIC 4d66bf2c0d add infotext to "-before-highres-fix" images 2023-01-04 17:24:46 +03:00
AUTOMATIC1111 6281c1bdb4
Merge pull request #6299 from stysmmaker/feat/latent-upscale-modes 
Add more latent upscale modes
 2023-01-04 13:47:36 +03:00
MMaker 15fd0b8bc4
Update processing.py 2023-01-04 05:12:54 -05:00
MMaker e5b7ee910e
fix: Save full res of intermediate step 2023-01-04 04:22:01 -05:00
AUTOMATIC e9fb9bb0c2 fix hires fix not working in API when user does not specify upscaler 2023-01-03 17:40:20 +03:00
AUTOMATIC ef27a18b6b Hires fix rework 2023-01-02 19:42:10 +03:00
AUTOMATIC f4535f6e4f make it so that memory/embeddings info is displayed in a separate UI element from generation parameters, and is preserved when you change the displayed infotext by clicking on gallery images 2022-12-31 23:40:55 +03:00
AUTOMATIC 4af3ca5393 make it so that blank ENSD does not break image generation 2022-12-26 10:11:28 +03:00
Philpax fa931733f6 fix(api): assign sd_model after settings change 2022-12-25 20:17:49 +11:00
AUTOMATIC1111 064f7b8fd2
Merge pull request #5718 from space-nuko/feature/save-hypernetwork-hash 
Save hypernetwork hash and fix hypernetwork parameter restoring
 2022-12-24 11:14:19 +03:00
AUTOMATIC c0a8401b5a rename the option for img2img latent upscale 2022-12-24 11:12:17 +03:00
AUTOMATIC1111 b2dbd4d698
Merge pull request #5521 from AndrewRyanChama/ryan/img2imglatentscale 
Add latent upscale option to img2img
 2022-12-24 11:10:35 +03:00
AUTOMATIC1111 7578b50ba6
Merge pull request #5873 from philpax/override-settings-restore-afterwards 
feat(api): add override_settings_restore_afterwards
 2022-12-24 10:15:04 +03:00
AUTOMATIC1111 fac92610d2
Merge pull request #5753 from calvinballing/master 
Fix various typos
 2022-12-24 09:58:28 +03:00
AUTOMATIC 9441c28c94 add an option for img2img background color 2022-12-24 09:46:35 +03:00