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.

Sign up for GitHub

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

Jump to bottom

Soft Inpainting #14208

Merged
merged 36 commits into from
Dec 14, 2023
Merged

Soft Inpainting #14208

merged 36 commits into from
Dec 14, 2023
+904 −27

Commits on Nov 28, 2023

  1. Removed code which forces the inpainting mask to be 0 or 1. Now fract… 

    …ional values (e.g. 0.5) are accepted.
    @CodeHatchling
    CodeHatchling committed Nov 28, 2023
    Configuration menu
    Copy the full SHA
    dec791d View commit details
    Browse the repository at this point in the history

  2. Removed conflicting step that replaces the softly inpainted latents w… 

    …ith a naive blend with the original latents.
    @CodeHatchling
    CodeHatchling committed Nov 28, 2023
    Configuration menu
    Copy the full SHA
    bbba133 View commit details
    Browse the repository at this point in the history

  3. Implements "scheduling" for blending of the original latents and a la… 

    …tent blending formula that preserves details in blend transition areas.
    @CodeHatchling
    CodeHatchling committed Nov 28, 2023
    Configuration menu
    Copy the full SHA
    e715e46 View commit details
    Browse the repository at this point in the history

  4. Nerfs the aggressive post-processing step of overlaying the original … 

    …image.
    @CodeHatchling
    CodeHatchling committed Nov 28, 2023
    Configuration menu
    Copy the full SHA
    a6e5846 View commit details
    Browse the repository at this point in the history

  5. Added UI elements to control blending parameters.

    @CodeHatchling
    CodeHatchling committed Nov 28, 2023
    Configuration menu
    Copy the full SHA
    debf836 View commit details
    Browse the repository at this point in the history

Commits on Nov 29, 2023

  1. Added slider for detail preservation strength, removed largely needle… 

    …ss offset parameter, changed labels in UI and for saving to/pasting data from PNG files.
    @CodeHatchling
    CodeHatchling committed Nov 29, 2023
    Configuration menu
    Copy the full SHA
    c5c7fa0 View commit details
    Browse the repository at this point in the history

  2. Tweaked UI sliders and labels.

    @CodeHatchling
    CodeHatchling committed Nov 29, 2023
    Configuration menu
    Copy the full SHA
    284fd8f View commit details
    Browse the repository at this point in the history

  3. Tweaked default values.

    @CodeHatchling
    CodeHatchling committed Nov 29, 2023
    Configuration menu
    Copy the full SHA
    c7a1ff8 View commit details
    Browse the repository at this point in the history

Commits on Dec 3, 2023

  1. Added utility functions related to processing masks.

    @CodeHatchling
    CodeHatchling committed Dec 3, 2023
    Configuration menu
    Copy the full SHA
    609dea3 View commit details
    Browse the repository at this point in the history

  2. Blend masks are now produced afterward, based on an estimate of the v… 

    …isual difference between the original and modified latent images. This should remove ghosting and clipping artifacts from masks, while preserving the details of largely unchanged content.
    @CodeHatchling
    CodeHatchling committed Dec 3, 2023
    Configuration menu
    Copy the full SHA
    73ab982 View commit details
    Browse the repository at this point in the history

  3. Rewrote latent_blend() to use in-place operations and to aggressively… 

    … "del" references with the intention of minimizing allocations and easing garbage collection.
    @CodeHatchling
    CodeHatchling committed Dec 3, 2023
    Configuration menu
    Copy the full SHA
    bb04d40 View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'origin/dev' into soft-inpainting 

    # Conflicts:
#	modules/processing.py
    @CodeHatchling
    CodeHatchling committed Dec 3, 2023
    Configuration menu
    Copy the full SHA
    3bd3a09 View commit details
    Browse the repository at this point in the history

  5. Fixed a math mistake.

    @CodeHatchling
    CodeHatchling committed Dec 3, 2023
    Configuration menu
    Copy the full SHA
    28a2b5b View commit details
    Browse the repository at this point in the history

  6. "Uncrop" the original denoised image for the composite step, fixing a… 

    … "ValueError: Images do not match" *shudder*
    @CodeHatchling
    CodeHatchling committed Dec 3, 2023
    Configuration menu
    Copy the full SHA
    552f8bc View commit details
    Browse the repository at this point in the history

Commits on Dec 4, 2023

  1. Organized the settings and UI of soft inpainting to allow for togglin… 

    …g the feature, and centralizes default values to reduce the amount of copy-pasta.
    @CodeHatchling
    CodeHatchling committed Dec 4, 2023
    Configuration menu
    Copy the full SHA
    aaacf48 View commit details
    Browse the repository at this point in the history

  2. Enables the original functionality to be toggled on and off.

    @CodeHatchling
    CodeHatchling committed Dec 4, 2023
    Configuration menu
    Copy the full SHA
    259d33c View commit details
    Browse the repository at this point in the history

  3. Cleaned up code, moved main code contributions into soft_inpainting.py

    @CodeHatchling
    CodeHatchling committed Dec 4, 2023
    Configuration menu
    Copy the full SHA
    976c105 View commit details
    Browse the repository at this point in the history

  4. Fixed issue with whitespace, removed commented out code that was mean… 

    …t to be used as a reference.
    @CodeHatchling
    CodeHatchling committed Dec 4, 2023
    Configuration menu
    Copy the full SHA
    1455159 View commit details
    Browse the repository at this point in the history

