From d23b61f5c87a694e70a2b2ef059e3cc93a8f749f Mon Sep 17 00:00:00 2001 From: carlosuc3m <100329787@alumnos.uc3m.es> Date: Tue, 12 Jul 2022 19:16:10 +0200 Subject: [PATCH] termiate upgrading tf1 interface to imglib2 --- src/main/java/tensorflow/v1/Tensorflow1Interface.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/tensorflow/v1/Tensorflow1Interface.java b/src/main/java/tensorflow/v1/Tensorflow1Interface.java index a0af331..bb68bb7 100644 --- a/src/main/java/tensorflow/v1/Tensorflow1Interface.java +++ b/src/main/java/tensorflow/v1/Tensorflow1Interface.java @@ -7,15 +7,16 @@ import org.bioimageanalysis.icy.deeplearning.exceptions.LoadModelException; import org.bioimageanalysis.icy.deeplearning.exceptions.RunModelException; import org.bioimageanalysis.icy.deeplearning.tensor.Tensor; import org.bioimageanalysis.icy.deeplearning.utils.DeepLearningInterface; -import org.bioimageanalysis.icy.tensorflow.v1.tensor.Nd4fBuilder; +import org.bioimageanalysis.icy.tensorflow.v1.tensor.ImgLib2Builder; import org.bioimageanalysis.icy.tensorflow.v1.tensor.TensorBuilder; -import org.nd4j.shade.protobuf.InvalidProtocolBufferException; import org.tensorflow.SavedModelBundle; import org.tensorflow.Session; import org.tensorflow.framework.MetaGraphDef; import org.tensorflow.framework.SignatureDef; import org.tensorflow.framework.TensorInfo; +import com.google.protobuf.InvalidProtocolBufferException; + /** * This plugin includes the libraries to convert back and forth TensorFlow 1 to Sequences and IcyBufferedImages. @@ -120,7 +121,7 @@ public class Tensorflow1Interface implements DeepLearningInterface if (outputNDArrays.size() != outputTensors.size()) throw new RunModelException(outputNDArrays.size(), outputTensors.size()); for (int i = 0; i < outputNDArrays.size(); i ++) { - outputTensors.get(i).setData(Nd4fBuilder.build(outputNDArrays.get(i))); + outputTensors.get(i).setData(ImgLib2Builder.build(outputNDArrays.get(i))); } return outputTensors; } -- GitLab