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

removed HIP support

Browse Source
This commit is contained in:
harlekin
2023-01-28 14:44:04 +00:00
committed by Sheepit Renderfarm
parent 37f8ac1f73
commit 304085786c
8 changed files with 64 additions and 430 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/com/sheepit/client/standalone/ListGpuParameterHandler.java
View File

@@ -19,8 +19,9 @@
package com.sheepit.client.standalone;
import java.util.List;
import com.sheepit.client.Configuration;
import com.sheepit.client.hardware.gpu.GPU;
import com.sheepit.client.hardware.gpu.GPUDevice;
import org.kohsuke.args4j.CmdLineException;
import org.kohsuke.args4j.CmdLineParser;
import org.kohsuke.args4j.OptionDef;
@@ -28,9 +29,7 @@ import org.kohsuke.args4j.spi.OptionHandler;
import org.kohsuke.args4j.spi.Parameters;
import org.kohsuke.args4j.spi.Setter;
import com.sheepit.client.Configuration;
import com.sheepit.client.hardware.gpu.GPU;
import com.sheepit.client.hardware.gpu.GPUDevice;
import java.util.List;
public class ListGpuParameterHandler<T> extends OptionHandler<T> {
public ListGpuParameterHandler(CmdLineParser parser, OptionDef option, Setter<? super T> setter) {
@@ -49,6 +48,10 @@ public class ListGpuParameterHandler<T> extends OptionHandler<T> {
}
}
if (GPU.hasHIPDevices()) {
System.out.println("HIP devices are not supported");
}
System.exit(0);
return 0;
}

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

@@ -194,9 +194,12 @@ public class Worker {
config.setHeadless(headless);
if (gpu_device != null) {
if (gpu_device.startsWith(Nvidia.TYPE) == false && gpu_device.startsWith(HIP.TYPE) == false) {
System.err.println("ERROR: The entered GPU_ID is invalid. The GPU_ID should look like '" + Nvidia.TYPE + "_#' or '" + HIP.TYPE
+ "_#'. Please use the proper GPU_ID from the GPU list below\n");
//catch all the outdated configs
if (gpu_device.startsWith(HIP.TYPE)) {
System.err.println("ERROR: HIP devices are not supported");
}
else if (gpu_device.startsWith(Nvidia.TYPE) == false) {
System.err.println("ERROR: The entered GPU_ID is invalid. The GPU_ID should look like '" + Nvidia.TYPE + "_#. Please use the proper GPU_ID from the GPU list below\n");
showGPUList(parser);
}

24
src/main/java/com/sheepit/client/standalone/swing/activity/Settings.java
View File

@@ -271,7 +271,7 @@ public class Settings implements Activity {
gridbag.setConstraints(useCPU, compute_devices_constraints);
compute_devices_panel.add(useCPU);
if (gpus.size() > 0) {
if (gpus.size() > 0 || GPU.hasHIPDevices()) {
for (GPUDevice gpu : gpus) {
JCheckBoxGPU gpuCheckBox = new JCheckBoxGPU(gpu);
gpuCheckBox.setToolTipText(gpu.getId());
@@ -289,17 +289,15 @@ public class Settings implements Activity {
useGPUs.add(gpuCheckBox);
}
//When replacing gpus it can happen that the client can't find the one specified in the config anymore in which case config.getGPUDevice()
//returns null
if ((config.getComputeMethod() == ComputeType.GPU || config.getComputeMethod() == ComputeType.CPU_GPU) && config.getGPUDevice() != null) {
GPULister gpu;
if (GPU.hasHIPDevices()) {
JCheckBox gpuCheckBox = new JCheckBox("Unsupported HIP device(s)");
gpuCheckBox.setToolTipText("SheepIt does not support AMD GPUs due to a lack of use");
gpuCheckBox.setEnabled(false);
gpuCheckBox.setSelected(false);
compute_devices_constraints.gridy++;
if (config.getGPUDevice().getType().equals(Nvidia.TYPE)) {
gpu = new Nvidia();
}
else if (config.getGPUDevice().getType().equals(HIP.TYPE)) {
gpu = new HIP();
}
gridbag.setConstraints(gpuCheckBox, compute_devices_constraints);
compute_devices_panel.add(gpuCheckBox);
}
compute_devices_constraints.gridx = 1;
@@ -308,6 +306,7 @@ public class Settings implements Activity {
compute_devices_panel.add(new JLabel(" "), compute_devices_constraints); // Add a space between lines
}
CPU cpu = new CPU();
if (cpu.cores() > 1) { // if only one core is available, no need to show the choice
double step = 1;
@@ -634,9 +633,6 @@ public class Settings implements Activity {
if (useGPUs.get(counter).getGPUDevice().getType().equals(Nvidia.TYPE)) {
gpu = new Nvidia();
}
else if (useGPUs.get(counter).getGPUDevice().getType().equals(HIP.TYPE)) {
gpu = new HIP();
}
}
// Simulate a radio button behavior with check buttons while only 1 GPU