From 9c9802b241343d9bd32381a29e343af89d6f5747 Mon Sep 17 00:00:00 2001
From: carlosuc3m <100329787@alumnos.uc3m.es>
Date: Thu, 13 Jun 2024 18:57:10 +0200
Subject: [PATCH] update to new JDLL version

---
 pom.xml                                                    | 7 ++++++-
 .../pytorch/javacpp/PytorchJavaCPPInterface.java           | 4 ++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index eaae030..21b1f96 100644
--- a/pom.xml
+++ b/pom.xml
@@ -126,7 +126,7 @@
 		<releaseProfiles>sign,deploy-to-scijava</releaseProfiles>
 
 		<pytorch-javacpp.version>2.0.1-1.5.9</pytorch-javacpp.version>
-		<dl-modelrunner.version>0.5.6</dl-modelrunner.version>
+		<dl-modelrunner.version>0.5.8</dl-modelrunner.version>
 		<cuda-javacpp.version>11.8-8.6-1.5.8</cuda-javacpp.version>
 		<mkl-javacpp.version>2023.1-1.5.9</mkl-javacpp.version>
 	</properties>
@@ -150,6 +150,11 @@
             <artifactId>pytorch-platform</artifactId>
             <version>${pytorch-javacpp.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.bytedeco</groupId>
+            <artifactId>pytorch</artifactId>
+            <version>${pytorch-javacpp.version}</version>
+        </dependency>
         <!-- Additional dependencies to use bundled full version of MKL -->
         <dependency>
             <groupId>org.bytedeco</groupId>
diff --git a/src/main/java/io/bioimage/modelrunner/pytorch/javacpp/PytorchJavaCPPInterface.java b/src/main/java/io/bioimage/modelrunner/pytorch/javacpp/PytorchJavaCPPInterface.java
index 032e434..fa046b4 100644
--- a/src/main/java/io/bioimage/modelrunner/pytorch/javacpp/PytorchJavaCPPInterface.java
+++ b/src/main/java/io/bioimage/modelrunner/pytorch/javacpp/PytorchJavaCPPInterface.java
@@ -410,7 +410,7 @@ private List<String> encodeInputs(List<Tensor<?>> inputTensors) throws FileAlrea
 			HashMap<String, Object> map = new HashMap<String, Object>();
 			map.put(NAME_KEY, tt.getName());
 			map.put(SHAPE_KEY, tt.getShape());
-			map.put(DTYPE_KEY, CommonUtils.getDataType(tt.getData()));
+			map.put(DTYPE_KEY, CommonUtils.getDataTypeFromRAI(tt.getData()));
 			map.put(IS_INPUT_KEY, true);
 			map.put(MEM_NAME_KEY, shma.getName());
 			encodedInputTensors.add(gson.toJson(map));
@@ -428,7 +428,7 @@ private List<String> encodeOutputs(List<Tensor<?>> outputTensors) throws FileAlr
 			map.put(IS_INPUT_KEY, false);
 			if (!tt.isEmpty()) {
 				map.put(SHAPE_KEY, tt.getShape());
-				map.put(DTYPE_KEY, CommonUtils.getDataType(tt.getData()));
+				map.put(DTYPE_KEY, CommonUtils.getDataTypeFromRAI(tt.getData()));
 				SharedMemoryArray shma = SharedMemoryArray.createSHMAFromRAI(tt.getData(), false, true);
 				shmaOutputList.add(shma);
 				map.put(MEM_NAME_KEY, shma.getName());