Merge branch 'release_candidate' into dev (f4519940) · Commits · github_fork / Stable Diffusion Webui

modules/lowvram.py

+4 −3

Original line number	Diff line number	Diff line
		@@ -90,8 +90,12 @@ def setup_for_low_vram(sd_model, use_medvram):
		sd_model.conditioner.register_forward_pre_hook(send_me_to_gpu)
		elif is_sd2:
		sd_model.cond_stage_model.model.register_forward_pre_hook(send_me_to_gpu)
		sd_model.cond_stage_model.model.token_embedding.register_forward_pre_hook(send_me_to_gpu)
		parents[sd_model.cond_stage_model.model] = sd_model.cond_stage_model
		parents[sd_model.cond_stage_model.model.token_embedding] = sd_model.cond_stage_model
		else:
		sd_model.cond_stage_model.transformer.register_forward_pre_hook(send_me_to_gpu)
		parents[sd_model.cond_stage_model.transformer] = sd_model.cond_stage_model

		sd_model.first_stage_model.register_forward_pre_hook(send_me_to_gpu)
		sd_model.first_stage_model.encode = first_stage_model_encode_wrap
		@@ -101,9 +105,6 @@ def setup_for_low_vram(sd_model, use_medvram):
		if sd_model.embedder:
		sd_model.embedder.register_forward_pre_hook(send_me_to_gpu)

		if hasattr(sd_model, 'cond_stage_model'):
		parents[sd_model.cond_stage_model.transformer] = sd_model.cond_stage_model

		if use_medvram:
		sd_model.model.register_forward_pre_hook(send_me_to_gpu)
		else:

+1 −1

Original line number	Diff line number	Diff line
		@@ -32,7 +32,7 @@ class FrozenOpenCLIPEmbedderWithCustomWords(sd_hijack_clip.FrozenCLIPEmbedderWit
		def encode_embedding_init_text(self, init_text, nvpt):
		ids = tokenizer.encode(init_text)
		ids = torch.asarray([ids], device=devices.device, dtype=torch.int)
		embedded = self.wrapped.model.token_embedding.wrapped(ids.to(self.wrapped.model.token_embedding.wrapped.weight.device)).squeeze(0)
		embedded = self.wrapped.model.token_embedding.wrapped(ids).squeeze(0)

		return embedded