mirror of
https://github.com/comfyanonymous/ComfyUI.git
synced 2026-04-14 20:42:31 +08:00
Merge branch 'master' into patch-1
This commit is contained in:
commit
0555cc7457
@ -25,7 +25,7 @@ def ltxv_te(*args, **kwargs):
|
|||||||
class Gemma3_12BTokenizer(sd1_clip.SDTokenizer):
|
class Gemma3_12BTokenizer(sd1_clip.SDTokenizer):
|
||||||
def __init__(self, embedding_directory=None, tokenizer_data={}):
|
def __init__(self, embedding_directory=None, tokenizer_data={}):
|
||||||
tokenizer = tokenizer_data.get("spiece_model", None)
|
tokenizer = tokenizer_data.get("spiece_model", None)
|
||||||
super().__init__(tokenizer, pad_with_end=False, embedding_size=3840, embedding_key='gemma3_12b', tokenizer_class=SPieceTokenizer, has_end_token=False, pad_to_max_length=False, max_length=99999999, min_length=1, tokenizer_args={"add_bos": True, "add_eos": False}, tokenizer_data=tokenizer_data)
|
super().__init__(tokenizer, pad_with_end=False, embedding_size=3840, embedding_key='gemma3_12b', tokenizer_class=SPieceTokenizer, has_end_token=False, pad_to_max_length=False, max_length=99999999, min_length=1, disable_weights=True, tokenizer_args={"add_bos": True, "add_eos": False}, tokenizer_data=tokenizer_data)
|
||||||
|
|
||||||
def state_dict(self):
|
def state_dict(self):
|
||||||
return {"spiece_model": self.tokenizer.serialize_model()}
|
return {"spiece_model": self.tokenizer.serialize_model()}
|
||||||
|
|||||||
@ -622,6 +622,7 @@ class SamplerSASolver(io.ComfyNode):
|
|||||||
def define_schema(cls):
|
def define_schema(cls):
|
||||||
return io.Schema(
|
return io.Schema(
|
||||||
node_id="SamplerSASolver",
|
node_id="SamplerSASolver",
|
||||||
|
search_aliases=["sde"],
|
||||||
category="sampling/custom_sampling/samplers",
|
category="sampling/custom_sampling/samplers",
|
||||||
inputs=[
|
inputs=[
|
||||||
io.Model.Input("model"),
|
io.Model.Input("model"),
|
||||||
@ -666,6 +667,7 @@ class SamplerSEEDS2(io.ComfyNode):
|
|||||||
def define_schema(cls):
|
def define_schema(cls):
|
||||||
return io.Schema(
|
return io.Schema(
|
||||||
node_id="SamplerSEEDS2",
|
node_id="SamplerSEEDS2",
|
||||||
|
search_aliases=["sde", "exp heun"],
|
||||||
category="sampling/custom_sampling/samplers",
|
category="sampling/custom_sampling/samplers",
|
||||||
inputs=[
|
inputs=[
|
||||||
io.Combo.Input("solver_type", options=["phi_1", "phi_2"]),
|
io.Combo.Input("solver_type", options=["phi_1", "phi_2"]),
|
||||||
|
|||||||
@ -108,7 +108,7 @@ def lazycache_predict_noise_wrapper(executor, *args, **kwargs):
|
|||||||
easycache: LazyCacheHolder = model_options["transformer_options"]["easycache"]
|
easycache: LazyCacheHolder = model_options["transformer_options"]["easycache"]
|
||||||
if easycache.is_past_end_timestep(timestep):
|
if easycache.is_past_end_timestep(timestep):
|
||||||
return executor(*args, **kwargs)
|
return executor(*args, **kwargs)
|
||||||
x: torch.Tensor = _extract_tensor(args[0], easycache.output_channels)
|
x: torch.Tensor = args[0][:, :easycache.output_channels]
|
||||||
# prepare next x_prev
|
# prepare next x_prev
|
||||||
next_x_prev = x
|
next_x_prev = x
|
||||||
input_change = None
|
input_change = None
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
comfyui-frontend-package==1.38.13
|
comfyui-frontend-package==1.38.13
|
||||||
comfyui-workflow-templates==0.8.31
|
comfyui-workflow-templates==0.8.31
|
||||||
comfyui-embedded-docs==0.4.0
|
comfyui-embedded-docs==0.4.1
|
||||||
torch
|
torch
|
||||||
torchsde
|
torchsde
|
||||||
torchvision
|
torchvision
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user