summaryrefslogtreecommitdiffstats
path: root/config-model-api/src/main/java/com/yahoo/config/model/api/OnnxMemoryStats.java
diff options
context:
space:
mode:
Diffstat (limited to 'config-model-api/src/main/java/com/yahoo/config/model/api/OnnxMemoryStats.java')
-rw-r--r--config-model-api/src/main/java/com/yahoo/config/model/api/OnnxMemoryStats.java7
1 files changed, 3 insertions, 4 deletions
diff --git a/config-model-api/src/main/java/com/yahoo/config/model/api/OnnxMemoryStats.java b/config-model-api/src/main/java/com/yahoo/config/model/api/OnnxMemoryStats.java
index c45d69f02cb..73838c399ca 100644
--- a/config-model-api/src/main/java/com/yahoo/config/model/api/OnnxMemoryStats.java
+++ b/config-model-api/src/main/java/com/yahoo/config/model/api/OnnxMemoryStats.java
@@ -2,8 +2,8 @@
package com.yahoo.config.model.api;
+import ai.vespa.json.Jackson;
import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
import com.yahoo.config.application.api.ApplicationFile;
import com.yahoo.config.application.api.ApplicationPackage;
import com.yahoo.path.Path;
@@ -19,7 +19,6 @@ import java.util.Optional;
public record OnnxMemoryStats(long vmSize, long vmRss, long mallocPeak, long mallocCurrent) {
private static final String VM_SIZE_FIELD = "vm_size", VM_RSS_FIELD = "vm_rss",
MALLOC_PEAK_FIELD = "malloc_peak", MALLOC_CURRENT_FIELD = "malloc_current";
- private static final ObjectMapper jsonParser = new ObjectMapper();
/** Parse output from `vespa-analyze-onnx-model --probe-types` */
public static OnnxMemoryStats fromJson(JsonNode json) {
@@ -31,7 +30,7 @@ public record OnnxMemoryStats(long vmSize, long vmRss, long mallocPeak, long mal
/** @see #fromJson(JsonNode) */
public static OnnxMemoryStats fromJson(ApplicationFile file) throws IOException {
- return fromJson(jsonParser.readTree(file.createReader()));
+ return fromJson(Jackson.mapper().readTree(file.createReader()));
}
public static Path memoryStatsFilePath(Path modelPath) {
@@ -42,7 +41,7 @@ public record OnnxMemoryStats(long vmSize, long vmRss, long mallocPeak, long mal
public long peakMemoryUsage() { return Long.max(vmSize, Long.max(vmRss, Long.max(mallocPeak, mallocCurrent))); }
public JsonNode toJson() {
- return jsonParser.createObjectNode().put(VM_SIZE_FIELD, vmSize).put(VM_RSS_FIELD, vmRss)
+ return Jackson.mapper().createObjectNode().put(VM_SIZE_FIELD, vmSize).put(VM_RSS_FIELD, vmRss)
.put(MALLOC_PEAK_FIELD, mallocPeak).put(MALLOC_CURRENT_FIELD, mallocCurrent);
}
}