diff options
author | Jon Bratseth <bratseth@verizonmedia.com> | 2019-11-08 15:23:49 +0100 |
---|---|---|
committer | Jon Bratseth <bratseth@verizonmedia.com> | 2019-11-08 15:23:49 +0100 |
commit | cdcafc6fc8b4417abab8c72bbce5c503533558ea (patch) | |
tree | ea4b1c1a64da79bf42270d1b59f10ae32013b4d8 /model-integration/src/main | |
parent | df287b9364b8088192146df70f5f4814ff6c94c1 (diff) |
Serialize scalar functions with context
Diffstat (limited to 'model-integration/src/main')
2 files changed, 2 insertions, 6 deletions
diff --git a/model-integration/src/main/java/ai/vespa/rankingexpression/importer/operations/Const.java b/model-integration/src/main/java/ai/vespa/rankingexpression/importer/operations/Const.java index fc895b07d53..01fd7ee55bd 100644 --- a/model-integration/src/main/java/ai/vespa/rankingexpression/importer/operations/Const.java +++ b/model-integration/src/main/java/ai/vespa/rankingexpression/importer/operations/Const.java @@ -9,9 +9,6 @@ import com.yahoo.searchlib.rankingexpression.rule.ConstantNode; import com.yahoo.searchlib.rankingexpression.rule.ExpressionNode; import com.yahoo.searchlib.rankingexpression.rule.ReferenceNode; import com.yahoo.searchlib.rankingexpression.rule.TensorFunctionNode; -import com.yahoo.tensor.TensorType; -import com.yahoo.tensor.evaluation.VariableTensor; -import com.yahoo.tensor.functions.Rename; import com.yahoo.tensor.functions.TensorFunction; import java.util.List; @@ -53,7 +50,7 @@ public class Const extends IntermediateOperation { } else { expressionNode = new ReferenceNode(Reference.simple("constant", vespaName())); } - return new TensorFunctionNode.TensorFunctionExpressionNode(expressionNode); + return new TensorFunctionNode.ExpressionTensorFunction(expressionNode); } /** Constant names are prefixed by "modelName_" to avoid name conflicts between models */ diff --git a/model-integration/src/main/java/ai/vespa/rankingexpression/importer/operations/IntermediateOperation.java b/model-integration/src/main/java/ai/vespa/rankingexpression/importer/operations/IntermediateOperation.java index 26b376cce1c..87a3f1a8e66 100644 --- a/model-integration/src/main/java/ai/vespa/rankingexpression/importer/operations/IntermediateOperation.java +++ b/model-integration/src/main/java/ai/vespa/rankingexpression/importer/operations/IntermediateOperation.java @@ -3,7 +3,6 @@ package ai.vespa.rankingexpression.importer.operations; import ai.vespa.rankingexpression.importer.DimensionRenamer; -import ai.vespa.rankingexpression.importer.IntermediateGraph; import ai.vespa.rankingexpression.importer.OrderedTensorType; import com.yahoo.searchlib.rankingexpression.Reference; import com.yahoo.searchlib.rankingexpression.evaluation.Value; @@ -74,7 +73,7 @@ public abstract class IntermediateOperation { if (function == null) { if (isConstant()) { ExpressionNode constant = new ReferenceNode(Reference.simple("constant", vespaName())); - function = new TensorFunctionNode.TensorFunctionExpressionNode(constant); + function = new TensorFunctionNode.ExpressionTensorFunction(constant); } else if (outputs.size() > 1) { rankingExpressionFunction = lazyGetFunction(); function = new VariableTensor(rankingExpressionFunctionName(), type.type()); |