Merge pull request LykosAI#1441 from NeuralFault/comfyui-zluda-cudnnfix2

Inference module to utilize CFZ CUDNN Toggle Node in ComfyUI-Zluda

Author: mohnjiles

StabilityMatrix.Avalonia/App.axaml

@@ -100,6 +100,7 @@
         <StyleInclude Source="Controls/Inference/WanModelCard.axaml" />
         <StyleInclude Source="Controls/Inference/PlasmaNoiseCard.axaml" />
         <StyleInclude Source="Controls/Inference/NrsCard.axaml" />
+        <StyleInclude Source="Controls/Inference/CfzCudnnToggleCard.axaml" />
         <labs:ControlThemes />
 
         <Style Selector="DockControl">

StabilityMatrix.Avalonia/Controls/Inference/CfzCudnnToggleCard.axaml

@@ -0,0 +1,26 @@
+<Styles xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:controls="using:StabilityMatrix.Avalonia.Controls"
+        xmlns:mocks="clr-namespace:StabilityMatrix.Avalonia.DesignData"
+        xmlns:vmInference="clr-namespace:StabilityMatrix.Avalonia.ViewModels.Inference"
+        x:DataType="vmInference:CfzCudnnToggleCardViewModel">
+    <Design.PreviewWith>
+        <controls:CfzCudnnToggleCard Width="400" />
+    </Design.PreviewWith>
+
+    <Style Selector="controls|CfzCudnnToggleCard">
+        <Setter Property="Template">
+            <ControlTemplate>
+                <controls:Card x:Name="PART_Card">
+                    <StackPanel Spacing="8">
+                        <TextBlock Text="Disable CUDNN" FontSize="14" FontWeight="Bold" />
+                        <ToggleSwitch
+                            IsChecked="{Binding DisableCudnn}"
+                            Margin="8,0,4,0"
+                            HorizontalAlignment="Stretch" />
+                    </StackPanel>
+                </controls:Card>
+            </ControlTemplate>
+        </Setter>
+    </Style>
+</Styles>

StabilityMatrix.Avalonia/Controls/Inference/CfzCudnnToggleCard.axaml.cs

@@ -0,0 +1,6 @@
+using Injectio.Attributes;
+
+namespace StabilityMatrix.Avalonia.Controls;
+
+[RegisterTransient<CfzCudnnToggleCard>]
+public class CfzCudnnToggleCard : TemplatedControlBase;

StabilityMatrix.Avalonia/ViewModels/Base/LoadableViewModelBase.cs

@@ -26,6 +26,7 @@ namespace StabilityMatrix.Avalonia.ViewModels.Base;
 [JsonDerivedType(typeof(RescaleCfgCardViewModel), RescaleCfgCardViewModel.ModuleKey)]
 [JsonDerivedType(typeof(PlasmaNoiseCardViewModel), PlasmaNoiseCardViewModel.ModuleKey)]
 [JsonDerivedType(typeof(NrsCardViewModel), NrsCardViewModel.ModuleKey)]
+[JsonDerivedType(typeof(CfzCudnnToggleCardViewModel), CfzCudnnToggleCardViewModel.ModuleKey)]
 [JsonDerivedType(typeof(FreeUModule))]
 [JsonDerivedType(typeof(HiresFixModule))]
 [JsonDerivedType(typeof(FluxHiresFixModule))]
@@ -41,6 +42,7 @@ namespace StabilityMatrix.Avalonia.ViewModels.Base;
 [JsonDerivedType(typeof(RescaleCfgModule))]
 [JsonDerivedType(typeof(PlasmaNoiseModule))]
 [JsonDerivedType(typeof(NRSModule))]
