Commit Graph

411 Commits

Author SHA1 Message Date
Barry Downes
7cdeffe955
Merge branch 'master' into rework-dynamic-prompts 2023-08-15 22:10:22 +10:00
comfyanonymous
a2ce9655ca Refactor unclip code. 2023-08-14 23:48:47 -04:00
comfyanonymous
9cc12c833d CLIPVisionEncode can now encode multiple images. 2023-08-14 16:54:05 -04:00
comfyanonymous
0cb6dac943 Remove 3m from PR #1213 because of some small issues. 2023-08-14 00:48:45 -04:00
comfyanonymous
e244b2df83 Add sgm_uniform scheduler that acts like the default one in sgm. 2023-08-14 00:29:03 -04:00
comfyanonymous
58c7da3665 Gpu variant of dpmpp_3m_sde. Note: use 3m with exponential or karras. 2023-08-14 00:28:50 -04:00
comfyanonymous
ba319a34e4 Merge branch 'dpmpp3m' of https://github.com/FizzleDorf/ComfyUI 2023-08-14 00:23:15 -04:00
FizzleDorf
3cfad03a68 dpmpp 3m + dpmpp 3m sde added 2023-08-13 22:29:04 -04:00
comfyanonymous
585a062910 Print unet config when model isn't detected. 2023-08-13 01:39:48 -04:00
comfyanonymous
c8a23ce9e8 Support for yet another lora type based on diffusers. 2023-08-11 13:04:21 -04:00
comfyanonymous
2bc12d3d22 Add --temp-directory argument to set temp directory. 2023-08-11 05:13:03 -04:00
comfyanonymous
c20583286f Support diffuser text encoder loras. 2023-08-10 20:28:28 -04:00
comfyanonymous
cf10c5592c Disable calculating uncond when CFG is 1.0 2023-08-09 20:55:03 -04:00
comfyanonymous
1f0f4cc0bd Add argument to disable auto launching the browser. 2023-08-07 02:25:12 -04:00
comfyanonymous
d8e58f0a7e Detect hint_channels from controlnet. 2023-08-06 14:08:59 -04:00
Barry Downes
1504f55cdf Fix: Updated strip_c_comments function didn't work.
In regex, "." is literal inside a character class.
2023-08-06 15:33:47 +10:00
Barry Downes
052bf4181d
Merge branch 'comfyanonymous:master' into rework-dynamic-prompts 2023-08-06 10:51:56 +10:00
Barry Downes
9c505aa38c Convert indentation from tabs to spaces, to match the codebase. 2023-08-06 10:41:08 +10:00
Barry Downes
ed253b31df Replace comfy.parse-based comment parsers with re.sub.
Less code is better, right?
But we lost the ability to report errors for unterminated C block comments.
Current differences from the js version:
We consume unterminated C block comments.
2023-08-06 09:39:45 +10:00
Barry Downes
9efdda21a8 Combine the comments and choices into a single function to ease
integration into various nodes.
2023-08-06 08:47:19 +10:00
Barry Downes
57ae0987db Move comment support out of comfy.choices and into comfy.comments module. 2023-08-05 17:09:33 +10:00
Barry Downes
dcb4bdfb9b Move ParseLogicError into comfy.parse.
Don't catch ParseError in comfy.choices.
2023-08-05 16:20:26 +10:00
Barry Downes
5a673ee930 Add non-strict parsing and the "strict" argument. 2023-08-05 15:54:12 +10:00
Barry Downes
277e75f66f Add the reescape option. 2023-08-05 15:54:12 +10:00
Barry Downes
84360083c8 Rename get_seed -> get_random_seed. 2023-08-05 15:54:12 +10:00
Barry Downes
a11ee34ebf Tweak the documentation a little. 2023-08-05 15:54:12 +10:00
Barry Downes
9aa915045a Slightly rework the choices module interface. 2023-08-05 15:54:12 +10:00
Barry Downes
9bc8b5ce44 Rename parse_choice.py -> choices.py. 2023-08-05 15:54:12 +10:00
Barry Downes
6995bb435c Fix: text -> self.text in clone method. 2023-08-05 15:54:12 +10:00
comfyanonymous
c5d7593ccf Support loras in diffusers format. 2023-08-05 01:40:24 -04:00
comfyanonymous
1ce0d8ad68 Add CMP 30HX card to the nvidia_16_series list. 2023-08-04 12:08:45 -04:00
comfyanonymous
c99d8002f8 Make sure the pooled output stays at the EOS token with added embeddings. 2023-08-03 20:27:50 -04:00
Barry Downes
631d19ca09 Operate randomly when no seed is provided. 2023-08-01 03:15:44 +10:00
Barry Downes
6a01513d09 Add C-style comment support for the dynamic prompt. 2023-08-01 03:15:44 +10:00
Barry Downes
d91544b83c Reimplement dynamic prompts in the CLIPTextEncode node.
To achieve repeatability, a random seed input is added.

By this method, the original prompt text remains intact when
serializing and deserializing from a PNG or history.

But the random seed ensures the same choices will be made
when re-translating the "choices" in the original prompt
text, thus ensuring repeatability.

Also, choices can now be nested.
2023-08-01 03:15:44 +10:00
comfyanonymous
4a77fcd6ab Only shift text encoder to vram when CPU cores are under 8. 2023-07-31 00:08:54 -04:00
comfyanonymous
3cd31d0e24 Lower CPU thread check for running the text encoder on the CPU vs GPU. 2023-07-30 17:18:24 -04:00
comfyanonymous
2b13939044 Remove some useless code. 2023-07-30 14:13:33 -04:00
comfyanonymous
95d796fc85 Faster VAE loading. 2023-07-29 16:28:30 -04:00
comfyanonymous
4b957a0010 Initialize the unet directly on the target device. 2023-07-29 14:51:56 -04:00
comfyanonymous
c910b4a01c Remove unused code and torchdiffeq dependency. 2023-07-28 21:32:27 -04:00
comfyanonymous
1141029a4a Add --disable-metadata argument to disable saving metadata in files. 2023-07-28 12:31:41 -04:00
comfyanonymous
fbf5c51c1c Merge branch 'fix_batch_timesteps' of https://github.com/asagi4/ComfyUI 2023-07-27 16:13:48 -04:00
comfyanonymous
68be24eead Remove some prints. 2023-07-27 16:12:43 -04:00
asagi4
1ea4d84691 Fix timestep ranges when batch_size > 1 2023-07-27 21:14:09 +03:00
comfyanonymous
5379051d16 Fix diffusers VAE loading. 2023-07-26 18:26:39 -04:00
comfyanonymous
727588d076 Fix some new loras. 2023-07-25 16:39:15 -04:00
comfyanonymous
4f9b6f39d1 Fix potential issue with Save Checkpoint. 2023-07-25 00:45:20 -04:00
comfyanonymous
5f75d784a1 Start is now 0.0 and end is now 1.0 for the timestep ranges. 2023-07-24 18:38:17 -04:00
comfyanonymous
7ff14b62f8 ControlNetApplyAdvanced can now define when controlnet gets applied. 2023-07-24 17:50:49 -04:00