Zengtudor/Wan2.1
1
0
Fork 0
mirror of https://github.com/Wan-Video/Wan2.1.git synced 2025-11-04 14:16:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed Matanyone tensor location issue

Browse Source
This commit is contained in:
DeepBeepMeep 2025-06-19 19:23:55 +02:00
parent c4b8c6b81b
commit 8b146a8d7b
2 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
preprocessing/matanyone/app.py
View File

@ -536,16 +536,13 @@ def export_to_current_video_engine(model_type, foreground_video_output, alpha_vi
return foreground_video_output, alpha_video_output return foreground_video_output, alpha_video_output
def teleport_to_video_tab(): def teleport_to_video_tab(tab_state):
from wgp import set_new_tab
set_new_tab(tab_state, 0)
return gr.Tabs(selected="video_gen") return gr.Tabs(selected="video_gen")
def teleport_to_vace_1_3B():
return gr.Tabs(selected="video_gen"), gr.Dropdown(value="vace_1.3B")
def teleport_to_vace_14B(): def display(tabs, tab_state, model_choice, vace_video_input, vace_video_mask, vace_image_refs, video_prompt_video_guide_trigger):
return gr.Tabs(selected="video_gen"), gr.Dropdown(value="vace_14B")
def display(tabs, model_choice, vace_video_input, vace_video_mask, vace_image_refs, video_prompt_video_guide_trigger):
# my_tab.select(fn=load_unload_models, inputs=[], outputs=[]) # my_tab.select(fn=load_unload_models, inputs=[], outputs=[])
media_url = "https://github.com/pq-yang/MatAnyone/releases/download/media/" media_url = "https://github.com/pq-yang/MatAnyone/releases/download/media/"
@ -685,12 +682,9 @@ def display(tabs, model_choice, vace_video_input, vace_video_mask, vace_image_re
export_to_vace_video_14B_btn = gr.Button("Export to current Video Input Video For Inpainting", visible= False) export_to_vace_video_14B_btn = gr.Button("Export to current Video Input Video For Inpainting", visible= False)
with gr.Row(visible= True): with gr.Row(visible= True):
export_to_current_video_engine_btn = gr.Button("Export to Control Video Input and Video Mask Input", visible= False) export_to_current_video_engine_btn = gr.Button("Export to Control Video Input and Video Mask Input", visible= False)
export_to_vace_video_14B_btn.click( fn=teleport_to_vace_14B, inputs=[], outputs=[tabs, model_choice]).then(
fn=export_to_current_video_engine, inputs= [foreground_video_output, alpha_video_output], outputs= [video_prompt_video_guide_trigger, vace_video_input, vace_video_mask])
export_to_current_video_engine_btn.click( fn=export_to_current_video_engine, inputs= [model_choice, foreground_video_output, alpha_video_output], outputs= [vace_video_input, vace_video_mask]).then( #video_prompt_video_guide_trigger, export_to_current_video_engine_btn.click( fn=export_to_current_video_engine, inputs= [model_choice, foreground_video_output, alpha_video_output], outputs= [vace_video_input, vace_video_mask]).then( #video_prompt_video_guide_trigger,
fn=teleport_to_video_tab, inputs= [], outputs= [tabs]) fn=teleport_to_video_tab, inputs= [tab_state], outputs= [tabs])
# first step: get the video information # first step: get the video information

19
wgp.py
View File

@ -37,7 +37,7 @@ import glob
import cv2 import cv2
from transformers.utils import logging from transformers.utils import logging
logging.set_verbosity_error logging.set_verbosity_error
from preprocessing.matanyone import app as matanyone_app
from tqdm import tqdm from tqdm import tqdm
import requests import requests
global_queue_ref = [] global_queue_ref = []
@ -57,6 +57,8 @@ if mmgp_version != target_mmgp_version:
lock = threading.Lock() lock = threading.Lock()
current_task_id = None current_task_id = None
task_id = 0 task_id = 0
vmc_event_handler = matanyone_app.get_vmc_event_handler()
def download_ffmpeg(): def download_ffmpeg():
@ -2536,13 +2538,14 @@ def apply_changes( state,
if v != v_old: if v != v_old:
changes.append(k) changes.append(k)
global attention_mode, profile, compile, vae_config, boost, lora_dir, reload_needed, preload_model_policy, transformer_quantization, transformer_dtype_policy, transformer_types, text_encoder_quantization global attention_mode, profile, compile, vae_config, boost, lora_dir, reload_needed, preload_model_policy, transformer_quantization, transformer_dtype_policy, transformer_types, text_encoder_quantization, save_path
attention_mode = server_config["attention_mode"] attention_mode = server_config["attention_mode"]
profile = server_config["profile"] profile = server_config["profile"]
compile = server_config["compile"] compile = server_config["compile"]
text_encoder_quantization = server_config["text_encoder_quantization"] text_encoder_quantization = server_config["text_encoder_quantization"]
vae_config = server_config["vae_config"] vae_config = server_config["vae_config"]
boost = server_config["boost"] boost = server_config["boost"]
save_path = server_config["save_path"]
preload_model_policy = server_config["preload_model_policy"] preload_model_policy = server_config["preload_model_policy"]
transformer_quantization = server_config["transformer_quantization"] transformer_quantization = server_config["transformer_quantization"]
transformer_dtype_policy = server_config["transformer_dtype_policy"] transformer_dtype_policy = server_config["transformer_dtype_policy"]
@ -6253,12 +6256,12 @@ def generate_dropdown_model_list(current_model_type):
elem_classes="model_list_class", elem_classes="model_list_class",
) )
def set_new_tab(tab_state, new_tab_no):
global vmc_event_handler
def select_tab(tab_state, evt:gr.SelectData):
tab_video_mask_creator = 2 tab_video_mask_creator = 2
old_tab_no = tab_state.get("tab_no",0) old_tab_no = tab_state.get("tab_no",0)
new_tab_no = evt.index
# print(f"old tab {old_tab_no}, new tab {new_tab_no}") # print(f"old tab {old_tab_no}, new tab {new_tab_no}")
if old_tab_no == tab_video_mask_creator: if old_tab_no == tab_video_mask_creator:
vmc_event_handler(False) vmc_event_handler(False)
@ -6270,6 +6273,9 @@ def select_tab(tab_state, evt:gr.SelectData):
else: else:
vmc_event_handler(True) vmc_event_handler(True)
tab_state["tab_no"] = new_tab_no tab_state["tab_no"] = new_tab_no
def select_tab(tab_state, evt:gr.SelectData):
set_new_tab(tab_state, evt.index)
return gr.Tabs() return gr.Tabs()
def get_js(): def get_js():
@ -6707,10 +6713,7 @@ def create_ui():
with gr.Tab("Guides", id="info") as info_tab: with gr.Tab("Guides", id="info") as info_tab:
generate_info_tab() generate_info_tab()
with gr.Tab("Video Mask Creator", id="video_mask_creator") as video_mask_creator: with gr.Tab("Video Mask Creator", id="video_mask_creator") as video_mask_creator:
from preprocessing.matanyone import app as matanyone_app matanyone_app.display(main_tabs, tab_state, model_choice, video_guide, video_mask, image_refs, video_prompt_type_video_trigger)
vmc_event_handler = matanyone_app.get_vmc_event_handler()
matanyone_app.display(main_tabs, model_choice, video_guide, video_mask, image_refs, video_prompt_type_video_trigger)
if not args.lock_config: if not args.lock_config:
with gr.Tab("Downloads", id="downloads") as downloads_tab: with gr.Tab("Downloads", id="downloads") as downloads_tab:
generate_download_tab(lset_name, loras_choices, state) generate_download_tab(lset_name, loras_choices, state)