+[JsonDerivedType(typeof(CfzCudnnToggleModule))]
 public abstract class LoadableViewModelBase : ViewModelBase, IJsonLoadableState
 {
     private static readonly Logger Logger = LogManager.GetCurrentClassLogger();

StabilityMatrix.Avalonia/ViewModels/Inference/CfzCudnnToggleCardViewModel.cs

@@ -0,0 +1,18 @@
+using CommunityToolkit.Mvvm.ComponentModel;
+using Injectio.Attributes;
+using StabilityMatrix.Avalonia.Controls;
+using StabilityMatrix.Avalonia.ViewModels.Base;
+using StabilityMatrix.Core.Attributes;
+
+namespace StabilityMatrix.Avalonia.ViewModels.Inference;
+
+[View(typeof(CfzCudnnToggleCard))]
+[ManagedService]
+[RegisterTransient<CfzCudnnToggleCardViewModel>]
+public partial class CfzCudnnToggleCardViewModel : LoadableViewModelBase
+{
+    public const string ModuleKey = "CfzCudnnToggle";
+
+    [ObservableProperty]
+    private bool disableCudnn = true;
+}

StabilityMatrix.Avalonia/ViewModels/Inference/InferenceFluxTextToImageViewModel.cs

@@ -93,10 +93,11 @@ RunningPackageService runningPackageService
         {
             modulesCard.AvailableModules = new[]
             {
+                typeof(CfzCudnnToggleModule),
+                typeof(FaceDetailerModule),
                 typeof(FluxHiresFixModule),
-                typeof(UpscalerModule),
                 typeof(SaveImageModule),
-                typeof(FaceDetailerModule)
+                typeof(UpscalerModule),
             };
             modulesCard.DefaultModules = new[] { typeof(FluxHiresFixModule), typeof(UpscalerModule) };
             modulesCard.InitializeDefaults();
@@ -121,7 +122,7 @@ protected override void BuildPrompt(BuildPromptEventArgs args)
         builder.Connections.Seed = args.SeedOverride switch
         {
             { } seed => Convert.ToUInt64(seed),
-            _ => Convert.ToUInt64(SeedCardViewModel.Seed)
+            _ => Convert.ToUInt64(SeedCardViewModel.Seed),
         };
 
         var applyArgs = args.ToModuleApplyStepEventArgs();
@@ -217,7 +218,7 @@ CancellationToken cancellationToken
                 FilesToTransfer = buildPromptArgs.FilesToTransfer,
                 BatchIndex = i,
                 // Only clear output images on the first batch
-                ClearOutputImages = i == 0
+                ClearOutputImages = i == 0,
             };
 
             batchArgs.Add(generationArgs);

StabilityMatrix.Avalonia/ViewModels/Inference/InferenceTextToImageViewModel.cs

@@ -100,10 +100,11 @@ TabContext tabContext
         {
             modulesCard.AvailableModules = new[]
             {
+                typeof(CfzCudnnToggleModule),
+                typeof(FaceDetailerModule),
                 typeof(HiresFixModule),
-                typeof(UpscalerModule),
                 typeof(SaveImageModule),
-                typeof(FaceDetailerModule)
+                typeof(UpscalerModule),
             };
             modulesCard.DefaultModules = new[] { typeof(HiresFixModule), typeof(UpscalerModule) };
             modulesCard.InitializeDefaults();
@@ -158,7 +159,7 @@ protected override void BuildPrompt(BuildPromptEventArgs args)
         builder.Connections.Seed = args.SeedOverride switch
         {
             { } seed => Convert.ToUInt64(seed),
-            _ => Convert.ToUInt64(SeedCardViewModel.Seed)
+            _ => Convert.ToUInt64(SeedCardViewModel.Seed),
         };
 
         var applyArgs = args.ToModuleApplyStepEventArgs();
@@ -319,13 +320,13 @@ CancellationToken cancellationToken
                 OutputNodeNames = buildPromptArgs.Builder.Connections.OutputNodeNames.ToArray(),
                 Parameters = SaveStateToParameters(new GenerationParameters()) with
                 {
-                    Seed = Convert.ToUInt64(seed)
+                    Seed = Convert.ToUInt64(seed),
                 },
                 Project = inferenceProject,
                 FilesToTransfer = buildPromptArgs.FilesToTransfer,
                 BatchIndex = i,
                 // Only clear output images on the first batch
-                ClearOutputImages = i == 0
+                ClearOutputImages = i == 0,
             };
 
             batchArgs.Add(generationArgs);

StabilityMatrix.Avalonia/ViewModels/Inference/Modules/CfzCudnnToggleModule.cs

@@ -0,0 +1,62 @@
+using Injectio.Attributes;
+using StabilityMatrix.Avalonia.Models.Inference;
+using StabilityMatrix.Avalonia.Services;
+using StabilityMatrix.Avalonia.ViewModels.Base;
+using StabilityMatrix.Avalonia.ViewModels.Inference;
+using StabilityMatrix.Core.Attributes;
+using StabilityMatrix.Core.Models.Api.Comfy.Nodes;
+using StabilityMatrix.Core.Models.Api.Comfy.NodeTypes;
+using StabilityMatrix.Core.Models.Inference;
+
+namespace StabilityMatrix.Avalonia.ViewModels.Inference.Modules;
+
+[ManagedService]
+[RegisterTransient<CfzCudnnToggleModule>]
+public class CfzCudnnToggleModule : ModuleBase
+{
+    /// <inheritdoc />
+    public CfzCudnnToggleModule(IServiceManager<ViewModelBase> vmFactory)
+        : base(vmFactory)
+    {
+        Title = "CUDNN Toggle (ComfyUI-Zluda)";
+        AddCards(vmFactory.Get<CfzCudnnToggleCardViewModel>());
+    }
+
+    /// <summary>
+    /// Applies CUDNN Toggle node between sampler latent output and VAE decode
+    /// This prevents "GET was unable to find an engine" errors on AMD cards with Zluda
+    /// </summary>
+    protected override void OnApplyStep(ModuleApplyStepEventArgs e)
+    {
+        // Get the primary connection (can be latent or image)
+        var primary = e.Builder.Connections.Primary;
+        if (primary == null)
+        {
+            return; // No primary connection to process
+        }
+
+        // Check if primary is a latent (from sampler output)
+        if (primary.IsT0) // T0 is LatentNodeConnection
+        {
+            var card = GetCard<CfzCudnnToggleCardViewModel>();
+            var latentConnection = primary.AsT0;
+
+            // Insert CUDNN toggle node between sampler and VAE decode
+            var cudnnToggleOutput = e.Nodes.AddTypedNode(
+                new ComfyNodeBuilder.CUDNNToggleAutoPassthrough
+                {
+                    Name = e.Nodes.GetUniqueName("CUDNNToggle"),
+                    Model = null,
+                    Conditioning = null,
+                    Latent = latentConnection, // Pass through the latent from sampler
+                    EnableCudnn = !card.DisableCudnn,
+                    CudnnBenchmark = false,
+                }
+            );
+
+            // Update the primary connection to use the CUDNN toggle latent output (Output3)
+            // This ensures VAE decode receives latent from CUDNN toggle instead of directly from sampler
+            e.Builder.Connections.Primary = cudnnToggleOutput.Output3;
+        }
+    }
+}

StabilityMatrix.Core/Models/Api/Comfy/Nodes/ComfyNodeBuilder.cs

@@ -997,6 +997,20 @@ public record BrownNoise : ComfyTypedNodeBase<ImageNodeConnection>
         public required ulong Seed { get; init; } = 0;
     }
 
+    /// <summary>
+    /// CUDNN Toggle node for controlling CUDA Deep Neural Network library settings (CUDNNToggleAutoPassthrough)
+    /// </summary>
+    [TypedNodeOptions(Name = "CUDNNToggleAutoPassthrough")]
+    public record CUDNNToggleAutoPassthrough
+        : ComfyTypedNodeBase<ModelNodeConnection, ConditioningNodeConnection, LatentNodeConnection>
+    {
+        public ModelNodeConnection? Model { get; init; }
+        public ConditioningNodeConnection? Conditioning { get; init; }
+        public LatentNodeConnection? Latent { get; init; }
+        public required bool EnableCudnn { get; init; } = false;
+        public required bool CudnnBenchmark { get; init; } = false;
+    }
+
     /// <summary>
     /// Custom KSampler node using alternative noise distribution (Lykos_JDC_PlasmaSampler)
     /// </summary>