From f67c37a633937ec096dd7d8abccab61d25256932 Mon Sep 17 00:00:00 2001 From: Raimund58 Date: Fri, 29 Apr 2022 15:52:16 +0000 Subject: [PATCH] Add missing denoise error --- src/com/sheepit/client/Error.java | 3 +++ src/com/sheepit/client/Job.java | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/com/sheepit/client/Error.java b/src/com/sheepit/client/Error.java index 74da205..eca3bb5 100644 --- a/src/com/sheepit/client/Error.java +++ b/src/com/sheepit/client/Error.java @@ -52,6 +52,7 @@ public class Error { ENGINE_NOT_AVAILABLE(27), VALIDATION_FAILED(25), IMAGE_WRONG_DIMENSION(26), + DENOISING_NOT_SUPPORTED(29), // internal error handling NO_SPACE_LEFT_ON_DEVICE(100), @@ -198,6 +199,8 @@ public class Error { return "This Operating System is not supported."; case CPU_NOT_SUPPORTED: return "This CPU is not supported."; + case DENOISING_NOT_SUPPORTED: + return "Denoising is not supported on this device."; case ENGINE_NOT_AVAILABLE: return "The project requires a rendering engine that isn't supported on this machine. Will try another project in a few minutes."; case NO_SPACE_LEFT_ON_DEVICE: diff --git a/src/com/sheepit/client/Job.java b/src/com/sheepit/client/Job.java index 0b15d94..9ec5ce7 100644 --- a/src/com/sheepit/client/Job.java +++ b/src/com/sheepit/client/Job.java @@ -818,7 +818,7 @@ import java.util.regex.Pattern; else if (line.contains("Warning: Cycles is not enabled!")) { return Error.Type.ENGINE_NOT_AVAILABLE; } - else if (line.contains("OpenImageDenoise error: SSE4.1 support is required at minimum")) { + else if (line.contains("OpenImageDenoise error: SSE4.1 support is required at minimum") || line.contains("OpenImageDenoiser is not supported on this CPU:") || line.contains("No device available to denoise on")) { // denoising capability detection // Fra:201 Mem:8.89M (Peak 10.09M) | Time:00:00.04 | Mem:0.27M, Peak:0.27M | Scene, View Layer | Updating Device | Writing constant memory // Fra:201 Mem:8.89M (Peak 10.09M) | Time:00:00.04 | Mem:0.27M, Peak:0.27M | Scene, View Layer | Loading denoising kernels (may take a few minutes the first time) @@ -831,7 +831,7 @@ import java.util.regex.Pattern; // Saved: '/tmp/5/sheepit/1541_0201.png' // Time: 00:09.30 (Saving: 00:00.55) // Blender quit - return Error.Type.CPU_NOT_SUPPORTED; + return Error.Type.DENOISING_NOT_SUPPORTED; } else if (line.contains("Error: File format is not supported")) { //09-03 23:36:03 (debug) Blender 2.83.19 (hash 86c526d2c733 built 2022-02-02 00:44:40)