mirror of
https://github.com/vladmandic/automatic
synced 2026-09-17 08:19:11 +02:00
improve model offload compatibility
This commit is contained in:
Vladimir Mandic
+10
-7
@@ -249,13 +249,16 @@ def control_run(units: List[unit.Unit], inputs, inits, mask, unit_type: str, is_
|
||||
frames = 0
|
||||
|
||||
# set pipeline
|
||||
original_pipeline = shared.sd_model
|
||||
shared.sd_model = pipe
|
||||
sd_models.move_model(shared.sd_model, shared.device)
|
||||
shared.sd_model.to(dtype=devices.dtype)
|
||||
debug(f'Control device={devices.device} dtype={devices.dtype}')
|
||||
sd_models.copy_diffuser_options(shared.sd_model, original_pipeline) # copy options from original pipeline
|
||||
sd_models.set_diffuser_options(shared.sd_model)
|
||||
if pipe.__class__.__name__ != shared.sd_model.__class__.__name__:
|
||||
original_pipeline = shared.sd_model
|
||||
shared.sd_model = pipe
|
||||
sd_models.move_model(shared.sd_model, shared.device)
|
||||
shared.sd_model.to(dtype=devices.dtype)
|
||||
debug(f'Control device={devices.device} dtype={devices.dtype}')
|
||||
sd_models.copy_diffuser_options(shared.sd_model, original_pipeline) # copy options from original pipeline
|
||||
sd_models.set_diffuser_options(shared.sd_model)
|
||||
else:
|
||||
original_pipeline = None
|
||||
|
||||
try:
|
||||
with devices.inference_context():
|
||||
|
||||
+12
-9
@@ -683,7 +683,10 @@ def set_diffuser_options(sd_model, vae = None, op: str = 'model'):
|
||||
shared.opts.diffusers_move_unet = False
|
||||
shared.opts.diffusers_move_refiner = False
|
||||
shared.log.warning(f'Disabling {op} "Move model to CPU" since "Model CPU offload" is enabled')
|
||||
sd_model.enable_model_cpu_offload()
|
||||
if not hasattr(sd_model, "_all_hooks") or len(sd_model._all_hooks) == 0: # pylint: disable=protected-access
|
||||
sd_model.enable_model_cpu_offload()
|
||||
else:
|
||||
sd_model.maybe_free_model_hooks()
|
||||
sd_model.has_accelerate = True
|
||||
if hasattr(sd_model, "enable_sequential_cpu_offload"):
|
||||
if shared.cmd_opts.lowvram or shared.opts.diffusers_seq_cpu_offload:
|
||||
@@ -766,7 +769,8 @@ def move_model(model, device=None, force=False):
|
||||
try:
|
||||
module._hf_hook.execution_device = device # pylint: disable=protected-access
|
||||
except Exception as e:
|
||||
shared.log.error(f'Model move execution device: device={device} {e}')
|
||||
if os.environ.get('SD_MOVE_DEBUG', None):
|
||||
shared.log.error(f'Model move execution device: device={device} {e}')
|
||||
if getattr(model, 'has_accelerate', False) and not force:
|
||||
return
|
||||
try:
|
||||
@@ -1235,6 +1239,9 @@ def switch_pipe(cls: diffusers.DiffusionPipeline, pipeline: diffusers.DiffusionP
|
||||
def set_diffuser_pipe(pipe, new_pipe_type):
|
||||
if get_diffusers_task(pipe) == new_pipe_type:
|
||||
return pipe
|
||||
# skip specific pipelines
|
||||
if pipe.__class__.__name__ == 'StableDiffusionReferencePipeline' or pipe.__class__.__name__ == 'StableDiffusionAdapterPipeline' or 'Onnx' in pipe.__class__.__name__:
|
||||
return pipe
|
||||
|
||||
sd_checkpoint_info = getattr(pipe, "sd_checkpoint_info", None)
|
||||
sd_model_checkpoint = getattr(pipe, "sd_model_checkpoint", None)
|
||||
@@ -1244,10 +1251,6 @@ def set_diffuser_pipe(pipe, new_pipe_type):
|
||||
image_encoder = getattr(pipe, "image_encoder", None)
|
||||
feature_extractor = getattr(pipe, "feature_extractor", None)
|
||||
|
||||
# skip specific pipelines
|
||||
if pipe.__class__.__name__ == 'StableDiffusionReferencePipeline' or pipe.__class__.__name__ == 'StableDiffusionAdapterPipeline' or 'Onnx' in pipe.__class__.__name__:
|
||||
return pipe
|
||||
|
||||
try:
|
||||
if new_pipe_type == DiffusersTaskType.TEXT_2_IMAGE:
|
||||
new_pipe = diffusers.AutoPipelineForText2Image.from_pipe(pipe)
|
||||
@@ -1259,8 +1262,8 @@ def set_diffuser_pipe(pipe, new_pipe_type):
|
||||
shared.log.warning(f'Pipeline class change failed: type={new_pipe_type} pipeline={pipe.__class__.__name__} {e}')
|
||||
return pipe
|
||||
|
||||
if pipe.__class__ == new_pipe.__class__:
|
||||
return pipe
|
||||
# if pipe.__class__ == new_pipe.__class__:
|
||||
# return pipe
|
||||
new_pipe.sd_checkpoint_info = sd_checkpoint_info
|
||||
new_pipe.sd_model_checkpoint = sd_model_checkpoint
|
||||
new_pipe.sd_model_hash = sd_model_hash
|
||||
@@ -1271,7 +1274,7 @@ def set_diffuser_pipe(pipe, new_pipe_type):
|
||||
new_pipe.is_sdxl = getattr(pipe, 'is_sdxl', False) # a1111 compatibility item
|
||||
new_pipe.is_sd2 = getattr(pipe, 'is_sd2', False)
|
||||
new_pipe.is_sd1 = getattr(pipe, 'is_sd1', True)
|
||||
shared.log.debug(f"Pipeline class change: original={pipe.__class__.__name__} target={new_pipe.__class__.__name__} fn={sys._getframe().f_back.f_code.co_name}") # pylint: disable=protected-access
|
||||
shared.log.debug(f"Pipeline class change: original={pipe.__class__.__name__} target={new_pipe.__class__.__name__} device={pipe.device} fn={sys._getframe().f_back.f_code.co_name}") # pylint: disable=protected-access
|
||||
pipe = new_pipe
|
||||
return pipe
|
||||
|
||||
|
||||
@@ -168,7 +168,7 @@ def compile_stablefast(sd_model):
|
||||
if shared.opts.cuda_compile_precompile:
|
||||
sd_model("dummy prompt")
|
||||
t1 = time.time()
|
||||
shared.log.info(f"Model compile: task=Stable-fast config={config.__dict__} time={t1-t0:.2f}")
|
||||
shared.log.info(f"Model compile: task='Stable-fast' config={config.__dict__} time={t1-t0:.2f}")
|
||||
except Exception as e:
|
||||
shared.log.info(f"Model compile: task=Stable-fast error: {e}")
|
||||
return sd_model
|
||||
@@ -261,7 +261,7 @@ def compile_deepcache(sd_model):
|
||||
deepcache_worker = DeepCacheSDHelper(pipe=sd_model)
|
||||
deepcache_worker.set_params(cache_interval=shared.opts.deep_cache_interval, cache_branch_id=0)
|
||||
t1 = time.time()
|
||||
shared.log.info(f"Model compile: task=DeepCache config={deepcache_worker.params} time={t1-t0:.2f}")
|
||||
shared.log.info(f"Model compile: task='DeepCache' config={deepcache_worker.params} time={t1-t0:.2f}")
|
||||
# config={'cache_interval': 3, 'cache_layer_id': 0, 'cache_block_id': 0, 'skip_mode': 'uniform'} time=0.00
|
||||
return sd_model
|
||||
|
||||
|
||||
+48
-48
@@ -403,54 +403,54 @@ def create_ui(_blocks: gr.Blocks=None):
|
||||
if i == 0:
|
||||
units[-1].enabled = True # enable first unit in group
|
||||
|
||||
with gr.Tab('Processor settings') as _tab_settings:
|
||||
with gr.Group(elem_classes=['processor-group']):
|
||||
settings = []
|
||||
with gr.Accordion('HED', open=True, elem_classes=['processor-settings']):
|
||||
settings.append(gr.Checkbox(label="Scribble", value=False))
|
||||
with gr.Accordion('Midas depth', open=True, elem_classes=['processor-settings']):
|
||||
settings.append(gr.Slider(label="Background threshold", minimum=0.0, maximum=1.0, step=0.01, value=0.1))
|
||||
settings.append(gr.Checkbox(label="Depth and normal", value=False))
|
||||
with gr.Accordion('MLSD', open=True, elem_classes=['processor-settings']):
|
||||
settings.append(gr.Slider(label="Score threshold", minimum=0.0, maximum=1.0, step=0.01, value=0.1))
|
||||
settings.append(gr.Slider(label="Distance threshold", minimum=0.0, maximum=1.0, step=0.01, value=0.1))
|
||||
with gr.Accordion('OpenBody', open=True, elem_classes=['processor-settings']):
|
||||
settings.append(gr.Checkbox(label="Body", value=True))
|
||||
settings.append(gr.Checkbox(label="Hands", value=False))
|
||||
settings.append(gr.Checkbox(label="Face", value=False))
|
||||
with gr.Accordion('PidiNet', open=True, elem_classes=['processor-settings']):
|
||||
settings.append(gr.Checkbox(label="Scribble", value=False))
|
||||
settings.append(gr.Checkbox(label="Apply filter", value=False))
|
||||
with gr.Accordion('LineArt', open=True, elem_classes=['processor-settings']):
|
||||
settings.append(gr.Checkbox(label="Coarse", value=False))
|
||||
with gr.Accordion('Leres Depth', open=True, elem_classes=['processor-settings']):
|
||||
settings.append(gr.Checkbox(label="Boost", value=False))
|
||||
settings.append(gr.Slider(label="Near threshold", minimum=0.0, maximum=1.0, step=0.01, value=0.0))
|
||||
settings.append(gr.Slider(label="Background threshold", minimum=0.0, maximum=1.0, step=0.01, value=0.0))
|
||||
with gr.Accordion('MediaPipe Face', open=True, elem_classes=['processor-settings']):
|
||||
settings.append(gr.Slider(label="Max faces", minimum=1, maximum=10, step=1, value=1))
|
||||
settings.append(gr.Slider(label="Min confidence", minimum=0.0, maximum=1.0, step=0.01, value=0.5))
|
||||
with gr.Accordion('Canny', open=True, elem_classes=['processor-settings']):
|
||||
settings.append(gr.Slider(label="Low threshold", minimum=0, maximum=1000, step=1, value=100))
|
||||
settings.append(gr.Slider(label="High threshold", minimum=0, maximum=1000, step=1, value=200))
|
||||
with gr.Accordion('DWPose', open=True, elem_classes=['processor-settings']):
|
||||
settings.append(gr.Radio(label="Model", choices=['Tiny', 'Medium', 'Large'], value='Tiny'))
|
||||
settings.append(gr.Slider(label="Min confidence", minimum=0.0, maximum=1.0, step=0.01, value=0.3))
|
||||
with gr.Accordion('SegmentAnything', open=True, elem_classes=['processor-settings']):
|
||||
settings.append(gr.Radio(label="Model", choices=['Base', 'Large'], value='Base'))
|
||||
with gr.Accordion('Edge', open=True, elem_classes=['processor-settings']):
|
||||
settings.append(gr.Checkbox(label="Parameter free", value=True))
|
||||
settings.append(gr.Radio(label="Mode", choices=['edge', 'gradient'], value='edge'))
|
||||
with gr.Accordion('Zoe Depth', open=True, elem_classes=['processor-settings']):
|
||||
settings.append(gr.Checkbox(label="Gamma corrected", value=False))
|
||||
with gr.Accordion('Marigold Depth', open=True, elem_classes=['processor-settings']):
|
||||
settings.append(gr.Dropdown(label="Color map", choices=['None'] + plt.colormaps(), value='None'))
|
||||
settings.append(gr.Slider(label="Denoising steps", minimum=1, maximum=99, step=1, value=10))
|
||||
settings.append(gr.Slider(label="Ensemble size", minimum=1, maximum=99, step=1, value=10))
|
||||
with gr.Accordion('Depth Anything', open=True, elem_classes=['processor-settings']):
|
||||
settings.append(gr.Dropdown(label="Color map", choices=['none'] + masking.COLORMAP, value='inferno'))
|
||||
for setting in settings:
|
||||
setting.change(fn=processors.update_settings, inputs=settings, outputs=[])
|
||||
with gr.Accordion('Processor settings', open=False) as _tab_settings:
|
||||
with gr.Group(elem_classes=['processor-group']):
|
||||
settings = []
|
||||
with gr.Accordion('HED', open=True, elem_classes=['processor-settings']):
|
||||
settings.append(gr.Checkbox(label="Scribble", value=False))
|
||||
with gr.Accordion('Midas depth', open=True, elem_classes=['processor-settings']):
|
||||
settings.append(gr.Slider(label="Background threshold", minimum=0.0, maximum=1.0, step=0.01, value=0.1))
|
||||
settings.append(gr.Checkbox(label="Depth and normal", value=False))
|
||||
with gr.Accordion('MLSD', open=True, elem_classes=['processor-settings']):
|
||||
settings.append(gr.Slider(label="Score threshold", minimum=0.0, maximum=1.0, step=0.01, value=0.1))
|
||||
settings.append(gr.Slider(label="Distance threshold", minimum=0.0, maximum=1.0, step=0.01, value=0.1))
|
||||
with gr.Accordion('OpenBody', open=True, elem_classes=['processor-settings']):
|
||||
settings.append(gr.Checkbox(label="Body", value=True))
|
||||
settings.append(gr.Checkbox(label="Hands", value=False))
|
||||
settings.append(gr.Checkbox(label="Face", value=False))
|
||||
with gr.Accordion('PidiNet', open=True, elem_classes=['processor-settings']):
|
||||
settings.append(gr.Checkbox(label="Scribble", value=False))
|
||||
settings.append(gr.Checkbox(label="Apply filter", value=False))
|
||||
with gr.Accordion('LineArt', open=True, elem_classes=['processor-settings']):
|
||||
settings.append(gr.Checkbox(label="Coarse", value=False))
|
||||
with gr.Accordion('Leres Depth', open=True, elem_classes=['processor-settings']):
|
||||
settings.append(gr.Checkbox(label="Boost", value=False))
|
||||
settings.append(gr.Slider(label="Near threshold", minimum=0.0, maximum=1.0, step=0.01, value=0.0))
|
||||
settings.append(gr.Slider(label="Background threshold", minimum=0.0, maximum=1.0, step=0.01, value=0.0))
|
||||
with gr.Accordion('MediaPipe Face', open=True, elem_classes=['processor-settings']):
|
||||
settings.append(gr.Slider(label="Max faces", minimum=1, maximum=10, step=1, value=1))
|
||||
settings.append(gr.Slider(label="Min confidence", minimum=0.0, maximum=1.0, step=0.01, value=0.5))
|
||||
with gr.Accordion('Canny', open=True, elem_classes=['processor-settings']):
|
||||
settings.append(gr.Slider(label="Low threshold", minimum=0, maximum=1000, step=1, value=100))
|
||||
settings.append(gr.Slider(label="High threshold", minimum=0, maximum=1000, step=1, value=200))
|
||||
with gr.Accordion('DWPose', open=True, elem_classes=['processor-settings']):
|
||||
settings.append(gr.Radio(label="Model", choices=['Tiny', 'Medium', 'Large'], value='Tiny'))
|
||||
settings.append(gr.Slider(label="Min confidence", minimum=0.0, maximum=1.0, step=0.01, value=0.3))
|
||||
with gr.Accordion('SegmentAnything', open=True, elem_classes=['processor-settings']):
|
||||
settings.append(gr.Radio(label="Model", choices=['Base', 'Large'], value='Base'))
|
||||
with gr.Accordion('Edge', open=True, elem_classes=['processor-settings']):
|
||||
settings.append(gr.Checkbox(label="Parameter free", value=True))
|
||||
settings.append(gr.Radio(label="Mode", choices=['edge', 'gradient'], value='edge'))
|
||||
with gr.Accordion('Zoe Depth', open=True, elem_classes=['processor-settings']):
|
||||
settings.append(gr.Checkbox(label="Gamma corrected", value=False))
|
||||
with gr.Accordion('Marigold Depth', open=True, elem_classes=['processor-settings']):
|
||||
settings.append(gr.Dropdown(label="Color map", choices=['None'] + plt.colormaps(), value='None'))
|
||||
settings.append(gr.Slider(label="Denoising steps", minimum=1, maximum=99, step=1, value=10))
|
||||
settings.append(gr.Slider(label="Ensemble size", minimum=1, maximum=99, step=1, value=10))
|
||||
with gr.Accordion('Depth Anything', open=True, elem_classes=['processor-settings']):
|
||||
settings.append(gr.Dropdown(label="Color map", choices=['none'] + masking.COLORMAP, value='inferno'))
|
||||
for setting in settings:
|
||||
setting.change(fn=processors.update_settings, inputs=settings, outputs=[])
|
||||
|
||||
with gr.Row(elem_id="control_script_container"):
|
||||
input_script_args = scripts.scripts_current.setup_ui(parent='control', accordion=True)
|
||||
|
||||
+1
-1
Submodule wiki updated: 867351b6ee...3051fdf2ff
Reference in New Issue
Block a user