From 219bdbf4ee5f947be325464c4623916c4c1665c1 Mon Sep 17 00:00:00 2001 From: Henning Baldersheim Date: Wed, 3 Nov 2021 23:20:44 +0100 Subject: Avoid intermediate NegativeNode in the leaf nodes, adding approximately 15-20% extra nodes. --- .../expressiontransforms/TokenTransformer.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'config-model/src/main/java/com/yahoo/searchdefinition') diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/expressiontransforms/TokenTransformer.java b/config-model/src/main/java/com/yahoo/searchdefinition/expressiontransforms/TokenTransformer.java index cd56de18527..dbb32d88ef6 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/expressiontransforms/TokenTransformer.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/expressiontransforms/TokenTransformer.java @@ -43,11 +43,11 @@ import static com.yahoo.searchlib.rankingexpression.rule.TensorFunctionNode.wrap */ public class TokenTransformer extends ExpressionTransformer { - static private final ConstantNode ZERO = new ConstantNode(new DoubleValue(0.0), "0"); - static private final ConstantNode ONE = new ConstantNode(new DoubleValue(1.0), "1"); - static private final ConstantNode TWO = new ConstantNode(new DoubleValue(2.0), "2"); - static private final ConstantNode CLS = new ConstantNode(new DoubleValue(101), "101"); - static private final ConstantNode SEP = new ConstantNode(new DoubleValue(102), "102"); + static private final ConstantNode ZERO = new ConstantNode(new DoubleValue(0.0)); + static private final ConstantNode ONE = new ConstantNode(new DoubleValue(1.0)); + static private final ConstantNode TWO = new ConstantNode(new DoubleValue(2.0)); + static private final ConstantNode CLS = new ConstantNode(new DoubleValue(101)); + static private final ConstantNode SEP = new ConstantNode(new DoubleValue(102)); @Override public ExpressionNode transform(ExpressionNode node, RankProfileTransformContext context) { -- cgit v1.2.3 From 599946ff2d1838914ffbab7d74fdbe6055187189 Mon Sep 17 00:00:00 2001 From: Henning Baldersheim Date: Wed, 3 Nov 2021 23:42:02 +0100 Subject: Avoid using deprecated methods --- .../searchdefinition/expressiontransforms/OnnxModelTransformer.java | 2 +- .../yahoo/searchdefinition/processing/OnnxModelConfigGenerator.java | 2 +- .../src/main/java/com/yahoo/vespa/model/ml/FeatureArguments.java | 2 +- .../src/main/java/ai/vespa/models/evaluation/LazyArrayContext.java | 4 ++-- .../searchlib/rankingexpression/evaluation/EvaluationTestCase.java | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) (limited to 'config-model/src/main/java/com/yahoo/searchdefinition') diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/expressiontransforms/OnnxModelTransformer.java b/config-model/src/main/java/com/yahoo/searchdefinition/expressiontransforms/OnnxModelTransformer.java index faf3c8085d8..6d9f4cdec92 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/expressiontransforms/OnnxModelTransformer.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/expressiontransforms/OnnxModelTransformer.java @@ -135,7 +135,7 @@ public class OnnxModelTransformer extends ExpressionTransformer 0) { if (feature.getArguments().expressions().get(0) instanceof ConstantNode) { ConstantNode node = (ConstantNode) feature.getArguments().expressions().get(0); - String path = OnnxModelTransformer.stripQuotes(node.sourceString()); + String path = OnnxModelTransformer.stripQuotes(node.toString()); String modelConfigName = OnnxModelTransformer.asValidIdentifier(path); // Only add the configuration if the model can actually be found. diff --git a/config-model/src/main/java/com/yahoo/vespa/model/ml/FeatureArguments.java b/config-model/src/main/java/com/yahoo/vespa/model/ml/FeatureArguments.java index 372b355b2d3..b52fd060a1c 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/ml/FeatureArguments.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/ml/FeatureArguments.java @@ -57,7 +57,7 @@ public class FeatureArguments { private static String asString(ExpressionNode node) { if ( ! (node instanceof ConstantNode)) throw new IllegalArgumentException("Expected a constant string as argument, but got '" + node); - return stripQuotes(((ConstantNode)node).sourceString()); + return stripQuotes(node.toString()); } private static String stripQuotes(String s) { diff --git a/model-evaluation/src/main/java/ai/vespa/models/evaluation/LazyArrayContext.java b/model-evaluation/src/main/java/ai/vespa/models/evaluation/LazyArrayContext.java index 40a0a1be5fc..d97235d11d2 100644 --- a/model-evaluation/src/main/java/ai/vespa/models/evaluation/LazyArrayContext.java +++ b/model-evaluation/src/main/java/ai/vespa/models/evaluation/LazyArrayContext.java @@ -293,8 +293,8 @@ public final class LazyArrayContext extends Context implements ContextIndex { ReferenceNode reference = (ReferenceNode) node; if (reference.getArguments().size() > 0) { if (reference.getArguments().expressions().get(0) instanceof ConstantNode) { - ConstantNode constantNode = (ConstantNode) reference.getArguments().expressions().get(0); - return Optional.of(stripQuotes(constantNode.sourceString())); + ExpressionNode constantNode = reference.getArguments().expressions().get(0); + return Optional.of(stripQuotes(constantNode.toString())); } if (reference.getArguments().expressions().get(0) instanceof ReferenceNode) { ReferenceNode referenceNode = (ReferenceNode) reference.getArguments().expressions().get(0); diff --git a/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/evaluation/EvaluationTestCase.java b/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/evaluation/EvaluationTestCase.java index 13e19ff4d35..efa98fba2eb 100644 --- a/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/evaluation/EvaluationTestCase.java +++ b/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/evaluation/EvaluationTestCase.java @@ -815,7 +815,7 @@ public class EvaluationTestCase { try { ExpressionNode e = arguments.expressions().get(index); if (e instanceof ConstantNode) { - return new DoubleValue(new RankingExpression(UnicodeUtilities.unquote(((ConstantNode)e).sourceString())).evaluate(this).asDouble()); + return new DoubleValue(new RankingExpression(UnicodeUtilities.unquote(e.toString())).evaluate(this).asDouble()); } return e.evaluate(this); } -- cgit v1.2.3