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

Rework ModelPatcher for upcoming ComfyUI update #498

Open
wants to merge 48 commits into
base: main
Choose a base branch
from
Open

Rework ModelPatcher for upcoming ComfyUI update #498

wants to merge 48 commits into from

Commits on Aug 22, 2024

  1. Initial scaffolding for supporting FancyVideo, refactored load_motion… 

    …_module code to manually parse load_state_dict load_result
    @Kosinkadink
    Kosinkadink committed Aug 22, 2024
    Configuration menu
    Copy the full SHA
    32c352e View commit details
    Browse the repository at this point in the history

  2. Improved description for Value Scheduling node

    @Kosinkadink
    Kosinkadink committed Aug 22, 2024
    Configuration menu
    Copy the full SHA
    7c2c863 View commit details
    Browse the repository at this point in the history

Commits on Aug 23, 2024

  1. Merge branch 'main' into develop

    @Kosinkadink
    Kosinkadink committed Aug 23, 2024
    Configuration menu
    Copy the full SHA
    df8eb6f View commit details
    Browse the repository at this point in the history

  2. In Create Raw Sigma Schedule, renamed lcm_zsnr to zsnr and changed lo… 

    …gic to allow applying zsnr for non-lcm
    @Kosinkadink
    Kosinkadink committed Aug 23, 2024
    Configuration menu
    Copy the full SHA
    ae7ae37 View commit details
    Browse the repository at this point in the history

Commits on Aug 28, 2024

  1. Merge branch 'main' into develop

    @Kosinkadink
    Kosinkadink committed Aug 28, 2024
    Configuration menu
    Copy the full SHA
    0475e70 View commit details
    Browse the repository at this point in the history

Commits on Aug 30, 2024

  1. Merge branch 'main' into develop

    @Kosinkadink
    Kosinkadink committed Aug 30, 2024
    Configuration menu
    Copy the full SHA
    00b63e6 View commit details
    Browse the repository at this point in the history

Commits on Sep 1, 2024

  1. Adjust ADEAUTOSIZE since after description feature was added, it work… 

    …s differently and most adjustments are no longer necessary (and their presence makes the nodes too wide)
    @Kosinkadink
    Kosinkadink committed Sep 1, 2024
    Configuration menu
    Copy the full SHA
    0837d2b View commit details
    Browse the repository at this point in the history

  2. Started work on NoiseCalibration implementation (pain)

    @Kosinkadink
    Kosinkadink committed Sep 1, 2024
    Configuration menu
    Copy the full SHA
    6a1d498 View commit details
    Browse the repository at this point in the history

Commits on Sep 3, 2024

  1. Progress on FancyVideo support

    @Kosinkadink
    Kosinkadink committed Sep 3, 2024
    Configuration menu
    Copy the full SHA
    1a9d70e View commit details
    Browse the repository at this point in the history

Commits on Sep 7, 2024

  1. Updated emb_patch, some upgrades for ModelSamplingConfig

    @Kosinkadink
    Kosinkadink committed Sep 7, 2024
    Configuration menu
    Copy the full SHA
    a77460c View commit details
    Browse the repository at this point in the history

Commits on Sep 18, 2024

  1. Merge branch 'main' into develop

    @Kosinkadink
    Kosinkadink committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    9a45452 View commit details
    Browse the repository at this point in the history

Commits on Sep 21, 2024

  1. Started porting over code to use upcoming ModelPatcher features in Co… 

    …mfyUI to get rid of a bunch of hacky code (and to enable hookable patches)
    @Kosinkadink
    Kosinkadink committed Sep 21, 2024
    Configuration menu
    Copy the full SHA
    e6a9638 View commit details
    Browse the repository at this point in the history

  2. Fixed FreeInit for new implementation

    @Kosinkadink
    Kosinkadink committed Sep 21, 2024
    Configuration menu
    Copy the full SHA
    3e3d297 View commit details
    Browse the repository at this point in the history

Commits on Sep 22, 2024

  1. Ported Gen1 nodes to use upcoming ComfyUI features, refactored some c… 

    …ode to match ComfyUI changes
    @Kosinkadink
    Kosinkadink committed Sep 22, 2024
    Configuration menu
    Copy the full SHA
    a1b03d6 View commit details
    Browse the repository at this point in the history

Commits on Sep 24, 2024

  1. Adapted sliding_calc_cond_batch and forward_timestep_embed to use new… 

    … ModelPatcher wrappers/patches, removed no-longer used code, removed model_name from InjectionParams
    @Kosinkadink
    Kosinkadink committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    f003299 View commit details
    Browse the repository at this point in the history

  2. Updated gen1 nodes and deprecated nodes to use new ModelPatcher syste… 

    …m properly
    @Kosinkadink
    Kosinkadink committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    8c3c948 View commit details
    Browse the repository at this point in the history

  3. Made Visualize Context Options nodes work after the refactor

    @Kosinkadink
    Kosinkadink committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    10e6b0b View commit details
    Browse the repository at this point in the history

