update the available engines

bioimage-io · Oct 3, 2024 · 7e14fb1 · 7e14fb1
1 parent ca3d60c
commit 7e14fb1
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 21 deletions.
diff --git a/src/main/java/io/bioimage/modelrunner/model/Model.java b/src/main/java/io/bioimage/modelrunner/model/Model.java
@@ -506,6 +506,8 @@ public void loadModel() throws LoadModelException
 	 */
 	public void close()
 	{
+		if (getEngineClassLoader() == null)
+			return;
 		DeepLearningEngineInterface engineInstance = getEngineClassLoader().getEngineInstance();
 		engineClassLoader.setEngineClassLoader();
 		engineInstance.closeModel();

diff --git a/src/main/resources/availableDLVersions.json b/src/main/resources/availableDLVersions.json
@@ -451,7 +451,7 @@
 				"https://repo1.maven.org/maven2/org/tensorflow/tensorflow-core-api/0.3.3/tensorflow-core-api-0.3.3-windows-x86_64.jar",
 				"https://repo1.maven.org/maven2/org/bytedeco/javacpp/1.5.8/javacpp-1.5.8.jar",
 				"https://repo1.maven.org/maven2/org/bytedeco/javacpp/1.5.4/javacpp-1.5.4-windows-x86_64.jar",
-				"https://maven.scijava.org/service/local/repositories/snapshots/content/io/bioimage/dl-modelrunner-tensorflow-2b/0.4.2-SNAPSHOT/dl-modelrunner-tensorflow-2b-0.4.2-20241003.114156-7.jar"
+				"https://maven.scijava.org/service/local/repositories/snapshots/content/io/bioimage/dl-modelrunner-tensorflow-2b/0.4.2-SNAPSHOT/dl-modelrunner-tensorflow-2b-0.4.2-20241003.155959-13.jar"
 			]
 		},
 		{
@@ -470,7 +470,7 @@
 				"https://repo1.maven.org/maven2/org/tensorflow/tensorflow-core-api/0.3.3/tensorflow-core-api-0.3.3-windows-x86_64-gpu.jar",
 				"https://repo1.maven.org/maven2/org/bytedeco/javacpp/1.5.8/javacpp-1.5.8.jar",
 				"https://repo1.maven.org/maven2/org/bytedeco/javacpp/1.5.4/javacpp-1.5.4-windows-x86_64.jar",
-				"https://maven.scijava.org/service/local/repositories/snapshots/content/io/bioimage/dl-modelrunner-tensorflow-2b/0.4.2-SNAPSHOT/dl-modelrunner-tensorflow-2b-0.4.2-20241003.114156-7.jar"
+				"https://maven.scijava.org/service/local/repositories/snapshots/content/io/bioimage/dl-modelrunner-tensorflow-2b/0.4.2-SNAPSHOT/dl-modelrunner-tensorflow-2b-0.4.2-20241003.155959-13.jar"
 			]
 		},
 		{
@@ -489,7 +489,7 @@
 				"https://repo1.maven.org/maven2/org/tensorflow/tensorflow-core-api/0.3.3/tensorflow-core-api-0.3.3-linux-x86_64.jar",
 				"https://repo1.maven.org/maven2/org/bytedeco/javacpp/1.5.8/javacpp-1.5.8.jar",
 				"https://repo1.maven.org/maven2/org/bytedeco/javacpp/1.5.4/javacpp-1.5.4-linux-x86_64.jar",
-				"https://maven.scijava.org/service/local/repositories/snapshots/content/io/bioimage/dl-modelrunner-tensorflow-2b/0.4.2-SNAPSHOT/dl-modelrunner-tensorflow-2b-0.4.2-20241003.114156-7.jar"
+				"https://maven.scijava.org/service/local/repositories/snapshots/content/io/bioimage/dl-modelrunner-tensorflow-2b/0.4.2-SNAPSHOT/dl-modelrunner-tensorflow-2b-0.4.2-20241003.155959-13.jar"
 			]
 		},
 		{
@@ -508,7 +508,7 @@
 				"https://repo1.maven.org/maven2/org/tensorflow/tensorflow-core-api/0.3.3/tensorflow-core-api-0.3.3-linux-x86_64-gpu.jar",
 				"https://repo1.maven.org/maven2/org/bytedeco/javacpp/1.5.8/javacpp-1.5.8.jar",
 				"https://repo1.maven.org/maven2/org/bytedeco/javacpp/1.5.4/javacpp-1.5.4-linux-x86_64.jar",
-				"https://maven.scijava.org/service/local/repositories/snapshots/content/io/bioimage/dl-modelrunner-tensorflow-2b/0.4.2-SNAPSHOT/dl-modelrunner-tensorflow-2b-0.4.2-20241003.114156-7.jar"
+				"https://maven.scijava.org/service/local/repositories/snapshots/content/io/bioimage/dl-modelrunner-tensorflow-2b/0.4.2-SNAPSHOT/dl-modelrunner-tensorflow-2b-0.4.2-20241003.155959-13.jar"
 			]
 		},
 		{
@@ -527,7 +527,7 @@
 				"https://repo1.maven.org/maven2/org/tensorflow/tensorflow-core-api/0.3.3/tensorflow-core-api-0.3.3-macosx-x86_64.jar",
 				"https://repo1.maven.org/maven2/org/bytedeco/javacpp/1.5.8/javacpp-1.5.8.jar",
 				"https://repo1.maven.org/maven2/org/bytedeco/javacpp/1.5.4/javacpp-1.5.4-macosx-x86_64.jar",
-				"https://maven.scijava.org/service/local/repositories/snapshots/content/io/bioimage/dl-modelrunner-tensorflow-2b/0.4.2-SNAPSHOT/dl-modelrunner-tensorflow-2b-0.4.2-20241003.114156-7.jar"
+				"https://maven.scijava.org/service/local/repositories/snapshots/content/io/bioimage/dl-modelrunner-tensorflow-2b/0.4.2-SNAPSHOT/dl-modelrunner-tensorflow-2b-0.4.2-20241003.155959-13.jar"
 			]
 		},
 		{
@@ -546,7 +546,7 @@
 				"https://repo1.maven.org/maven2/org/tensorflow/tensorflow-core-api/0.4.0/tensorflow-core-api-0.4.0-windows-x86_64.jar",
 				"https://repo1.maven.org/maven2/org/bytedeco/javacpp/1.5.8/javacpp-1.5.8.jar",
 				"https://repo1.maven.org/maven2/org/bytedeco/javacpp/1.5.6/javacpp-1.5.6-windows-x86_64.jar",
-				"https://maven.scijava.org/service/local/repositories/snapshots/content/io/bioimage/dl-modelrunner-tensorflow-2b/0.4.2-SNAPSHOT/dl-modelrunner-tensorflow-2b-0.4.2-20241003.114156-7.jar"
+				"https://maven.scijava.org/service/local/repositories/snapshots/content/io/bioimage/dl-modelrunner-tensorflow-2b/0.4.2-SNAPSHOT/dl-modelrunner-tensorflow-2b-0.4.2-20241003.155959-13.jar"
 			]
 		},
 		{
@@ -565,7 +565,7 @@
 				"https://repo1.maven.org/maven2/org/tensorflow/tensorflow-core-api/0.4.0/tensorflow-core-api-0.4.0-windows-x86_64-gpu.jar",
 				"https://repo1.maven.org/maven2/org/bytedeco/javacpp/1.5.8/javacpp-1.5.8.jar",
 				"https://repo1.maven.org/maven2/org/bytedeco/javacpp/1.5.6/javacpp-1.5.6-windows-x86_64.jar",
-				"https://maven.scijava.org/service/local/repositories/snapshots/content/io/bioimage/dl-modelrunner-tensorflow-2b/0.4.2-SNAPSHOT/dl-modelrunner-tensorflow-2b-0.4.2-20241003.114156-7.jar"
+				"https://maven.scijava.org/service/local/repositories/snapshots/content/io/bioimage/dl-modelrunner-tensorflow-2b/0.4.2-SNAPSHOT/dl-modelrunner-tensorflow-2b-0.4.2-20241003.155959-13.jar"
 			]
 		},
 		{
@@ -584,7 +584,7 @@
 				"https://repo1.maven.org/maven2/org/tensorflow/tensorflow-core-api/0.4.0/tensorflow-core-api-0.4.0-linux-x86_64.jar",
 				"https://repo1.maven.org/maven2/org/bytedeco/javacpp/1.5.8/javacpp-1.5.8.jar",
 				"https://repo1.maven.org/maven2/org/bytedeco/javacpp/1.5.6/javacpp-1.5.6-linux-x86_64.jar",
-				"https://maven.scijava.org/service/local/repositories/snapshots/content/io/bioimage/dl-modelrunner-tensorflow-2b/0.4.2-SNAPSHOT/dl-modelrunner-tensorflow-2b-0.4.2-20241003.114156-7.jar"
+				"https://maven.scijava.org/service/local/repositories/snapshots/content/io/bioimage/dl-modelrunner-tensorflow-2b/0.4.2-SNAPSHOT/dl-modelrunner-tensorflow-2b-0.4.2-20241003.155959-13.jar"
 			]
 		},
 		{
@@ -603,7 +603,7 @@
 				"https://repo1.maven.org/maven2/org/tensorflow/tensorflow-core-api/0.4.0/tensorflow-core-api-0.4.0-linux-x86_64-gpu.jar",
 				"https://repo1.maven.org/maven2/org/bytedeco/javacpp/1.5.8/javacpp-1.5.8.jar",
 				"https://repo1.maven.org/maven2/org/bytedeco/javacpp/1.5.6/javacpp-1.5.6-linux-x86_64.jar",
-				"https://maven.scijava.org/service/local/repositories/snapshots/content/io/bioimage/dl-modelrunner-tensorflow-2b/0.4.2-SNAPSHOT/dl-modelrunner-tensorflow-2b-0.4.2-20241003.114156-7.jar"
+				"https://maven.scijava.org/service/local/repositories/snapshots/content/io/bioimage/dl-modelrunner-tensorflow-2b/0.4.2-SNAPSHOT/dl-modelrunner-tensorflow-2b-0.4.2-20241003.155959-13.jar"
 			]
 		},
 		{
@@ -622,7 +622,7 @@
 				"https://repo1.maven.org/maven2/org/tensorflow/tensorflow-core-api/0.4.0/tensorflow-core-api-0.4.0-macosx-x86_64.jar",
 				"https://repo1.maven.org/maven2/org/bytedeco/javacpp/1.5.8/javacpp-1.5.8.jar",
 				"https://repo1.maven.org/maven2/org/bytedeco/javacpp/1.5.6/javacpp-1.5.6-macosx-x86_64.jar",
-				"https://maven.scijava.org/service/local/repositories/snapshots/content/io/bioimage/dl-modelrunner-tensorflow-2b/0.4.2-SNAPSHOT/dl-modelrunner-tensorflow-2b-0.4.2-20241003.114156-7.jar"
+				"https://maven.scijava.org/service/local/repositories/snapshots/content/io/bioimage/dl-modelrunner-tensorflow-2b/0.4.2-SNAPSHOT/dl-modelrunner-tensorflow-2b-0.4.2-20241003.155959-13.jar"
 			]
 		},
 		{
@@ -641,7 +641,7 @@
 				"https://repo1.maven.org/maven2/org/tensorflow/tensorflow-core-api/0.4.0/tensorflow-core-api-0.4.0.jar",
 				"https://repo1.maven.org/maven2/org/bytedeco/javacpp/1.5.8/javacpp-1.5.8.jar",
 				"https://repo1.maven.org/maven2/org/bytedeco/javacpp/1.5.8/javacpp-1.5.8-macosx-arm64.jar",
-				"https://maven.scijava.org/service/local/repositories/snapshots/content/io/bioimage/dl-modelrunner-tensorflow-2b/0.4.2-SNAPSHOT/dl-modelrunner-tensorflow-2b-0.4.2-20241003.114156-7.jar"
+				"https://maven.scijava.org/service/local/repositories/snapshots/content/io/bioimage/dl-modelrunner-tensorflow-2b/0.4.2-SNAPSHOT/dl-modelrunner-tensorflow-2b-0.4.2-20241003.155959-13.jar"
 			]
 		},
 		{
@@ -660,7 +660,7 @@
 				"https://repo1.maven.org/maven2/org/tensorflow/tensorflow-core-api/0.4.1/tensorflow-core-api-0.4.1-windows-x86_64.jar",
 				"https://repo1.maven.org/maven2/org/bytedeco/javacpp/1.5.8/javacpp-1.5.8.jar",
 				"https://repo1.maven.org/maven2/org/bytedeco/javacpp/1.5.6/javacpp-1.5.6-windows-x86_64.jar",
-				"https://maven.scijava.org/service/local/repositories/snapshots/content/io/bioimage/dl-modelrunner-tensorflow-2b/0.4.2-SNAPSHOT/dl-modelrunner-tensorflow-2b-0.4.2-20241003.114156-7.jar"
+				"https://maven.scijava.org/service/local/repositories/snapshots/content/io/bioimage/dl-modelrunner-tensorflow-2b/0.4.2-SNAPSHOT/dl-modelrunner-tensorflow-2b-0.4.2-20241003.155959-13.jar"
 			]
 		},
 		{
@@ -679,7 +679,7 @@
 				"https://repo1.maven.org/maven2/org/tensorflow/tensorflow-core-api/0.4.1/tensorflow-core-api-0.4.1-windows-x86_64-gpu.jar",
 				"https://repo1.maven.org/maven2/org/bytedeco/javacpp/1.5.8/javacpp-1.5.8.jar",
 				"https://repo1.maven.org/maven2/org/bytedeco/javacpp/1.5.6/javacpp-1.5.6-windows-x86_64.jar",
-				"https://maven.scijava.org/service/local/repositories/snapshots/content/io/bioimage/dl-modelrunner-tensorflow-2b/0.4.2-SNAPSHOT/dl-modelrunner-tensorflow-2b-0.4.2-20241003.114156-7.jar"
+				"https://maven.scijava.org/service/local/repositories/snapshots/content/io/bioimage/dl-modelrunner-tensorflow-2b/0.4.2-SNAPSHOT/dl-modelrunner-tensorflow-2b-0.4.2-20241003.155959-13.jar"
 			]
 		},
 		{
@@ -698,7 +698,7 @@
 				"https://repo1.maven.org/maven2/org/tensorflow/tensorflow-core-api/0.4.1/tensorflow-core-api-0.4.1-linux-x86_64.jar",
 				"https://repo1.maven.org/maven2/org/bytedeco/javacpp/1.5.8/javacpp-1.5.8.jar",
 				"https://repo1.maven.org/maven2/org/bytedeco/javacpp/1.5.6/javacpp-1.5.6-linux-x86_64.jar",
-				"https://maven.scijava.org/service/local/repositories/snapshots/content/io/bioimage/dl-modelrunner-tensorflow-2b/0.4.2-SNAPSHOT/dl-modelrunner-tensorflow-2b-0.4.2-20241003.114156-7.jar"
+				"https://maven.scijava.org/service/local/repositories/snapshots/content/io/bioimage/dl-modelrunner-tensorflow-2b/0.4.2-SNAPSHOT/dl-modelrunner-tensorflow-2b-0.4.2-20241003.155959-13.jar"
 			]
 		},
 		{
@@ -717,7 +717,7 @@
 				"https://repo1.maven.org/maven2/org/tensorflow/tensorflow-core-api/0.4.1/tensorflow-core-api-0.4.1-linux-x86_64-gpu.jar",
 				"https://repo1.maven.org/maven2/org/bytedeco/javacpp/1.5.8/javacpp-1.5.8.jar",
 				"https://repo1.maven.org/maven2/org/bytedeco/javacpp/1.5.6/javacpp-1.5.6-linux-x86_64.jar",
-				"https://maven.scijava.org/service/local/repositories/snapshots/content/io/bioimage/dl-modelrunner-tensorflow-2b/0.4.2-SNAPSHOT/dl-modelrunner-tensorflow-2b-0.4.2-20241003.114156-7.jar"
+				"https://maven.scijava.org/service/local/repositories/snapshots/content/io/bioimage/dl-modelrunner-tensorflow-2b/0.4.2-SNAPSHOT/dl-modelrunner-tensorflow-2b-0.4.2-20241003.155959-13.jar"
 			]
 		},
 		{
@@ -736,7 +736,7 @@
 				"https://repo1.maven.org/maven2/org/tensorflow/tensorflow-core-api/0.4.1/tensorflow-core-api-0.4.1-macosx-x86_64.jar",
 				"https://repo1.maven.org/maven2/org/bytedeco/javacpp/1.5.8/javacpp-1.5.8.jar",
 				"https://repo1.maven.org/maven2/org/bytedeco/javacpp/1.5.6/javacpp-1.5.6-macosx-x86_64.jar",
-				"https://maven.scijava.org/service/local/repositories/snapshots/content/io/bioimage/dl-modelrunner-tensorflow-2b/0.4.2-SNAPSHOT/dl-modelrunner-tensorflow-2b-0.4.2-20241003.114156-7.jar"
+				"https://maven.scijava.org/service/local/repositories/snapshots/content/io/bioimage/dl-modelrunner-tensorflow-2b/0.4.2-SNAPSHOT/dl-modelrunner-tensorflow-2b-0.4.2-20241003.155959-13.jar"
 			]
 		},
 		{
@@ -755,7 +755,7 @@
 				"https://repo1.maven.org/maven2/org/tensorflow/tensorflow-core-api/0.4.2/tensorflow-core-api-0.4.2-windows-x86_64.jar",
 				"https://repo1.maven.org/maven2/org/bytedeco/javacpp/1.5.8/javacpp-1.5.8.jar",
 				"https://repo1.maven.org/maven2/org/bytedeco/javacpp/1.5.6/javacpp-1.5.6-windows-x86_64.jar",
-				"https://maven.scijava.org/service/local/repositories/snapshots/content/io/bioimage/dl-modelrunner-tensorflow-2b/0.4.2-SNAPSHOT/dl-modelrunner-tensorflow-2b-0.4.2-20241003.114156-7.jar"
+				"https://maven.scijava.org/service/local/repositories/snapshots/content/io/bioimage/dl-modelrunner-tensorflow-2b/0.4.2-SNAPSHOT/dl-modelrunner-tensorflow-2b-0.4.2-20241003.155959-13.jar"
 			]
 		},
 		{
@@ -774,7 +774,7 @@
 				"https://repo1.maven.org/maven2/org/tensorflow/tensorflow-core-api/0.4.2/tensorflow-core-api-0.4.2-windows-x86_64-gpu.jar",
 				"https://repo1.maven.org/maven2/org/bytedeco/javacpp/1.5.8/javacpp-1.5.8.jar",
 				"https://repo1.maven.org/maven2/org/bytedeco/javacpp/1.5.6/javacpp-1.5.6-windows-x86_64.jar",
-				"https://maven.scijava.org/service/local/repositories/snapshots/content/io/bioimage/dl-modelrunner-tensorflow-2b/0.4.2-SNAPSHOT/dl-modelrunner-tensorflow-2b-0.4.2-20241003.114156-7.jar"
+				"https://maven.scijava.org/service/local/repositories/snapshots/content/io/bioimage/dl-modelrunner-tensorflow-2b/0.4.2-SNAPSHOT/dl-modelrunner-tensorflow-2b-0.4.2-20241003.155959-13.jar"
 			]
 		},
 		{
@@ -793,7 +793,7 @@
 				"https://repo1.maven.org/maven2/org/tensorflow/tensorflow-core-api/0.4.2/tensorflow-core-api-0.4.2-linux-x86_64.jar",
 				"https://repo1.maven.org/maven2/org/bytedeco/javacpp/1.5.8/javacpp-1.5.8.jar",
 				"https://repo1.maven.org/maven2/org/bytedeco/javacpp/1.5.6/javacpp-1.5.6-linux-x86_64.jar",
-				"https://maven.scijava.org/service/local/repositories/snapshots/content/io/bioimage/dl-modelrunner-tensorflow-2b/0.4.2-SNAPSHOT/dl-modelrunner-tensorflow-2b-0.4.2-20241003.114156-7.jar"
+				"https://maven.scijava.org/service/local/repositories/snapshots/content/io/bioimage/dl-modelrunner-tensorflow-2b/0.4.2-SNAPSHOT/dl-modelrunner-tensorflow-2b-0.4.2-20241003.155959-13.jar"
 			]
 		},
 		{
@@ -812,7 +812,7 @@
 				"https://repo1.maven.org/maven2/org/tensorflow/tensorflow-core-api/0.4.2/tensorflow-core-api-0.4.2-linux-x86_64-gpu.jar",
 				"https://repo1.maven.org/maven2/org/bytedeco/javacpp/1.5.8/javacpp-1.5.8.jar",
 				"https://repo1.maven.org/maven2/org/bytedeco/javacpp/1.5.6/javacpp-1.5.6-linux-x86_64.jar",
-				"https://maven.scijava.org/service/local/repositories/snapshots/content/io/bioimage/dl-modelrunner-tensorflow-2b/0.4.2-SNAPSHOT/dl-modelrunner-tensorflow-2b-0.4.2-20241003.114156-7.jar"
+				"https://maven.scijava.org/service/local/repositories/snapshots/content/io/bioimage/dl-modelrunner-tensorflow-2b/0.4.2-SNAPSHOT/dl-modelrunner-tensorflow-2b-0.4.2-20241003.155959-13.jar"
 			]
 		},
 		{
@@ -831,7 +831,7 @@
 				"https://repo1.maven.org/maven2/org/tensorflow/tensorflow-core-api/0.4.2/tensorflow-core-api-0.4.2-macosx-x86_64.jar",
 				"https://repo1.maven.org/maven2/org/bytedeco/javacpp/1.5.8/javacpp-1.5.8.jar",
 				"https://repo1.maven.org/maven2/org/bytedeco/javacpp/1.5.6/javacpp-1.5.6-macosx-x86_64.jar",
-				"https://maven.scijava.org/service/local/repositories/snapshots/content/io/bioimage/dl-modelrunner-tensorflow-2b/0.4.2-SNAPSHOT/dl-modelrunner-tensorflow-2b-0.4.2-20241003.114156-7.jar"
+				"https://maven.scijava.org/service/local/repositories/snapshots/content/io/bioimage/dl-modelrunner-tensorflow-2b/0.4.2-SNAPSHOT/dl-modelrunner-tensorflow-2b-0.4.2-20241003.155959-13.jar"
 			]
 		},
 		{