mirror of
https://github.com/Wan-Video/Wan2.1.git
synced 2025-11-04 22:26:36 +00:00
merge conflicts
This commit is contained in:
parent
e686952a84
commit
b5eca59a71
@ -1086,7 +1086,7 @@ def generate_video(
|
|||||||
del wan_model
|
del wan_model
|
||||||
if offloadobj is not None:
|
if offloadobj is not None:
|
||||||
offloadobj.release()
|
offloadobj.release()
|
||||||
del offloadobj
|
del offloadobj
|
||||||
gc.collect()
|
gc.collect()
|
||||||
print(f"Loading model {get_model_name(file_model_needed)}...")
|
print(f"Loading model {get_model_name(file_model_needed)}...")
|
||||||
wan_model, offloadobj, trans = load_models(image2video)
|
wan_model, offloadobj, trans = load_models(image2video)
|
||||||
@ -1197,8 +1197,8 @@ def generate_video(
|
|||||||
if len(list_mult_choices_nums ) < len(loras_choices):
|
if len(list_mult_choices_nums ) < len(loras_choices):
|
||||||
list_mult_choices_nums += [1.0] * ( len(loras_choices) - len(list_mult_choices_nums ) )
|
list_mult_choices_nums += [1.0] * ( len(loras_choices) - len(list_mult_choices_nums ) )
|
||||||
loras_selected = [ lora for i, lora in enumerate(loras) if str(i) in loras_choices]
|
loras_selected = [ lora for i, lora in enumerate(loras) if str(i) in loras_choices]
|
||||||
pinnedLora = False #profile !=5 #False # # #
|
pinnedLora = False #profile !=5 #False # # #
|
||||||
offload.load_loras_into_model(trans, loras_selected, list_mult_choices_nums, activate_all_loras=True, preprocess_sd=preprocess_loras, pinnedLora=pinnedLora, split_linear_modules_map = None)
|
offload.load_loras_into_model(trans, loras_selected, list_mult_choices_nums, activate_all_loras=True, preprocess_sd=preprocess_loras, pinnedLora=pinnedLora, split_linear_modules_map = None)
|
||||||
errors = trans._loras_errors
|
errors = trans._loras_errors
|
||||||
if len(errors) > 0:
|
if len(errors) > 0:
|
||||||
error_files = [msg for _ , msg in errors]
|
error_files = [msg for _ , msg in errors]
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user