diff options
author | Lester Solbakken <lesters@oath.com> | 2022-01-10 14:34:04 +0100 |
---|---|---|
committer | gjoranv <gv@verizonmedia.com> | 2022-06-08 11:45:28 +0200 |
commit | 19f9c783c2f1ca136a6ed874656e0a2c93b4adca (patch) | |
tree | fe0a0ccaff7e0ba5293d9950b1725d7e03c5237d /config-model/src/main/java/com/yahoo/schema | |
parent | 45a16605fe7caa2ebcbc1068fa2b48cbfa3b28c1 (diff) |
onnxModel to onnx in summary/matchfeatures
Diffstat (limited to 'config-model/src/main/java/com/yahoo/schema')
3 files changed, 11 insertions, 12 deletions
diff --git a/config-model/src/main/java/com/yahoo/schema/MapEvaluationTypeContext.java b/config-model/src/main/java/com/yahoo/schema/MapEvaluationTypeContext.java index c6c807f2dbb..cbf120e1ee0 100644 --- a/config-model/src/main/java/com/yahoo/schema/MapEvaluationTypeContext.java +++ b/config-model/src/main/java/com/yahoo/schema/MapEvaluationTypeContext.java @@ -267,7 +267,7 @@ public class MapEvaluationTypeContext extends FunctionReferenceContext implement String modelConfigName = OnnxModelTransformer.getModelConfigName(reference); String modelOutput = OnnxModelTransformer.getModelOutput(reference, null); - reference = new Reference("onnxModel", new Arguments(new ReferenceNode(modelConfigName)), modelOutput); + reference = new Reference("onnx", new Arguments(new ReferenceNode(modelConfigName)), modelOutput); if ( ! featureTypes.containsKey(reference)) { throw new IllegalArgumentException("Missing onnx-model config for '" + configOrFileName + "'"); } diff --git a/config-model/src/main/java/com/yahoo/schema/RankProfile.java b/config-model/src/main/java/com/yahoo/schema/RankProfile.java index 5479ecf323f..56786c733ec 100644 --- a/config-model/src/main/java/com/yahoo/schema/RankProfile.java +++ b/config-model/src/main/java/com/yahoo/schema/RankProfile.java @@ -1089,11 +1089,11 @@ public class RankProfile implements Cloneable { Map<String, TensorType> inputTypes = resolveOnnxInputTypes(model, context); TensorType defaultOutputType = model.getTensorType(model.getDefaultOutput(), inputTypes); - context.setType(new Reference("onnxModel", args, null), defaultOutputType); + context.setType(new Reference("onnx", args, null), defaultOutputType); for (Map.Entry<String, String> mapping : model.getOutputMap().entrySet()) { TensorType type = model.getTensorType(mapping.getKey(), inputTypes); - context.setType(new Reference("onnxModel", args, mapping.getValue()), type); + context.setType(new Reference("onnx", args, mapping.getValue()), type); } } return context; diff --git a/config-model/src/main/java/com/yahoo/schema/expressiontransforms/OnnxModelTransformer.java b/config-model/src/main/java/com/yahoo/schema/expressiontransforms/OnnxModelTransformer.java index 4c38c257602..8797deefcb6 100644 --- a/config-model/src/main/java/com/yahoo/schema/expressiontransforms/OnnxModelTransformer.java +++ b/config-model/src/main/java/com/yahoo/schema/expressiontransforms/OnnxModelTransformer.java @@ -20,17 +20,16 @@ import java.util.List; /** * Transforms ONNX model features of the forms: * - * onnxModel(config_name) - * onnxModel(config_name).output - * onnxModel("path/to/model") - * onnxModel("path/to/model").output - * onnxModel("path/to/model", "path/to/output") - * onnxModel("path/to/model", "unused", "path/to/output") // signature is unused - * onnx(...) // same as with onnxModel, onnx is an alias of onnxModel + * onnx(config_name) + * onnx(config_name).output + * onnx("path/to/model") + * onnx("path/to/model").output + * onnx("path/to/model", "path/to/output") + * onnx("path/to/model", "unused", "path/to/output") // signature is unused * * To the format expected by the backend: * - * onnxModel(config_name).output + * onnx(config_name).output * * @author lesters */ @@ -84,7 +83,7 @@ public class OnnxModelTransformer extends ExpressionTransformer<RankProfileTrans throw new IllegalArgumentException(featureName + " argument '" + output + "' output not found in model '" + onnxModel.getFileName() + "'"); } - return new ReferenceNode("onnxModel", List.of(new ReferenceNode(modelConfigName)), output); + return new ReferenceNode("onnx", List.of(new ReferenceNode(modelConfigName)), output); } public static String getModelConfigName(Reference reference) { |