From 39c67581980c7645befd84be433af617820ce839 Mon Sep 17 00:00:00 2001 From: VALADI K JAGANATHAN Date: Fri, 31 May 2024 18:05:44 +0530 Subject: [PATCH] Update bnk_tiled_samplers.py --- py/bnk_tiled_samplers.py | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/py/bnk_tiled_samplers.py b/py/bnk_tiled_samplers.py index 084bba3..b30fd87 100644 --- a/py/bnk_tiled_samplers.py +++ b/py/bnk_tiled_samplers.py @@ -119,13 +119,19 @@ def sample_common(model, add_noise, noise_seed, tile_width, tile_height, tiling_ tile_width = min(shape[-1] * 8, tile_width) tile_height = min(shape[2] * 8, tile_height) - real_model = None + # real_model = None # positive_copy = comfy.sample.convert_cond(positive) # negative_copy = comfy.sample.convert_cond(negative) #change made due to changes in omfy.sampler's 'convert cond' has been removed.. check if any error persists. - positive_copy = comfy.sampler_helpers.convert_cond(positive) - negative_copy = comfy.sampler_helpers.convert_cond(negative) - modelPatches, inference_memory = comfy.sample.get_additional_models(positive_copy, negative_copy, model.model_dtype()) + conds0 = \ + {"positive": comfy.sampler_helpers.convert_cond(positive), + "negative": comfy.sampler_helpers.convert_cond(negative)} + + conds = {} + for k in conds0: + conds[k] = list(map(lambda a: a.copy(), conds0[k])) + + modelPatches, inference_memory = comfy.sampler_helpers.get_additional_models(conds, model.model_dtype()) comfy.model_management.load_models_gpu([model] + modelPatches, model.memory_required(noise.shape) + inference_memory) real_model = model.model #smaller changes @@ -256,8 +262,8 @@ def sample_common(model, add_noise, noise_seed, tile_width, tile_height, tiling_ for m, img in zip(T2Is, T2I_imgs): slices_T2I(tile_h, tile_h_len, tile_w, tile_w_len, m, img) - pos = [c.copy() for c in positive_copy]#copy_cond(positive_copy) - neg = [c.copy() for c in negative_copy]#copy_cond(negative_copy) + pos = [c.copy() for c in positive]#copy_cond(positive_copy) + neg = [c.copy() for c in negative]#copy_cond(negative_copy) #cond areas pos = [slice_cond(tile_h, tile_h_len, tile_w, tile_w_len, c, area, device) for c, area in zip(pos, spatial_conds_pos)] @@ -283,7 +289,7 @@ def sample_common(model, add_noise, noise_seed, tile_width, tile_height, tiling_ samples = samples_next.clone() - comfy.sample.cleanup_additional_models(modelPatches) + comfy.sampler_helpers.cleanup_additional_models(modelPatches) out = latent_image.copy() out["samples"] = samples.cpu()