Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 18 additions & 18 deletions wrappers.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ def _create_distorch_safetensor_v2_override(cls, device_param_name, device_sette
class NodeOverrideDisTorchSafetensorV2(cls):
@classmethod
def INPUT_TYPES(s):
inputs = copy.deepcopy(cls.INPUT_TYPES())
inputs = cls.INPUT_TYPES().copy()
devices = get_device_list()
default_device = devices[1] if len(devices) > 1 else devices[0]

inputs["optional"] = inputs.get("optional", {})
inputs["optional"] = inputs.get("optional", {}).copy()
inputs["optional"][device_param_name] = (devices, {"default": default_device})
inputs["optional"]["virtual_vram_gb"] = ("FLOAT", {"default": 4.0, "min": 0.0, "max": 128.0, "step": 0.1})
inputs["optional"]["donor_device"] = (devices, {"default": "cpu"})
Expand Down Expand Up @@ -177,10 +177,10 @@ def override_class_with_distorch_gguf(cls):
class NodeOverrideDisTorchGGUFLegacy(cls):
@classmethod
def INPUT_TYPES(s):
inputs = copy.deepcopy(cls.INPUT_TYPES())
inputs = cls.INPUT_TYPES().copy()
devices = get_device_list()
default_device = devices[1] if len(devices) > 1 else devices[0]
inputs["optional"] = inputs.get("optional", {})
inputs["optional"] = inputs.get("optional", {}).copy()
inputs["optional"]["device"] = (devices, {"default": default_device})
inputs["optional"]["virtual_vram_gb"] = ("FLOAT", {"default": 4.0, "min": 0.0, "max": 24.0, "step": 0.1})
inputs["optional"]["use_other_vram"] = ("BOOLEAN", {"default": False})
Expand Down Expand Up @@ -245,11 +245,11 @@ def override_class_with_distorch_gguf_v2(cls):
class NodeOverrideDisTorchGGUFv2(cls):
@classmethod
def INPUT_TYPES(s):
inputs = copy.deepcopy(cls.INPUT_TYPES())
inputs = cls.INPUT_TYPES().copy()
devices = get_device_list()
compute_device = devices[1] if len(devices) > 1 else devices[0]

inputs["optional"] = inputs.get("optional", {})
inputs["optional"] = inputs.get("optional", {}).copy()
inputs["optional"]["compute_device"] = (devices, {"default": compute_device})
inputs["optional"]["virtual_vram_gb"] = ("FLOAT", {"default": 4.0, "min": 0.0, "max": 128.0, "step": 0.1})
inputs["optional"]["donor_device"] = (devices, {"default": "cpu"})
Expand Down Expand Up @@ -310,10 +310,10 @@ def override_class_with_distorch_clip(cls):
class NodeOverrideDisTorchClip(cls):
@classmethod
def INPUT_TYPES(s):
inputs = copy.deepcopy(cls.INPUT_TYPES())
inputs = cls.INPUT_TYPES().copy()
devices = get_device_list()
default_device = devices[1] if len(devices) > 1 else devices[0]
inputs["optional"] = inputs.get("optional", {})
inputs["optional"] = inputs.get("optional", {}).copy()
inputs["optional"]["device"] = (devices, {"default": default_device})
inputs["optional"]["virtual_vram_gb"] = ("FLOAT", {"default": 4.0, "min": 0.0, "max": 24.0, "step": 0.1})
inputs["optional"]["use_other_vram"] = ("BOOLEAN", {"default": False})
Expand Down Expand Up @@ -377,10 +377,10 @@ def override_class_with_distorch_clip_no_device(cls):
class NodeOverrideDisTorchClipNoDevice(cls):
@classmethod
def INPUT_TYPES(s):
inputs = copy.deepcopy(cls.INPUT_TYPES())
inputs = cls.INPUT_TYPES().copy()
devices = get_device_list()
default_device = devices[1] if len(devices) > 1 else devices[0]
inputs["optional"] = inputs.get("optional", {})
inputs["optional"] = inputs.get("optional", {}).copy()
inputs["optional"]["device"] = (devices, {"default": default_device})
inputs["optional"]["virtual_vram_gb"] = ("FLOAT", {"default": 4.0, "min": 0.0, "max": 24.0, "step": 0.1})
inputs["optional"]["use_other_vram"] = ("BOOLEAN", {"default": False})
Expand Down Expand Up @@ -451,10 +451,10 @@ def override_class(cls):
class NodeOverride(cls):
@classmethod
def INPUT_TYPES(s):
inputs = copy.deepcopy(cls.INPUT_TYPES())
inputs = cls.INPUT_TYPES().copy()
devices = get_device_list()
default_device = devices[1] if len(devices) > 1 else devices[0]
inputs["optional"] = inputs.get("optional", {})
inputs["optional"] = inputs.get("optional", {}).copy()
inputs["optional"]["device"] = (devices, {"default": default_device})
return inputs

Expand Down Expand Up @@ -488,10 +488,10 @@ def override_class_offload(cls):
class NodeOverride(cls):
@classmethod
def INPUT_TYPES(s):
inputs = copy.deepcopy(cls.INPUT_TYPES())
inputs = cls.INPUT_TYPES().copy()
devices = get_device_list()
default_device = devices[1] if len(devices) > 1 else devices[0]
inputs["optional"] = inputs.get("optional", {})
inputs["optional"] = inputs.get("optional", {}).copy()
inputs["optional"]["device"] = (devices, {"default": default_device})
inputs["optional"]["offload_device"] = (devices, {"default": "cpu"})
return inputs
Expand Down Expand Up @@ -526,10 +526,10 @@ def override_class_clip(cls):
class NodeOverride(cls):
@classmethod
def INPUT_TYPES(s):
inputs = copy.deepcopy(cls.INPUT_TYPES())
inputs = cls.INPUT_TYPES().copy()
devices = get_device_list()
default_device = devices[1] if len(devices) > 1 else devices[0]
inputs["optional"] = inputs.get("optional", {})
inputs["optional"] = inputs.get("optional", {}).copy()
inputs["optional"]["device"] = (devices, {"default": default_device})
return inputs

Expand Down Expand Up @@ -558,10 +558,10 @@ def override_class_clip_no_device(cls):
class NodeOverride(cls):
@classmethod
def INPUT_TYPES(s):
inputs = copy.deepcopy(cls.INPUT_TYPES())
inputs = cls.INPUT_TYPES().copy()
devices = get_device_list()
default_device = devices[1] if len(devices) > 1 else devices[0]
inputs["optional"] = inputs.get("optional", {})
inputs["optional"] = inputs.get("optional", {}).copy()
inputs["optional"]["device"] = (devices, {"default": default_device})
return inputs

Expand Down