diff options
author | Harald Musum <musum@verizonmedia.com> | 2022-11-04 09:49:51 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-11-04 09:49:51 +0100 |
commit | 3c30ddf019dac90aef337262fe427b85080c5062 (patch) | |
tree | 7ca5f6c9c5758d264194c4e7cd4fb1d2a2906a0b /model-integration/src/main/java/ai | |
parent | 496699607666839c75877ce5686daceb9e1af4e2 (diff) |
Revert "Since large constants are always tensors avoid creating a string just…"
Diffstat (limited to 'model-integration/src/main/java/ai')
2 files changed, 4 insertions, 6 deletions
diff --git a/model-integration/src/main/java/ai/vespa/rankingexpression/importer/ImportedModel.java b/model-integration/src/main/java/ai/vespa/rankingexpression/importer/ImportedModel.java index edccc5544af..4e7710aa449 100644 --- a/model-integration/src/main/java/ai/vespa/rankingexpression/importer/ImportedModel.java +++ b/model-integration/src/main/java/ai/vespa/rankingexpression/importer/ImportedModel.java @@ -85,7 +85,7 @@ public class ImportedModel implements ImportedMlModel { * These should have sizes up to a few kb at most, and correspond to constant values given in the source model. */ @Override - public Map<String, Tensor> smallConstants() { return Map.copyOf(smallConstants); } + public Map<String, String> smallConstants() { return asStrings(smallConstants); } boolean hasSmallConstant(String name) { return smallConstants.containsKey(name); } @@ -95,7 +95,7 @@ public class ImportedModel implements ImportedMlModel { * For TensorFlow this corresponds to Variable files stored separately. */ @Override - public Map<String, Tensor> largeConstants() { return Map.copyOf(largeConstants); } + public Map<String, String> largeConstants() { return asStrings(largeConstants); } boolean hasLargeConstant(String name) { return largeConstants.containsKey(name); } diff --git a/model-integration/src/main/java/ai/vespa/rankingexpression/importer/configmodelview/ImportedMlModel.java b/model-integration/src/main/java/ai/vespa/rankingexpression/importer/configmodelview/ImportedMlModel.java index 84e227e29ad..a2626818f87 100644 --- a/model-integration/src/main/java/ai/vespa/rankingexpression/importer/configmodelview/ImportedMlModel.java +++ b/model-integration/src/main/java/ai/vespa/rankingexpression/importer/configmodelview/ImportedMlModel.java @@ -1,8 +1,6 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package ai.vespa.rankingexpression.importer.configmodelview; -import com.yahoo.tensor.Tensor; - import java.util.List; import java.util.Map; import java.util.Optional; @@ -23,8 +21,8 @@ public interface ImportedMlModel { ModelType modelType(); Optional<String> inputTypeSpec(String input); - Map<String, Tensor> smallConstants(); - Map<String, Tensor> largeConstants(); + Map<String, String> smallConstants(); + Map<String, String> largeConstants(); Map<String, String> functions(); List<ImportedMlFunction> outputExpressions(); |