Merge pull request #42 from qupath/ensure-cpu-listed

ensure cpu is always an available device
qupath · Nov 4, 2023 · 281c08b · 281c08b
2 parents 693a576 + dccf38e
commit 281c08b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## v0.2.1
+
+* Fix CPU/GPU support (https://github.com/qupath/qupath-extension-wsinfer/issues/41)
+
 ## v0.2.0
 
 * [Preprint on arXiv](https://arxiv.org/abs/2309.04631)

diff --git a/build.gradle b/build.gradle
@@ -9,7 +9,7 @@ plugins {
 
 ext.moduleName = 'io.github.qupath.extension.wsinfer'
 
-version = "0.2.0"
+version = "0.2.1"
 description = 'An extension to run WSInfer in QuPath'
 
 // The default 'gradle.ext.qupathVersion' reads this from settings.gradle.

diff --git a/src/main/java/qupath/ext/wsinfer/ui/PytorchManager.java b/src/main/java/qupath/ext/wsinfer/ui/PytorchManager.java
@@ -42,6 +42,7 @@ static Collection<String> getAvailableDevices() {
         boolean includesMPS = false; // Don't add MPS twice
         var engine = getEngineOffline();
         if (engine != null) {
+            // This is expected to return GPUs if available, or CPU otherwise
             for (var device : engine.getDevices()) {
                 String name = device.getDeviceType();
                 availableDevices.add(name);
@@ -50,7 +51,7 @@ static Collection<String> getAvailableDevices() {
             }
         }
         // CPU should always be available
-        if (availableDevices.isEmpty())
+        if (!availableDevices.contains("cpu"))
             availableDevices.add("cpu");
 
         // If we could use MPS, but don't have it already, add it