refactor names as done in jdll

bioimage-io · Dec 13, 2023 · 05206e6 · 05206e6
1 parent ba2317b
commit 05206e6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/src/main/java/io/bioimage/modelrunner/tensorflow/v1/Tensorflow1Interface.java b/src/main/java/io/bioimage/modelrunner/tensorflow/v1/Tensorflow1Interface.java
@@ -278,9 +278,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/v1/tensor/TensorBuilder.java b/src/main/java/io/bioimage/modelrunner/tensorflow/v1/tensor/TensorBuilder.java
@@ -46,9 +46,6 @@
 import org.tensorflow.Tensor;
 import org.tensorflow.types.UInt8;
 
-import ai.djl.ndarray.NDArray;
-import ai.djl.ndarray.types.Shape;
-
 /**
  * A TensorFlow {@link Tensor} builder for {@link Img} and
  * {@link io.bioimage.modelrunner.tensor.Tensor} objects.