Skip to content

Commit b8840d6

Browse files
committed
Fix null pointer bug with populateAccelerators trying to get null AppleUtil GPU env value
1 parent 27201eb commit b8840d6

File tree

1 file changed

+10
-5
lines changed

1 file changed

+10
-5
lines changed

frontend/server/src/main/java/org/pytorch/serve/device/SystemInfo.java

+10-5
Original file line numberDiff line numberDiff line change
@@ -71,11 +71,16 @@ private IAcceleratorUtility createAcceleratorUtility() {
7171
private void populateAccelerators() {
7272
if (this.acceleratorUtil != null) {
7373
String envVarName = this.acceleratorUtil.getGpuEnvVariableName();
74-
String requestedAcceleratorIds = System.getenv(envVarName);
75-
LinkedHashSet<Integer> availableAcceleratorIds =
76-
IAcceleratorUtility.parseVisibleDevicesEnv(requestedAcceleratorIds);
77-
this.accelerators =
78-
this.acceleratorUtil.getAvailableAccelerators(availableAcceleratorIds);
74+
if (envVarName != null) {
75+
String requestedAcceleratorIds = System.getenv(envVarName);
76+
LinkedHashSet<Integer> availableAcceleratorIds =
77+
IAcceleratorUtility.parseVisibleDevicesEnv(requestedAcceleratorIds);
78+
this.accelerators =
79+
this.acceleratorUtil.getAvailableAccelerators(availableAcceleratorIds);
80+
} else {
81+
// Handle the case where envVarName is null
82+
this.accelerators = this.acceleratorUtil.getAvailableAccelerators(new LinkedHashSet<>());
83+
}
7984
} else {
8085
this.accelerators = new ArrayList<>();
8186
}

0 commit comments

Comments
 (0)