diff options
| author | Arne H Juul <arnej27959@users.noreply.github.com> | 2021-04-20 14:18:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-20 14:18:40 +0200 |
| commit | 61e046dea88b2ef560bd1cea26589f75910c17ea (patch) | |
| tree | e71f19203a4277c507df9a7bf139eb572f9fdadc /searchlib | |
| parent | ddd015ba597fcdadf0a8917a4192534d7ea86cfa (diff) | |
| parent | 18db90464db4cf53541fb81ae0f8bbe4806d194e (diff) | |
Merge pull request #17498 from vespa-engine/arnej/allow-double-result
Arnej/allow double result
Diffstat (limited to 'searchlib')
| -rw-r--r-- | searchlib/src/main/java/com/yahoo/searchlib/tensor/EvaluateTensorConformance.java | 5 | ||||
| -rwxr-xr-x | searchlib/src/main/sh/vespa-evaluate-tensor-conformance.sh | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/tensor/EvaluateTensorConformance.java b/searchlib/src/main/java/com/yahoo/searchlib/tensor/EvaluateTensorConformance.java index cf506efcb78..bd6fb47be1e 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/tensor/EvaluateTensorConformance.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/tensor/EvaluateTensorConformance.java @@ -103,10 +103,7 @@ public class EvaluateTensorConformance { private Tensor evaluate(String expression, MapContext context) throws ParseException { Value value = new RankingExpression(expression).evaluate(context); - if (!(value instanceof TensorValue)) { - throw new IllegalArgumentException("Result is not a tensor"); - } - return ((TensorValue)value).asTensor(); + return value.asTensor(); } private MapContext getInput(Inspector inputs) { diff --git a/searchlib/src/main/sh/vespa-evaluate-tensor-conformance.sh b/searchlib/src/main/sh/vespa-evaluate-tensor-conformance.sh index 5205f32e61d..43844e07cd4 100755 --- a/searchlib/src/main/sh/vespa-evaluate-tensor-conformance.sh +++ b/searchlib/src/main/sh/vespa-evaluate-tensor-conformance.sh @@ -76,4 +76,4 @@ findhost LJ=${VESPA_HOME}/lib/jars -exec java -cp ${LJ}/searchlib.jar:${LJ}/vespaclient-java-jar-with-dependencies.jar com.yahoo.searchlib.tensor.EvaluateTensorConformance "$@" +exec java -cp ${LJ}/vespajlib.jar:${LJ}/searchlib.jar:${LJ}/vespaclient-java-jar-with-dependencies.jar com.yahoo.searchlib.tensor.EvaluateTensorConformance "$@" |