diff --git a/pom.xml b/pom.xml index b3c5032cecbc6e96b02e4565cada5dfb6079867c..01c6141556bed9227b1750b35aceb103f86fb00f 100644 --- a/pom.xml +++ b/pom.xml @@ -108,7 +108,7 @@ <properties> <package-name>org.bioimageanalysis.icy.deeplearning.tensorflow.v1</package-name> - <main-class>org.bioimageanalysis.icy.deeplearning.tensorflow.v1.TensorFlowInterface</main-class> + <main-class>org.bioimageanalysis.icy.deeplearning.tensorflow.v1.TensorFlow1Interface</main-class> <license.licenseName>BSD-3-Clause</license.licenseName> <license.copyrightOwners>Institut Pasteur</license.copyrightOwners> </properties> diff --git a/src/main/java/tensorflow/v1/Tensorflow1Interface.java b/src/main/java/org/bioimageanalysis/icy/deeplearning/tensorflow/v1/Tensorflow1Interface.java similarity index 95% rename from src/main/java/tensorflow/v1/Tensorflow1Interface.java rename to src/main/java/org/bioimageanalysis/icy/deeplearning/tensorflow/v1/Tensorflow1Interface.java index 47300d5508b38b062db49bcd28906944f3928933..1e4020383acc43df9a9ca875303c42d32e9ad3ba 100644 --- a/src/main/java/tensorflow/v1/Tensorflow1Interface.java +++ b/src/main/java/org/bioimageanalysis/icy/deeplearning/tensorflow/v1/Tensorflow1Interface.java @@ -1,4 +1,4 @@ -package tensorflow.v1; +package org.bioimageanalysis.icy.deeplearning.tensorflow.v1; import java.util.ArrayList; import java.util.List; @@ -6,9 +6,9 @@ import java.util.List; 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.tensorflow.v1.tensor.ImgLib2Builder; +import org.bioimageanalysis.icy.deeplearning.tensorflow.v1.tensor.TensorBuilder; import org.bioimageanalysis.icy.deeplearning.utils.DeepLearningInterface; -import org.bioimageanalysis.icy.tensorflow.v1.tensor.ImgLib2Builder; -import org.bioimageanalysis.icy.tensorflow.v1.tensor.TensorBuilder; import org.tensorflow.SavedModelBundle; import org.tensorflow.Session; import org.tensorflow.framework.MetaGraphDef; @@ -78,7 +78,7 @@ public class Tensorflow1Interface implements DeepLearningInterface } @Override - public List<Tensor<?>> run(List<Tensor<?>> inputTensors, List<Tensor<?>> outputTensors) throws RunModelException { + public void run(List<Tensor<?>> inputTensors, List<Tensor<?>> outputTensors) throws RunModelException { Session session = model.session(); Session.Runner runner = session.runner(); List<String> inputListNames = new ArrayList<String>(); @@ -103,7 +103,6 @@ public class Tensorflow1Interface implements DeepLearningInterface for (org.tensorflow.Tensor<?> tt : resultPatchTensors) { tt.close(); } - return outputTensors; } /** diff --git a/src/main/java/org/bioimageanalysis/icy/tensorflow/v1/tensor/ImgLib2Builder.java b/src/main/java/org/bioimageanalysis/icy/deeplearning/tensorflow/v1/tensor/ImgLib2Builder.java similarity index 98% rename from src/main/java/org/bioimageanalysis/icy/tensorflow/v1/tensor/ImgLib2Builder.java rename to src/main/java/org/bioimageanalysis/icy/deeplearning/tensorflow/v1/tensor/ImgLib2Builder.java index f67db4ef4ac09878f11bbc2da53e66f6a5be7986..e9d8084a79922593bfedb2e0b154d2af317c1d39 100644 --- a/src/main/java/org/bioimageanalysis/icy/tensorflow/v1/tensor/ImgLib2Builder.java +++ b/src/main/java/org/bioimageanalysis/icy/deeplearning/tensorflow/v1/tensor/ImgLib2Builder.java @@ -1,4 +1,4 @@ -package org.bioimageanalysis.icy.tensorflow.v1.tensor; +package org.bioimageanalysis.icy.deeplearning.tensorflow.v1.tensor; import java.nio.ByteBuffer; import java.nio.DoubleBuffer; diff --git a/src/main/java/org/bioimageanalysis/icy/tensorflow/v1/tensor/TensorBuilder.java b/src/main/java/org/bioimageanalysis/icy/deeplearning/tensorflow/v1/tensor/TensorBuilder.java similarity index 99% rename from src/main/java/org/bioimageanalysis/icy/tensorflow/v1/tensor/TensorBuilder.java rename to src/main/java/org/bioimageanalysis/icy/deeplearning/tensorflow/v1/tensor/TensorBuilder.java index 7f0816b4ddca57a68760508abdce98e9bfbbd0d5..4ec9024c99126246c2456ef6c995be6636ee128c 100644 --- a/src/main/java/org/bioimageanalysis/icy/tensorflow/v1/tensor/TensorBuilder.java +++ b/src/main/java/org/bioimageanalysis/icy/deeplearning/tensorflow/v1/tensor/TensorBuilder.java @@ -1,4 +1,4 @@ -package org.bioimageanalysis.icy.tensorflow.v1.tensor; +package org.bioimageanalysis.icy.deeplearning.tensorflow.v1.tensor; import java.nio.ByteBuffer; import java.nio.DoubleBuffer;