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

Merge branch 'Cleanup_CUDA' into 'master'

Browse Source 
Cleanup: Replace CUDA_0 with OPTIX_0

See merge request sheepitrenderfarm/client!189
This commit is contained in:
Sheepit Renderfarm
2023-01-11 14:17:00 +00:00
parent a423ba43ba a745f86ddc
commit d88b1e829b
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
protocol.txt
View File

@@ -104,7 +104,7 @@ Parameter as GET or POST:
* cpu_cores: Number of cores currently available for rendering (optional).
* ram_max: Maximum memory allowed for renderer (in kilobytes).
* rendertime_max: Maximum allowed render time in seconds, 0 means no time limit
* gpu_type: GPU's type, usually CUDA or OPENCL
* gpu_type: GPU's type, usually OPTIX or HIP
* gpu_model: Model name of the GPU available for rendering
* gpu_ram: GPU memory size (in bytes)

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

@@ -190,7 +190,7 @@ public class Error {
case RENDERER_OUT_OF_MEMORY:
return "Project tried to use too much memory. Will try another project in a few minutes.";
case GPU_NOT_SUPPORTED:
return "Project's Blender version requires a newer GPU, or your CUDA setup is broken. Will try another project in a few minutes.";
return "Project's Blender version requires a newer GPU, or your GPU setup is broken. Will try another project in a few minutes.";
case RENDERER_MISSING_LIBRARIES:
return "Failed to launch renderer. Please check if you have all the necessary libraries installed and if you have enough free space in your working directory.";
case RENDERER_KILLED:

4
src/main/java/com/sheepit/client/standalone/Worker.java
View File

@@ -66,7 +66,7 @@ public class Worker {
@Option(name = SettingsLoader.ARG_SHARED_ZIP, usage = "Shared directory for downloaded binaries and scenes. Useful when running two or more clients in the same computer/network to download once and render many times. IMPORTANT: This option and value must be identical in ALL clients sharing the directory.", required = false) private String sharedDownloadsDir = null;
@Option(name = SettingsLoader.ARG_GPU, usage = "Name of the GPU used for the render, for example CUDA_0 for Nvidia or OPENCL_0 for AMD/Intel card", metaVar = "CUDA_0", required = false) private String gpu_device = null;
@Option(name = SettingsLoader.ARG_GPU, usage = "Name of the GPU used for the render, for example OPTIX_0 for Nvidia or HIP_0 for AMD cards.", metaVar = "OPTIX_0", required = false) private String gpu_device = null;
@Option(name = SettingsLoader.ARG_NO_GPU, usage = "Don't detect GPUs", required = false) private boolean no_gpu_detection = false;
@@ -78,7 +78,7 @@ public class Worker {
@Option(name = SettingsLoader.ARG_RENDERTIME, usage = "Maximum time allow for each frame (in minutes)", required = false) private int max_rendertime = -1;
@Option(name = SettingsLoader.ARG_VERBOSE, usage = "Display log", required = false) private boolean print_log = false;
@Option(name = SettingsLoader.ARG_VERBOSE, usage = "Display full log", required = false) private boolean print_log = false;
@Option(name = SettingsLoader.ARG_REQUEST_TIME, usage = "H1:M1-H2:M2,H3:M3-H4:M4 Use the 24h format. For example to request job between 2am-8.30am and 5pm-11pm you should do --request-time 2:00-8:30,17:00-23:00 Caution, it's the requesting job time to get a project, not the working time", metaVar = "2:00-8:30,17:00-23:00", required = false) private String request_time = null;