298977887/ComfyUI
1
0
Fork 0
mirror of https://github.com/comfyanonymous/ComfyUI.git synced 2025-04-20 03:13:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Some refactoring: from_tokens -> encode_from_tokens

Browse Source
This commit is contained in:
comfyanonymous 2023-04-15 18:46:58 -04:00
parent 719c26c3c9
commit 81d1f00df3
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
comfy/sd.py
View File

@ -375,13 +375,9 @@ class CLIP:
def tokenize(self, text, return_word_ids=False): def tokenize(self, text, return_word_ids=False):
return self.tokenizer.tokenize_with_weights(text, return_word_ids) return self.tokenizer.tokenize_with_weights(text, return_word_ids)
def encode(self, text, from_tokens=False): def encode_from_tokens(self, tokens):
if self.layer_idx is not None: if self.layer_idx is not None:
self.cond_stage_model.clip_layer(self.layer_idx) self.cond_stage_model.clip_layer(self.layer_idx)
if from_tokens:
tokens = text
else:
tokens = self.tokenizer.tokenize_with_weights(text)
try: try:
self.patcher.patch_model() self.patcher.patch_model()
cond = self.cond_stage_model.encode_token_weights(tokens) cond = self.cond_stage_model.encode_token_weights(tokens)
@ -391,6 +387,10 @@ class CLIP:
raise e raise e
return cond return cond
def encode(self, text):
tokens = self.tokenizer.tokenize_with_weights(text)
return self.encode_from_tokens(tokens)
class VAE: class VAE:
def __init__(self, ckpt_path=None, scale_factor=0.18215, device=None, config=None): def __init__(self, ckpt_path=None, scale_factor=0.18215, device=None, config=None):
if config is None: if config is None:

2
comfy/sd2_clip.py
View File

@ -1,4 +1,4 @@
import sd1_clip from comfy import sd1_clip
import torch import torch
import os import os