Raincloud/sheepit-shadow-nabber
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'Add-missing-denoise-error' into 'master'

Browse Source 
Add missing denoise error

See merge request sheepitrenderfarm/client!129
This commit is contained in:
Sheepit Renderfarm
2022-04-29 15:52:16 +00:00
parent d698f5181c f67c37a633
commit 1bee6b5f8c
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/sheepit/client/Error.java
View File

@@ -52,6 +52,7 @@ public class Error {
ENGINE_NOT_AVAILABLE(27), ENGINE_NOT_AVAILABLE(27),
VALIDATION_FAILED(25), VALIDATION_FAILED(25),
IMAGE_WRONG_DIMENSION(26), IMAGE_WRONG_DIMENSION(26),
DENOISING_NOT_SUPPORTED(29),
// internal error handling // internal error handling
NO_SPACE_LEFT_ON_DEVICE(100), NO_SPACE_LEFT_ON_DEVICE(100),
@@ -198,6 +199,8 @@ public class Error {
return "This Operating System is not supported."; return "This Operating System is not supported.";
case CPU_NOT_SUPPORTED: case CPU_NOT_SUPPORTED:
return "This CPU is not supported."; return "This CPU is not supported.";
case DENOISING_NOT_SUPPORTED:
return "Denoising is not supported on this device.";
case ENGINE_NOT_AVAILABLE: 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."; 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: case NO_SPACE_LEFT_ON_DEVICE:

4
src/main/java/com/sheepit/client/Job.java
View File

@@ -842,7 +842,7 @@ import java.util.regex.Pattern;
else if (line.contains("Warning: Cycles is not enabled!")) { else if (line.contains("Warning: Cycles is not enabled!")) {
return Error.Type.ENGINE_NOT_AVAILABLE; 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 // 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 | 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) // 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)
@@ -855,7 +855,7 @@ import java.util.regex.Pattern;
// Saved: '/tmp/5/sheepit/1541_0201.png' // Saved: '/tmp/5/sheepit/1541_0201.png'
// Time: 00:09.30 (Saving: 00:00.55) // Time: 00:09.30 (Saving: 00:00.55)
// Blender quit // Blender quit
return Error.Type.CPU_NOT_SUPPORTED; return Error.Type.DENOISING_NOT_SUPPORTED;
} }
else if (line.contains("Error: File format is 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) //09-03 23:36:03 (debug) Blender 2.83.19 (hash 86c526d2c733 built 2022-02-02 00:44:40)