Commits on Dec 5, 2023

  1. Re-introduce latent blending step from the vanilla inpainting procedure.

    @CodeHatchling
    CodeHatchling committed Dec 5, 2023
    Configuration menu
    Copy the full SHA
    57f29bd View commit details
    Browse the repository at this point in the history

  2. Restored original formatting.

    @CodeHatchling
    CodeHatchling committed Dec 5, 2023
    Configuration menu
    Copy the full SHA
    60c6022 View commit details
    Browse the repository at this point in the history

  3. Applies a convert('RGBA') operation early to mimic previous behaviour.

    @CodeHatchling
    CodeHatchling committed Dec 5, 2023
    Configuration menu
    Copy the full SHA
    b32a334 View commit details
    Browse the repository at this point in the history

  4. Fixed issue where batched inpainting (batch size > 1) wouldn't work b… 

    …ecause of mismatched tensor sizes. The 'already_decoded' decoded case should also be handled correctly (tested indirectly).
    @CodeHatchling
    CodeHatchling committed Dec 5, 2023
    Configuration menu
    Copy the full SHA
    6fc1242 View commit details
    Browse the repository at this point in the history

  5. Fixed unused import.

    @CodeHatchling
    CodeHatchling committed Dec 5, 2023
    Configuration menu
    Copy the full SHA
    49bbf11 View commit details
    Browse the repository at this point in the history

  6. Merge remote-tracking branch 'origin2/dev' into soft-inpainting 

    # Conflicts:
#	modules/processing.py
    @CodeHatchling
    CodeHatchling committed Dec 5, 2023
    Configuration menu
    Copy the full SHA
    3886481 View commit details
    Browse the repository at this point in the history

Commits on Dec 7, 2023

  1. A custom blending function can be provided by p, replacing the use of… 

    … soft_inpainting.
    @CodeHatchling
    CodeHatchling committed Dec 7, 2023
    Configuration menu
    Copy the full SHA
    e90d433 View commit details
    Browse the repository at this point in the history

  2. Removed changes in some scripts since the arguments for soft painting… 

    … are no longer passed through the same path as "mask_blur".
    @CodeHatchling
    CodeHatchling committed Dec 7, 2023
    Configuration menu
    Copy the full SHA
    4608f62 View commit details
    Browse the repository at this point in the history

  3. Removed soft inpainting, added hooks for softpainting to work instead.

    @CodeHatchling
    CodeHatchling committed Dec 7, 2023
    Configuration menu
    Copy the full SHA
    ac45789 View commit details
    Browse the repository at this point in the history

  4. Re-implemented soft inpainting via a script. Also fixed some mistakes… 

    … with the previous hooks, removed unnecessary formatting changes, removed code that I had forgotten to.
    @CodeHatchling
    CodeHatchling committed Dec 7, 2023
    Configuration menu
    Copy the full SHA
    2abc417 View commit details
    Browse the repository at this point in the history

  5. Fixed "No newline at end of file".

    @CodeHatchling
    CodeHatchling committed Dec 7, 2023
    Configuration menu
    Copy the full SHA
    8dbacc7 View commit details
    Browse the repository at this point in the history

  6. Moved image filters used by soft inpainting into soft_inpainting.py f… 

    …rom images.py
    @CodeHatchling
    CodeHatchling committed Dec 7, 2023
    Configuration menu
    Copy the full SHA
    56604f0 View commit details
    Browse the repository at this point in the history

  7. Fixed error that occurs when using vanilla samplers (somehow).

    @CodeHatchling
    CodeHatchling committed Dec 7, 2023
    Configuration menu
    Copy the full SHA
    0ef4a4c View commit details
    Browse the repository at this point in the history

Commits on Dec 8, 2023

  1. Added parameters for the composite stage, fixed batched generation.

    @CodeHatchling
    CodeHatchling committed Dec 8, 2023
    Configuration menu
    Copy the full SHA
    f284ae2 View commit details
    Browse the repository at this point in the history

  2. Fixed complaint about whitespace, updated help section for a parameter.

    @CodeHatchling
    CodeHatchling committed Dec 8, 2023
    Configuration menu
    Copy the full SHA
    fc3e246 View commit details
    Browse the repository at this point in the history

  3. Fixed grammar error.

    @CodeHatchling
    CodeHatchling committed Dec 8, 2023
    Configuration menu
    Copy the full SHA
    659f62e View commit details
    Browse the repository at this point in the history

Commits on Dec 9, 2023

  1. soft_inpainting now appears in the "inpaint" section, and will not ac… 

    …tivate unless inpainting is activated.
    @CodeHatchling
    CodeHatchling committed Dec 9, 2023
    Configuration menu
    Copy the full SHA
    b241447 View commit details
    Browse the repository at this point in the history

  2. Formatted soft_inpainting.

    @CodeHatchling
    CodeHatchling committed Dec 9, 2023
    Configuration menu
    Copy the full SHA
    f1ff932 View commit details
    Browse the repository at this point in the history