Commits on Sep 27, 2024

  1. Refactored outer_sample_wrapper to work with my changes in in-progres… 

    …s ComfyUI branch
    @Kosinkadink
    Kosinkadink committed Sep 27, 2024
    Configuration menu
    Copy the full SHA
    b960317 View commit details
    Browse the repository at this point in the history

Commits on Oct 7, 2024

  1. Fixed device mismatch issue in perform_image_injection (Image Injecti… 

    …on) code after code refactor
    @Kosinkadink
    Kosinkadink committed Oct 7, 2024
    Configuration menu
    Copy the full SHA
    1698f9f View commit details
    Browse the repository at this point in the history

Commits on Oct 8, 2024

  1. Removed no longer needed code from sampling.py, removed ContextRefInj… 

    …ector as upcoming ComfyUI/ACN changes will make its use obsolete
    @Kosinkadink
    Kosinkadink committed Oct 8, 2024
    Configuration menu
    Copy the full SHA
    3e93f15 View commit details
    Browse the repository at this point in the history

Commits on Oct 25, 2024

  1. Merge branch 'main' into rework-modelpatcher

    @Kosinkadink
    Kosinkadink committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    82c8801 View commit details
    Browse the repository at this point in the history

  2. Refactored ADGS to be a variable stored within transformer_options in… 

    …stead of a global variable
    @Kosinkadink
    Kosinkadink committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    0b01ea1 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' into rework-modelpatcher

    @Kosinkadink
    Kosinkadink committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    2161721 View commit details
    Browse the repository at this point in the history

Commits on Nov 3, 2024

  1. Match changes in patch_hooks_improved_memory ComfyUI branch

    @Kosinkadink
    Kosinkadink committed Nov 3, 2024
    Configuration menu
    Copy the full SHA
    959fd3f View commit details
    Browse the repository at this point in the history

Commits on Nov 11, 2024

  1. Modified FunctionInjectionHolder to work more smoothily with new Comf… 

    …yUI memory management system
    @Kosinkadink
    Kosinkadink committed Nov 11, 2024
    Configuration menu
    Copy the full SHA
    0fb102e View commit details
    Browse the repository at this point in the history

Commits on Nov 12, 2024

  1. Refactored nodes_conditioning.py to use new built-in ComfyUI hook fea… 

    …tures (will deprecate almost all these nodes soon after testing)
    @Kosinkadink
    Kosinkadink committed Nov 12, 2024
    Configuration menu
    Copy the full SHA
    f32a382 View commit details
    Browse the repository at this point in the history

  2. Deprecated most of nodes_conditioning nodes since they exist in vanil… 

    …la ComgyUI
    @Kosinkadink
    Kosinkadink committed Nov 12, 2024
    Configuration menu
    Copy the full SHA
    bac7a81 View commit details
    Browse the repository at this point in the history

  3. Moved autosize param from optional to hidden for all nodes

    @Kosinkadink
    Kosinkadink committed Nov 12, 2024
    Configuration menu
    Copy the full SHA
    3195564 View commit details
    Browse the repository at this point in the history

  4. Commented out NoiseCalibration and FancyVideo from user's view so can… 

    … be safely merged into main, will need to get working properly later
    @Kosinkadink
    Kosinkadink committed Nov 12, 2024
    Configuration menu
    Copy the full SHA
    006ac04 View commit details
    Browse the repository at this point in the history

  5. Made Prompt Scheduling work with schedule_clip, fixed progress bar ad… 

    …vancing too quick
    @Kosinkadink
    Kosinkadink committed Nov 12, 2024
    Configuration menu
    Copy the full SHA
    c088d80 View commit details
    Browse the repository at this point in the history

  6. Added support for HelloMeme AnimateDiff model loading via simple key … 

    …conversion
    @Kosinkadink
    Kosinkadink committed Nov 12, 2024
    Configuration menu
    Copy the full SHA
    f2f9c90 View commit details
    Browse the repository at this point in the history

  7. version bump

    @Kosinkadink
    Kosinkadink committed Nov 12, 2024
    Configuration menu
    Copy the full SHA
    7ded0a7 View commit details
    Browse the repository at this point in the history

Commits on Nov 13, 2024

  1. Added DinkLink scaffolding

    @Kosinkadink
    Kosinkadink committed Nov 13, 2024
    Configuration menu
    Copy the full SHA
    48db232 View commit details
    Browse the repository at this point in the history

