From 2700c248276d12c867d081f6db5564e10d69b140 Mon Sep 17 00:00:00 2001 From: carlosuc3m <100329787@alumnos.uc3m.es> Date: Wed, 13 Dec 2023 01:42:20 +0100 Subject: [PATCH] update to new JDLL version --- pom.xml | 2 +- .../tensorflow/v2/api020/Tensorflow2Interface.java | 4 ++-- .../tensorflow/v2/api020/tensor/TensorBuilder.java | 4 +--- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index db39f4b..03f83c1 100644 --- a/pom.xml +++ b/pom.xml @@ -125,7 +125,7 @@ sign,deploy-to-scijava - 0.4.1 + 0.5.0 0.2.0 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 index 9fc2d8c..d950c3d 100644 --- 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 index 67192da..a34696d 100644 --- 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; /**