From d9d8702d8dd2337c64610633f5df2dcd402379a8 Mon Sep 17 00:00:00 2001
From: comfyanonymous <comfyanonymous@protonmail.com>
Date: Sat, 18 Nov 2023 23:20:29 -0500
Subject: [PATCH] percent_to_sigma now returns a float instead of a tensor.
---
comfy/model_sampling.py | 6 +++---
comfy_extras/nodes_model_advanced.py | 6 +++---
comfy_extras/nodes_model_downscale.py | 4 ++--
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/comfy/model_sampling.py b/comfy/model_sampling.py
index d5b1642e..37a3ac72 100644
--- a/comfy/model_sampling.py
+++ b/comfy/model_sampling.py
@@ -77,9 +77,9 @@ class ModelSamplingDiscrete(torch.nn.Module):
def percent_to_sigma(self, percent):
if percent <= 0.0:
- return torch.tensor(999999999.9)
+ return 999999999.9
if percent >= 1.0:
- return torch.tensor(0.0)
+ return 0.0
percent = 1.0 - percent
- return self.sigma(torch.tensor(percent * 999.0))
+ return self.sigma(torch.tensor(percent * 999.0)).item()
diff --git a/comfy_extras/nodes_model_advanced.py b/comfy_extras/nodes_model_advanced.py
index c8c4b4a1..0f4ddd9c 100644
--- a/comfy_extras/nodes_model_advanced.py
+++ b/comfy_extras/nodes_model_advanced.py
@@ -67,11 +67,11 @@ class ModelSamplingDiscreteLCM(torch.nn.Module):
def percent_to_sigma(self, percent):
if percent <= 0.0:
- return torch.tensor(999999999.9)
+ return 999999999.9
if percent >= 1.0:
- return torch.tensor(0.0)
+ return 0.0
percent = 1.0 - percent
- return self.sigma(torch.tensor(percent * 999.0))
+ return self.sigma(torch.tensor(percent * 999.0)).item()
def rescale_zero_terminal_snr_sigmas(sigmas):
diff --git a/comfy_extras/nodes_model_downscale.py b/comfy_extras/nodes_model_downscale.py
index 8850d094..f65ef05e 100644
--- a/comfy_extras/nodes_model_downscale.py
+++ b/comfy_extras/nodes_model_downscale.py
@@ -16,8 +16,8 @@ class PatchModelAddDownscale:
CATEGORY = "_for_testing"
def patch(self, model, block_number, downscale_factor, start_percent, end_percent, downscale_after_skip):
- sigma_start = model.model.model_sampling.percent_to_sigma(start_percent).item()
- sigma_end = model.model.model_sampling.percent_to_sigma(end_percent).item()
+ sigma_start = model.model.model_sampling.percent_to_sigma(start_percent)
+ sigma_end = model.model.model_sampling.percent_to_sigma(end_percent)
def input_block_patch(h, transformer_options):
if transformer_options["block"][1] == block_number: