diff --git a/src/main/java/io/bioimage/modelrunner/tensorflow/v2/api050/Tensorflow2Interface.java b/src/main/java/io/bioimage/modelrunner/tensorflow/v2/api050/Tensorflow2Interface.java index a168694..c1499a7 100644 --- a/src/main/java/io/bioimage/modelrunner/tensorflow/v2/api050/Tensorflow2Interface.java +++ b/src/main/java/io/bioimage/modelrunner/tensorflow/v2/api050/Tensorflow2Interface.java @@ -37,10 +37,9 @@ import io.bioimage.modelrunner.system.PlatformDetection; import io.bioimage.modelrunner.tensor.Tensor; import io.bioimage.modelrunner.tensor.shm.SharedMemoryArray; +import io.bioimage.modelrunner.tensorflow.v2.api050.shm.ShmBuilder; import io.bioimage.modelrunner.tensorflow.v2.api050.tensor.ImgLib2Builder; import io.bioimage.modelrunner.tensorflow.v2.api050.tensor.TensorBuilder; -import io.bioimage.modelrunner.tensorflow.v2.api050.tensor.mappedbuffer.ImgLib2ToMappedBuffer; -import io.bioimage.modelrunner.tensorflow.v2.api050.tensor.mappedbuffer.MappedBufferToImgLib2; import io.bioimage.modelrunner.utils.CommonUtils; import io.bioimage.modelrunner.utils.Constants; import io.bioimage.modelrunner.utils.ZipUtils; @@ -50,24 +49,14 @@ import net.imglib2.util.Cast; import net.imglib2.util.Util; -import java.io.BufferedReader; import java.io.File; import java.io.IOException; -import java.io.InputStreamReader; -import java.io.RandomAccessFile; import java.io.UnsupportedEncodingException; import java.net.URISyntaxException; import java.net.URL; import java.net.URLDecoder; -import java.nio.ByteBuffer; -import java.nio.MappedByteBuffer; -import java.nio.channels.FileChannel; import java.nio.charset.StandardCharsets; -import java.nio.file.Files; -import java.nio.file.Paths; import java.security.ProtectionDomain; -import java.time.LocalDateTime; -import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.HashMap; import java.util.LinkedHashMap; @@ -312,7 +301,7 @@ protected void runFromShmas(List inputs, List outputs) throws IO for (String ee : inputs) { Map decoded = Types.decode(ee); SharedMemoryArray shma = SharedMemoryArray.read((String) decoded.get(MEM_NAME_KEY)); - TType inT = io.bioimage.modelrunner.tensorflow.v2.api030.shm.TensorBuilder.build(shma); + TType inT = io.bioimage.modelrunner.tensorflow.v2.api050.shm.TensorBuilder.build(shma); if (PlatformDetection.isWindows()) shma.close(); inTensors.add(inT); String inputName = getModelInputName((String) decoded.get(NAME_KEY), c ++); diff --git a/src/main/java/io/bioimage/modelrunner/tensorflow/v2/api050/shm/ShmBuilder.java b/src/main/java/io/bioimage/modelrunner/tensorflow/v2/api050/shm/ShmBuilder.java index bdf69b0..72ae3e2 100644 --- a/src/main/java/io/bioimage/modelrunner/tensorflow/v2/api050/shm/ShmBuilder.java +++ b/src/main/java/io/bioimage/modelrunner/tensorflow/v2/api050/shm/ShmBuilder.java @@ -18,7 +18,7 @@ * limitations under the License. * #L% */ -package io.bioimage.modelrunner.tensorflow.v2.api030.shm; +package io.bioimage.modelrunner.tensorflow.v2.api050.shm; import io.bioimage.modelrunner.system.PlatformDetection; import io.bioimage.modelrunner.tensor.shm.SharedMemoryArray; diff --git a/src/main/java/io/bioimage/modelrunner/tensorflow/v2/api050/shm/TensorBuilder.java b/src/main/java/io/bioimage/modelrunner/tensorflow/v2/api050/shm/TensorBuilder.java index a7e2cd4..0fa68ad 100644 --- a/src/main/java/io/bioimage/modelrunner/tensorflow/v2/api050/shm/TensorBuilder.java +++ b/src/main/java/io/bioimage/modelrunner/tensorflow/v2/api050/shm/TensorBuilder.java @@ -19,7 +19,7 @@ * #L% */ -package io.bioimage.modelrunner.tensorflow.v2.api030.shm; +package io.bioimage.modelrunner.tensorflow.v2.api050.shm; import io.bioimage.modelrunner.tensor.shm.SharedMemoryArray; import io.bioimage.modelrunner.utils.CommonUtils;