Skip to content

Commit 3ca0f15

Browse files
committed
adapt engine to persistent interprocessing
1 parent 99ae780 commit 3ca0f15

File tree

3 files changed

+4
-15
lines changed

3 files changed

+4
-15
lines changed

src/main/java/io/bioimage/modelrunner/tensorflow/v2/api050/Tensorflow2Interface.java

+2-13
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,9 @@
3737
import io.bioimage.modelrunner.system.PlatformDetection;
3838
import io.bioimage.modelrunner.tensor.Tensor;
3939
import io.bioimage.modelrunner.tensor.shm.SharedMemoryArray;
40+
import io.bioimage.modelrunner.tensorflow.v2.api050.shm.ShmBuilder;
4041
import io.bioimage.modelrunner.tensorflow.v2.api050.tensor.ImgLib2Builder;
4142
import io.bioimage.modelrunner.tensorflow.v2.api050.tensor.TensorBuilder;
42-
import io.bioimage.modelrunner.tensorflow.v2.api050.tensor.mappedbuffer.ImgLib2ToMappedBuffer;
43-
import io.bioimage.modelrunner.tensorflow.v2.api050.tensor.mappedbuffer.MappedBufferToImgLib2;
4443
import io.bioimage.modelrunner.utils.CommonUtils;
4544
import io.bioimage.modelrunner.utils.Constants;
4645
import io.bioimage.modelrunner.utils.ZipUtils;
@@ -50,24 +49,14 @@
5049
import net.imglib2.util.Cast;
5150
import net.imglib2.util.Util;
5251

53-
import java.io.BufferedReader;
5452
import java.io.File;
5553
import java.io.IOException;
56-
import java.io.InputStreamReader;
57-
import java.io.RandomAccessFile;
5854
import java.io.UnsupportedEncodingException;
5955
import java.net.URISyntaxException;
6056
import java.net.URL;
6157
import java.net.URLDecoder;
62-
import java.nio.ByteBuffer;
63-
import java.nio.MappedByteBuffer;
64-
import java.nio.channels.FileChannel;
6558
import java.nio.charset.StandardCharsets;
66-
import java.nio.file.Files;
67-
import java.nio.file.Paths;
6859
import java.security.ProtectionDomain;
69-
import java.time.LocalDateTime;
70-
import java.time.format.DateTimeFormatter;
7160
import java.util.ArrayList;
7261
import java.util.HashMap;
7362
import java.util.LinkedHashMap;
@@ -312,7 +301,7 @@ protected void runFromShmas(List<String> inputs, List<String> outputs) throws IO
312301
for (String ee : inputs) {
313302
Map<String, Object> decoded = Types.decode(ee);
314303
SharedMemoryArray shma = SharedMemoryArray.read((String) decoded.get(MEM_NAME_KEY));
315-
TType inT = io.bioimage.modelrunner.tensorflow.v2.api030.shm.TensorBuilder.build(shma);
304+
TType inT = io.bioimage.modelrunner.tensorflow.v2.api050.shm.TensorBuilder.build(shma);
316305
if (PlatformDetection.isWindows()) shma.close();
317306
inTensors.add(inT);
318307
String inputName = getModelInputName((String) decoded.get(NAME_KEY), c ++);

src/main/java/io/bioimage/modelrunner/tensorflow/v2/api050/shm/ShmBuilder.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
* limitations under the License.
1919
* #L%
2020
*/
21-
package io.bioimage.modelrunner.tensorflow.v2.api030.shm;
21+
package io.bioimage.modelrunner.tensorflow.v2.api050.shm;
2222

2323
import io.bioimage.modelrunner.system.PlatformDetection;
2424
import io.bioimage.modelrunner.tensor.shm.SharedMemoryArray;

src/main/java/io/bioimage/modelrunner/tensorflow/v2/api050/shm/TensorBuilder.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
* #L%
2020
*/
2121

22-
package io.bioimage.modelrunner.tensorflow.v2.api030.shm;
22+
package io.bioimage.modelrunner.tensorflow.v2.api050.shm;
2323

2424
import io.bioimage.modelrunner.tensor.shm.SharedMemoryArray;
2525
import io.bioimage.modelrunner.utils.CommonUtils;

0 commit comments

Comments
 (0)