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

Merge branch 'detect_color_management' into 'master'

Browse Source 
Fix: Detect issues with the color management

See merge request sheepitrenderfarm/client!275
This commit is contained in:
harlekin
2023-12-01 12:32:09 +00:00
parent 49e4baaf93 830af1615c
commit 4e1ef85dd6
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -57,6 +57,7 @@ public class Error {
DENOISING_NOT_SUPPORTED(29), DENOISING_NOT_SUPPORTED(29),
CANNOT_READ_FILE(30), CANNOT_READ_FILE(30),
DETECT_DEVICE_ERROR(31), DETECT_DEVICE_ERROR(31),
COLOR_MANAGEMENT_ERROR(33),
// internal error handling // internal error handling
NO_SPACE_LEFT_ON_DEVICE(100), NO_SPACE_LEFT_ON_DEVICE(100),
@@ -231,6 +232,8 @@ public class Error {
return "Blender failed to detect the render device. Please check if you have all the necessary libraries installed and if your drivers are up to date."; return "Blender failed to detect the render device. Please check if you have all the necessary libraries installed and if your drivers are up to date.";
case GPU_OR_DRIVER_ERROR: case GPU_OR_DRIVER_ERROR:
return "There was an error with your GPU or driver. Please ensure you have the latest driver and don't run extreme over/underclockings."; return "There was an error with your GPU or driver. Please ensure you have the latest driver and don't run extreme over/underclockings.";
case COLOR_MANAGEMENT_ERROR:
return "There was an error with the Color management. Please ensure you didn't set a weird OCIO config. Or the project might use an unsupported Color management configuration.";
default: default:
return in.toString(); return in.toString();
} }

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

@@ -801,6 +801,17 @@ 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) // 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; return Type.OS_NOT_SUPPORTED;
} }
else if (line.contains("Color management:") && line.contains(" not found")) {
//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".
//30-11 01:16:57 (debug) Read blend: "C:\Users\tianji\AppData\Local\Temp\farm_3210908783605063546\254263927\Car Scene 3.blend"
//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".
//30-11 01:16:57 (debug) Color management: scene look "AgX - Medium High Contrast" not found, setting default "None".
//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("CUDA error: Out of memory")) { 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 | 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 // 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