Merge branch 'fix/complement_cm_error_detection' into 'master'

Feat: broadened color management error detection

See merge request sheepitrenderfarm/client!276
This commit is contained in:
Sheepit Renderfarm
2023-12-19 14:34:48 +00:00

View File

@@ -806,7 +806,11 @@ import java.util.regex.Pattern;
// 07-04 07:43:12 (debug) /tmp///rend.exe: /lib/x86_64-linux-gnu/libc.so.6: version `GLIBC_2.28' not found (required by /tmp///lib/libboost_filesystem.so.1.80.0)
return Type.OS_NOT_SUPPORTED;
}
else if (line.contains("Color management:") && line.contains(" not found")) {
else if (line.contains("Color management:")) {
String[] errors = { " not found", " is not compatible ", " Error could not find role", "using fallback mode" };
for (var error : errors) {
if (line.contains(error)) {
//30-11 01:16:57 (debug) Blender 4.0.0 (hash 878f71061b8e built 2023-11-14 01:20:37)
//30-11 01:16:57 (debug) Color management: display "sRGB" used by scene not found, setting to default ("Blender").
//30-11 01:16:57 (debug) Color management: scene view "AgX" not found, setting default "Standard".
@@ -817,6 +821,15 @@ import java.util.regex.Pattern;
//30-11 01:16:57 (debug) Color management: image colorspace "Linear Rec.709" not found, will use default instead.
return Type.COLOR_MANAGEMENT_ERROR;
}
}
}
else if (line.contains("OpenColorIO Error:")) {
//28-11 12:43:40 (debug) Fra:340 Mem:11.74M (Peak 28.28M) | Time:00:01.69 | Compositing | Tile 1-1
//28-11 12:43:40 (debug) Fra:340 Mem:11.68M (Peak 28.28M) | Time:00:01.69 | Compositing | De-initializing execution
//28-11 12:43:40 (debug) OpenColorIO Error: The specified file reference 'srgb_inv.spi1d' could not be located. The following attempts were made: 'E:\SheepIt\sheepit\6b752e00cd23e1789e00285310cb6845\3.6\datafiles\colormanagement\luts\srgb_inv.spi1d' : 'E:\SheepIt\sheepit\6b752e00cd23e1789e00285310cb6845\3.6\datafiles\colormanagement\filmic\srgb_inv.spi1d'.
//28-11 12:43:40 (debug) Saved: 'E:\SheepIt\sheepit\1_0340.png'
return Type.COLOR_MANAGEMENT_ERROR;
}
else if (line.contains("CUDA error: Out of memory")) {
// Fra:151 Mem:405.91M (0.00M, Peak 633.81M) | Mem:470.26M, Peak:470.26M | Scene, RenderLayer | Updating Device | Writing constant memory
// Fra:151 Mem:405.91M (0.00M, Peak 633.81M) | Mem:470.26M, Peak:470.26M | Scene, RenderLayer | Path Tracing Tile 0/135, Sample 0/200