update to new JDLL version

bioimage-io · Dec 13, 2023 · 2700c24 · 2700c24
1 parent c23c737
commit 2700c24
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/pom.xml b/pom.xml
@@ -125,7 +125,7 @@
 		<!-- NB: Deploy releases to the SciJava Maven repository. -->
 		<releaseProfiles>sign,deploy-to-scijava</releaseProfiles>
 
-		<dl-modelrunner.version>0.4.1</dl-modelrunner.version>
+		<dl-modelrunner.version>0.5.0</dl-modelrunner.version>
 		<tensorflow-core.version>0.2.0</tensorflow-core.version>
 	</properties>
 

diff --git a/src/main/java/io/bioimage/modelrunner/tensorflow/v2/api020/Tensorflow2Interface.java b/src/main/java/io/bioimage/modelrunner/tensorflow/v2/api020/Tensorflow2Interface.java
@@ -270,9 +270,9 @@ private void unzipTfWeights(ModelDescriptor descriptor) throws LoadModelExceptio
 		if (new File(modelFolder, "tf_weights.zip").isFile()) {
 			System.out.println("Unzipping model...");
 			ZipUtils.unzipFolder(modelFolder + File.separator + "tf_weights.zip", modelFolder);
-		} else if ( descriptor.getWeights().getSupportedDLFrameworks()
+		} else if ( descriptor.getWeights().getAllSuportedWeightNames()
 				.contains(EngineInfo.getBioimageioTfKey()) ) {
-			String source = descriptor.getWeights().getSupportedWeights().stream()
+			String source = descriptor.getWeights().gettAllSupportedWeightObjects().stream()
 					.filter(ww -> ww.getFramework().equals(EngineInfo.getBioimageioTfKey()))
 					.findFirst().get().getSource();
 			source = DownloadModel.getFileNameFromURLString(source);

diff --git a/src/main/java/io/bioimage/modelrunner/tensorflow/v2/api020/tensor/TensorBuilder.java b/src/main/java/io/bioimage/modelrunner/tensorflow/v2/api020/tensor/TensorBuilder.java
@@ -22,9 +22,9 @@
 package io.bioimage.modelrunner.tensorflow.v2.api020.tensor;
 
 import io.bioimage.modelrunner.tensor.Utils;
+import io.bioimage.modelrunner.utils.CommonUtils;
 import net.imglib2.Cursor;
 import net.imglib2.RandomAccessibleInterval;
-import net.imglib2.blocks.PrimitiveBlocks;
 import net.imglib2.img.Img;
 import net.imglib2.type.Type;
 import net.imglib2.type.numeric.integer.IntType;
@@ -35,7 +35,6 @@
 import net.imglib2.util.Util;
 import net.imglib2.view.Views;
 
-import java.nio.ByteBuffer;
 import java.util.Arrays;
 
 import org.tensorflow.Tensor;
@@ -51,7 +50,6 @@
 import org.tensorflow.types.TInt32;
 import org.tensorflow.types.TInt64;
 import org.tensorflow.types.TUint8;
-import org.tensorflow.types.UInt8;
 import org.tensorflow.types.family.TType;
 
 /**