From 0c5aeb1b86dc93979661128ac51e18f3912bac6e Mon Sep 17 00:00:00 2001 From: carlosuc3m <100329787@alumnos.uc3m.es> Date: Thu, 16 Jan 2025 15:37:35 +0100 Subject: [PATCH] remove prints and correct small error --- .../modelrunner/model/StardistAbstract.java | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/src/main/java/io/bioimage/modelrunner/model/StardistAbstract.java b/src/main/java/io/bioimage/modelrunner/model/StardistAbstract.java index 3765e316..0a75d330 100644 --- a/src/main/java/io/bioimage/modelrunner/model/StardistAbstract.java +++ b/src/main/java/io/bioimage/modelrunner/model/StardistAbstract.java @@ -108,8 +108,6 @@ public abstract class StardistAbstract implements Closeable { private static final String RUN_MODEL_CODE = "" + "output = model.predict_instances(im, return_predict=False)" + System.lineSeparator() - //+ "print(output)" + System.lineSeparator() - + "print(type(output))" + System.lineSeparator() + "if type(output) == np.ndarray:" + System.lineSeparator() + " im[:] = output" + System.lineSeparator() + " im[:] = output" + System.lineSeparator() @@ -127,26 +125,20 @@ public abstract class StardistAbstract implements Closeable { + "shm_list = []" + System.lineSeparator() + "np_list = []" + System.lineSeparator() + "for kk, vv in output[1].items():" + System.lineSeparator() - + " print(kk)" + System.lineSeparator() + " if type(vv) != np.ndarray:" + System.lineSeparator() + " task.update('Output ' + kk + ' is not a np.ndarray. Only np.ndarrays supported.')" + System.lineSeparator() - + " print(type(vv))" + System.lineSeparator() + " continue" + System.lineSeparator() + " if output[1][kk].nbytes == 0:" + System.lineSeparator() + " task.outputs[kk] = None" + System.lineSeparator() + " else:" + System.lineSeparator() + " task.outputs[kk + '" + SHAPE_KEY + "'] = output[1][kk].shape" + System.lineSeparator() - + " print(type(output[1][kk].shape))" + System.lineSeparator() + " task.outputs[kk + '"+ DTYPE_KEY + "'] = str(output[1][kk].dtype)" + System.lineSeparator() - + " print(type(output[1][kk].dtype))" + System.lineSeparator() + " shm = shared_memory.SharedMemory(create=True, size=output[1][kk].nbytes)" + System.lineSeparator() + " task.outputs[kk + '"+ SHM_NAME_KEY + "'] = shm.name" + System.lineSeparator() - + " print(type(shm.name))" + System.lineSeparator() + " shm_list.append(shm)" + System.lineSeparator() + " aa = np.ndarray(output[1][kk].shape, dtype=output[1][kk].dtype, buffer=shm.buf)" + System.lineSeparator() + " aa[:] = output[1][kk]" + System.lineSeparator() + " np_list.append(aa)" + System.lineSeparator() - + "print('dd')" + System.lineSeparator() + "globals()['shm_list'] = shm_list" + System.lineSeparator() + "globals()['np_list'] = np_list" + System.lineSeparator() @@ -292,7 +284,7 @@ Map> reconstructOutputs(Task task, String sh if (task.outputs.get(KEYS_KEY) != null) { for (String kk : (List) task.outputs.get(KEYS_KEY)) { - outs.put("", reconstruct(task, kk)); + outs.put(kk, reconstruct(task, kk)); } } @@ -318,12 +310,10 @@ RandomAccessibleInterval reconstruct(Task task, String key) throws IOExceptio SharedMemoryArray shmCoords = SharedMemoryArray.readOrCreate(shm_name, coordsSh, Cast.unchecked(CommonUtils.getImgLib2DataType(coords_dtype)), false, false); - Map> outs = new HashMap>(); // TODO I do not understand why is complaining when the types align perfectly RandomAccessibleInterval coordsRAI = shmCoords.getSharedRAI(); RandomAccessibleInterval coordsCopy = Tensor.createCopyOfRaiInWantedDataType(Cast.unchecked(coordsRAI), - Util.getTypeFromInterval(Cast.unchecked(shmCoords))); - outs.put("coords", coordsCopy); + Util.getTypeFromInterval(Cast.unchecked(coordsRAI))); shmCoords.close();