diff --git a/src/main/java/org/bioimageanalysis/icy/deeplearning/versionmanager/downloading/DeepLearningVersionDownloader.java b/src/main/java/org/bioimageanalysis/icy/deeplearning/versionmanager/downloading/DeepLearningVersionDownloader.java index 88f343700b50bc14c1bc6da45d168b5926cf977b..c6f5626d044cf4959816fd651e6eca2a1d9bf676 100644 --- a/src/main/java/org/bioimageanalysis/icy/deeplearning/versionmanager/downloading/DeepLearningVersionDownloader.java +++ b/src/main/java/org/bioimageanalysis/icy/deeplearning/versionmanager/downloading/DeepLearningVersionDownloader.java @@ -28,7 +28,7 @@ import com.google.common.util.concurrent.AtomicDouble; import icy.common.listener.ProgressListener; import io.bioimage.modelrunner.versionmanagement.DeepLearningVersion; -import io.bioimage.modelrunner.versionmanagement.InstalledDeepLearningVersions; +import io.bioimage.modelrunner.versionmanagement.InstalledEngines; /** * Downloader for Deep Learning engine versions. @@ -40,7 +40,7 @@ public class DeepLearningVersionDownloader /** * The path where Deep Learning libraries are downloaded. */ - private static Path downloadsPath = Paths.get(InstalledDeepLearningVersions.getInstalledVersionsDir()).toAbsolutePath(); + private static Path downloadsPath = Paths.get(InstalledEngines.getEnginesDir()).toAbsolutePath(); /** * Checks if the target Downloaded version is already downloaded locally. diff --git a/src/main/java/plugins/danyfel80/deeplearningdownloader/DeepLearningVersionSelector.java b/src/main/java/plugins/danyfel80/deeplearningdownloader/DeepLearningVersionSelector.java index 8562fc130f44ab807f4aebf76ba7c0fc277ecbb6..9bd5202b60198feb0da1c17da865b63bbda2761c 100644 --- a/src/main/java/plugins/danyfel80/deeplearningdownloader/DeepLearningVersionSelector.java +++ b/src/main/java/plugins/danyfel80/deeplearningdownloader/DeepLearningVersionSelector.java @@ -15,7 +15,7 @@ import icy.preferences.XMLPreferences; import icy.util.StringUtil; import io.bioimage.modelrunner.system.PlatformDetection; import io.bioimage.modelrunner.utils.Constants; -import io.bioimage.modelrunner.versionmanagement.AvailableDeepLearningVersions; +import io.bioimage.modelrunner.versionmanagement.AvailableEngines; import io.bioimage.modelrunner.versionmanagement.DeepLearningVersion; import plugins.adufour.blocks.lang.Block; import plugins.adufour.blocks.util.VarList; @@ -48,8 +48,8 @@ public class DeepLearningVersionSelector extends EzPlug implements EzStoppable, * @return map to let naive users select the wanted DL version */ private static Map<String, DeepLearningVersion> getDisplayMapWithoutPythonRepeated() { - List<DeepLearningVersion> allVersions = AvailableDeepLearningVersions.loadCompatibleOnly().getVersions(); - List<DeepLearningVersion> vList = AvailableDeepLearningVersions.removeRepeatedPythonVersions(allVersions); + List<DeepLearningVersion> allVersions = AvailableEngines.loadCompatibleOnly().getVersions(); + List<DeepLearningVersion> vList = AvailableEngines.removeRepeatedPythonVersions(allVersions); Map<String, DeepLearningVersion> map = vList.stream() .collect(Collectors.toMap( v -> v.getEngine() + "-" + v.getPythonVersion()