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

Add control_mode parameter to ControlNet #3535

Merged
merged 18 commits into from
Jun 25, 2023
Merged

Add control_mode parameter to ControlNet #3535

merged 18 commits into from
Jun 25, 2023

Commits on Jun 11, 2023

  1. First pass at ControlNet "guess mode" implementation.

    @GreggHelt2
    GreggHelt2 committed Jun 11, 2023
    Configuration menu
    Copy the full SHA
    fd71502 View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2023

  1. Moving from ControlNet guess_mode to separate booleans for cfg_inject… 

    …ion and soft_injection for testing control modes
    @GreggHelt2
    GreggHelt2 committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    9e0e26f View commit details
    Browse the repository at this point in the history

  2. First pass at ControlNet "guess mode" implementation.

    @GreggHelt2
    GreggHelt2 committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    8b7fac7 View commit details
    Browse the repository at this point in the history

  3. Moving from ControlNet guess_mode to separate booleans for cfg_inject… 

    …ion and soft_injection for testing control modes
    @GreggHelt2
    GreggHelt2 committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    8495764 View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2023

  1. Switched over to ControlNet control_mode with 4 options: balanced, mo… 

    …re_prompt, more_control, even_more_control. Based on True/False combinations of internal booleans cfg_injection and soft_injection
    @GreggHelt2
    GreggHelt2 committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    de3e6cd View commit details
    Browse the repository at this point in the history

  2. Merge branch 'feat/controlnet-control-modes' of https://github.com/in… 

    …voke-ai/InvokeAI into feat/controlnet-control-modes
    @GreggHelt2
    GreggHelt2 committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    a8e0490 View commit details
    Browse the repository at this point in the history

  3. Removing vestigial comments.

    @GreggHelt2
    GreggHelt2 committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    cfd49e3 View commit details
    Browse the repository at this point in the history

  4. Renamed ControlNet control_mode option "even_more_control" to "unbala… 

    …nced"
    @GreggHelt2
    GreggHelt2 committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    5cd0e90 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'main' into feat/controlnet-control-modes

    @blessedcoolant
    blessedcoolant committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    43419ac View commit details
    Browse the repository at this point in the history

  6. chore: Rebuild WebAPI

    @blessedcoolant
    blessedcoolant committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    eb7047b View commit details
    Browse the repository at this point in the history

  7. feat: Add ControlMode to Linear UI

    @blessedcoolant
    blessedcoolant committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    6c53abc View commit details
    Browse the repository at this point in the history

  8. Merge branch 'main' into feat/controlnet-control-modes

    @blessedcoolant
    blessedcoolant committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    6b8e88a View commit details
    Browse the repository at this point in the history

  9. chore: Rebuild API

    @blessedcoolant
    blessedcoolant committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    4ca325e View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2023

  1. Merge branch 'main' of github.com:invoke-ai/InvokeAI into feat/contro… 

    …lnet-control-modes

Only "real" conflicts were in:
     invokeai/frontend/web/src/features/controlNet/components/ControlNet.tsx
     invokeai/frontend/web/src/features/controlNet/store/controlNetSlice.ts
    @GreggHelt2
    GreggHelt2 committed Jun 25, 2023
    Configuration menu
    Copy the full SHA
    c5faffc View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into feat/controlnet-control-modes

    @blessedcoolant
    blessedcoolant authored Jun 25, 2023
    Configuration menu
    Copy the full SHA
    4d4b5b5 View commit details
    Browse the repository at this point in the history

  3. fix(ui): fix path of generated schema types

    @psychedelicious
    psychedelicious committed Jun 25, 2023
    Configuration menu
    Copy the full SHA
    132829c View commit details
    Browse the repository at this point in the history

  4. chore(ui): regen api schema

    @psychedelicious
    psychedelicious committed Jun 25, 2023
    Configuration menu
    Copy the full SHA
    11378a9 View commit details
    Browse the repository at this point in the history

  5. fix(ui): add missing ControlNetInvocation type; tidy schema-derived t… 

    …ypes
    @psychedelicious
    psychedelicious committed Jun 25, 2023
    Configuration menu
    Copy the full SHA
    57e7197 View commit details
    Browse the repository at this point in the history