Commits on Nov 14, 2024

  1. Make context_extras an optional param on Set Context Extras node

    @Kosinkadink
    Kosinkadink committed Nov 14, 2024
    Configuration menu
    Copy the full SHA
    815eede View commit details
    Browse the repository at this point in the history

  2. Use DinkLink to get ACN wrapper for ContextRef and ControlNet convers… 

    …ion purposes
    @Kosinkadink
    Kosinkadink committed Nov 14, 2024
    Configuration menu
    Copy the full SHA
    4807978 View commit details
    Browse the repository at this point in the history

Commits on Nov 15, 2024

  1. Add proper parent reference to MotionModelPatcher.clone() to work pro… 

    …perly with new memory management
    @Kosinkadink
    Kosinkadink committed Nov 15, 2024
    Configuration menu
    Copy the full SHA
    f64d674 View commit details
    Browse the repository at this point in the history

Commits on Nov 16, 2024

  1. Modified comfy.hooks calls to match ComfyUI changes

    @Kosinkadink
    Kosinkadink committed Nov 16, 2024
    Configuration menu
    Copy the full SHA
    d70fd11 View commit details
    Browse the repository at this point in the history

  2. Added support for hooks from CLIP to be applied to resulting conds to… 

    … respect ComfyUI expected behavior
    @Kosinkadink
    Kosinkadink committed Nov 16, 2024
    Configuration menu
    Copy the full SHA
    68ccced View commit details
    Browse the repository at this point in the history

Commits on Nov 17, 2024

  1. Make diffusion_model_groupnormed hack use built-in diffusion_model wr… 

    …apper instead to fix weird issue with ContextRef + ImageInjection
    @Kosinkadink
    Kosinkadink committed Nov 17, 2024
    Configuration menu
    Copy the full SHA
    844b4e4 View commit details
    Browse the repository at this point in the history

  2. Replace apply_model_factory with special_model_apply_model_wrapper th… 

    …at uses built-in ComfyUI wrapper for apply_model
    @Kosinkadink
    Kosinkadink committed Nov 17, 2024
    Configuration menu
    Copy the full SHA
    054418d View commit details
    Browse the repository at this point in the history

  3. Clean up perform_image_injection, as backwards compatible code no lon… 

    …ger needed
    @Kosinkadink
    Kosinkadink committed Nov 17, 2024
    Configuration menu
    Copy the full SHA
    066bb23 View commit details
    Browse the repository at this point in the history

  4. Adjusted spacing

    @Kosinkadink
    Kosinkadink committed Nov 17, 2024
    Configuration menu
    Copy the full SHA
    d06a408 View commit details
    Browse the repository at this point in the history

Commits on Nov 21, 2024

  1. Match changes in ComfyUI PR that remove opt_ prefix on optional comfy… 

    ….hook function params
    @Kosinkadink
    Kosinkadink committed Nov 21, 2024
    Configuration menu
    Copy the full SHA
    32a06f1 View commit details
    Browse the repository at this point in the history

Commits on Nov 28, 2024

  1. Refactored MotionModelPatcher into MotionModelAttachment so that no c… 

    …ustom ModelPatcher model is required; no more mismatches between ComfyUI and ADE ModelPatcher features. Also made Scale Ref Image and VAE Encode node use batched vae encoding
    @Kosinkadink
    Kosinkadink committed Nov 28, 2024
    Configuration menu
    Copy the full SHA
    0a2d129 View commit details
    Browse the repository at this point in the history

  2. Pass transformer_options into VanillaTemporalModule and all subsequen… 

    …t layers, as well as mm_kwargs were applicable, so that behavior can be more easily extended in the future, both from ADE code and other node packs
    @Kosinkadink
    Kosinkadink committed Nov 28, 2024
    Configuration menu
    Copy the full SHA
    5ee8cf6 View commit details
    Browse the repository at this point in the history

Commits on Nov 29, 2024

  1. Generalized AnimateDiffModel initialization so mm_state_dict can be u… 

    …sed to determine if down/up blocks should be present and the attention block count, added init_kwargs input to AnimateDiffModel so some behavior can be adapted by unusual models
    @Kosinkadink
    Kosinkadink committed Nov 29, 2024
    Configuration menu
    Copy the full SHA
    95cfd12 View commit details
    Browse the repository at this point in the history

  2. Fixed special model features not being changed to use attachment from… 

    … refactored MotionModelPatchers
    @Kosinkadink
    Kosinkadink committed Nov 29, 2024
    Configuration menu
    Copy the full SHA
    28b841f View commit details
    Browse the repository at this point in the history

Commits on Nov 30, 2024

  1. Register AnimateDiffModel and AnimateDiffInfo on DinkLink

    @Kosinkadink
    Kosinkadink committed Nov 30, 2024
    Configuration menu
    Copy the full SHA
    a6c9400 View commit details
    Browse the repository at this point in the history