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

Add headless toggle, useful for multi gpu on the same machine

Browse Source
This commit is contained in:
harlekin
2021-07-16 23:37:24 +00:00
committed by Sheepit Renderfarm
parent 6ca2067cbe
commit f94bba6e4c
7 changed files with 219 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/sheepit/client/standalone/Worker.java
View File

@@ -110,6 +110,8 @@ public class Worker {
@Option(name = "-hostname", usage = "Set a custom hostname name (name change will be lost when client is closed)", required = false) private String hostname = null;
@Option(name = "--headless", usage = "Mark your client manually as headless to block Eevee projects", required = false) private boolean headless = java.awt.GraphicsEnvironment.isHeadless();
public static void main(String[] args) {
if (OS.getOS() == null) {
System.err.println(Error.humanString(Error.Type.OS_NOT_SUPPORTED));
@@ -182,6 +184,8 @@ public class Worker {
// for further checks.
config.setUseSysTray(!useSysTray);
config.setHeadless(headless);
if (gpu_device != null) {
if (gpu_device.startsWith(Nvidia.TYPE) == false && gpu_device.startsWith(OpenCL.TYPE) == false) {
System.err.println("ERROR: The entered GPU_ID is invalid. The GPU_ID should look like '" + Nvidia.TYPE + "_#' or '" + OpenCL.TYPE
@@ -427,7 +431,8 @@ public class Worker {
config.setConfigFilePath(config_file);
}
new SettingsLoader(config_file).merge(config);
SettingsLoader settingsLoader = new SettingsLoader(config_file);
settingsLoader.merge(config);
Log.getInstance(config).debug("client version " + config.getJarVersion());
// Hostname change will overwrite the existing one (default or read from configuration file) but changes will be lost when the client closes
@@ -470,6 +475,7 @@ public class Worker {
System.exit(3);
}
gui = new GuiSwing(config.isUseSysTray(), title);
((GuiSwing) gui).setSettingsLoader(settingsLoader);
break;
}
Client cli = new Client(gui, config, server);