Skip to content

Commit

Permalink
update to new JDLL version
Browse files Browse the repository at this point in the history
  • Loading branch information
carlosuc3m committed Jun 13, 2024
1 parent 1d91975 commit 9c9802b
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 3 deletions.
7 changes: 6 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand All @@ -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());
Expand Down

0 comments on commit 9c9802b

Please sign in to comment.