feature: large refactor - breaking changes #413
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
brycedrennan
force-pushed
the
bd/arch-param
branch
2 times, most recently
from
0176db8 to
079273e
Compare
- add type hints - size parameter - ControlNetInput => ControlInput - simplify imagineresult
brycedrennan
force-pushed
the
bd/arch-param
branch
from
f83eb00 to
1621925
Compare
brycedrennan
changed the title
brycedrennan
force-pushed
the
bd/arch-param
branch
from
1846756 to
f5fd863
Compare
jaydrennan
reviewed
Dec 10, 2023
jaydrennan
reviewed
Dec 10, 2023
| # kdiff.DPMFastSampler, | ||
| # kdiff.DPMAdaptiveSampler, | ||
| # kdiff.LMSSampler, | ||
| # kdiff.DPM2Sampler, | ||
| # kdiff.DPM2AncestralSampler, | ||
| kdiff.DPMPP2MSampler, | ||
| # kdiff.DPMPP2MSampler, | ||
| # kdiff.DPMPP2SAncestralSampler, | ||
| # kdiff.EulerSampler, | ||
| # kdiff.EulerAncestralSampler, | ||
| # kdiff.HeunSampler, |
jaydrennan
reviewed
Dec 10, 2023
| # class DPM2AncestralSampler(KDiffusionSampler): | ||
| # short_name = SamplerName.K_DPM_2_ANCESTRAL | ||
| # class DPM2AncestralSampler(KDiffusionSolver): | ||
| # short_name = SolverName.K_DPM_2_ANCESTRAL | ||
| # name = "Diffusion probabilistic models - 2 ancestral" | ||
| # default_steps = 40 | ||
| # sampler_func = staticmethod(k_sampling.sample_dpm_2_ancestral) |
jaydrennan
reviewed
Dec 10, 2023
| # class HeunSampler(KDiffusionSampler): | ||
| # short_name = SamplerName.K_HEUN | ||
| # class HeunSampler(KDiffusionSolver): | ||
| # short_name = SolverName.K_HEUN | ||
| # name = "Algorithm 2 (Heun steps) from Karras et al. (2022)." | ||
| # default_steps = 40 | ||
| # sampler_func = staticmethod(k_sampling.sample_heun) | ||
| # | ||
| # |
jaydrennan
reviewed
Dec 10, 2023
| # if get_device() == "mps:0": | ||
| # SOLVERS_FOR_TESTING = ["plms", "k_euler_a"] | ||
| # elif get_device() == "cpu": | ||
| # SOLVERS_FOR_TESTING = [] |
jaydrennan
reviewed
Dec 10, 2023
| # from imaginairy.samplers import SOLVER_TYPE_OPTIONS | ||
| # | ||
| # | ||
| # def test_sampler_options(): |
jaydrennan
reviewed
Dec 10, 2023
| @@ -58,7 +59,7 @@ def test_clip_masking(filename_base_for_outputs): | |||
| upscale=False, | |||
| fix_faces=True, | |||
| seed=42, | |||
| # sampler_type="plms", | |||
| # solver_type="plms", | |||
brycedrennan
force-pushed
the
bd/arch-param
branch
5 times, most recently
from
824771d to
f714ddc
Compare
- do not provide automatically imported api functions and objects in `imaginairy` root module
- horrible hack to overcome horrible design choices by easy_install/setuptools
The hack modifies the installed script to remove the __import__ pkg_resources line
If we don't do this then the scripts will be slow to start up because of
pkg_resources.require() which is called by setuptools to ensure the
"correct" version of the package is installed.
before modification example:
```
__requires__ = 'imaginAIry==14.0.0b5'
__import__('pkg_resources').require('imaginAIry==14.0.0b5')
__file__ = '/home/user/projects/imaginairy/imaginairy/bin/aimg'
with open(__file__) as f:
exec(compile(f.read(), __file__, 'exec'))
```
- fix colorize cmd. add test - fix describe cmd. add test - fix model-list cmd. add test - fix stable studio - hide stack grace for ValueErrors in cli - set controlnet scale - fix negative prompt to allow emptystring instead of replacing it with default - adjust edit-demo parameters - arg scheduler that works at click level (but disable it). works but not ideal experience.
fix some typehint issues
brycedrennan
force-pushed
the
bd/arch-param
branch
from
f714ddc to
3f0c046
Compare
brycedrennan
force-pushed
the
bd/arch-param
branch
from
3f0c046 to
4b67e24
Compare
jaydrennan
approved these changes
Dec 13, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
ImaginePrompt.sizeand--sizefield to specify image dimensions, supporting various formats. Removedwidthandheightparameters.normalize_image_sizefunction converts various ways someone could specify "size" to (width, height) tuple. ("512", "4k", "1024,1024" etc)samplerstosolversterminology (in diffusers called a "scheduler". In automatic1111, a "sampler")