From 099fb5184a96a2eb9b25fd01853b7d9ab8cc29f5 Mon Sep 17 00:00:00 2001 From: City <125218114+city96@users.noreply.github.com> Date: Sun, 30 Apr 2023 19:50:38 +0200 Subject: [PATCH] Revert "fixed repeating frames after batch using deepcopy" This reverts commit 1086d6a0e1f5c5c9247312872402ff8e60358fe1. --- nodes.py | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/nodes.py b/nodes.py index e48d3c5bc..abb60675b 100644 --- a/nodes.py +++ b/nodes.py @@ -1,5 +1,3 @@ -from queue import Empty -from turtle import clone import torch import os @@ -7,11 +5,9 @@ import sys import json import hashlib import traceback -import copy from PIL import Image from PIL.PngImagePlugin import PngInfo -from copy import deepcopy import numpy as np @@ -78,15 +74,12 @@ class ConditioningAverage : conditioning_to_strength = (1-conditioning_from_strength) conditioning_from_tensor = conditioning_from[0][0] conditioning_to_tensor = conditioning_to[0][0] - - output = copy.deepcopy(conditioning_from) - - if conditioning_from_tensor.shape[1] > conditioning_to_tensor.shape[1]: - conditioning_to_tensor = torch.cat((conditioning_to_tensor, torch.zeros((1, conditioning_from_tensor.shape[1] - conditioning_to_tensor.shape[1], conditioning_from_tensor.shape[1].value))), dim=1) + output = conditioning_from + if conditioning_from_tensor.shape[0] > conditioning_to_tensor.shape[1]: + conditioning_to_tensor = torch.cat((conditioning_to_tensor, torch.zeros((1, conditioning_from_tensor.shape[1] - conditioning_to_tensor.shape[1], conditioning_from_tensor.shape[1].value))), dim=1) elif conditioning_to_tensor.shape[1] > conditioning_from_tensor.shape[1]: conditioning_from_tensor = torch.cat((conditioning_from_tensor, torch.zeros((1, conditioning_to_tensor.shape[1] - conditioning_from_tensor.shape[1], conditioning_to_tensor.shape[1].value))), dim=1) output[0][0] = ((conditioning_from_tensor * conditioning_from_strength) + (conditioning_to_tensor * conditioning_to_strength)) - return (output, ) class ConditioningSetArea: