diff options
author | Arne H Juul <arnej27959@users.noreply.github.com> | 2023-03-23 13:17:32 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-03-23 13:17:32 +0100 |
commit | 51de23a458a1dd7239ebfca4c1dcbe502b1e6a03 (patch) | |
tree | d1aa54b1d0b86269a5e4cad092063af0a8c74715 /config-model/src/test | |
parent | b74558f7b462faa498eae165ee28fb1e4f6932f9 (diff) | |
parent | de315c066a6dd0b78431230a5035fa519ebac601 (diff) |
Merge pull request #26535 from vespa-engine/arnej/use-common-expressionfunction-instance
use ExpressionFunction.Instance for consistency
Diffstat (limited to 'config-model/src/test')
-rw-r--r-- | config-model/src/test/derived/globalphase_token_functions/rank-profiles.cfg | 10 | ||||
-rw-r--r-- | config-model/src/test/java/com/yahoo/schema/processing/RankingExpressionWithOnnxModelTestCase.java | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/config-model/src/test/derived/globalphase_token_functions/rank-profiles.cfg b/config-model/src/test/derived/globalphase_token_functions/rank-profiles.cfg index be6ec0e3a51..fc2453f3aa9 100644 --- a/config-model/src/test/derived/globalphase_token_functions/rank-profiles.cfg +++ b/config-model/src/test/derived/globalphase_token_functions/rank-profiles.cfg @@ -13,20 +13,20 @@ rankprofile[].fef.property[].value "true" rankprofile[].fef.property[].name "vespa.type.attribute.tokens" rankprofile[].fef.property[].value "tensor(d0[128])" rankprofile[].name "using_model" -rankprofile[].fef.property[].name "rankingExpression(__token_length@3cbfb934).rankingScript" +rankprofile[].fef.property[].name "rankingExpression(__token_length@4d7c1b66085df918).rankingScript" rankprofile[].fef.property[].value "reduce(map(query(input), f(x)(x > 0)), sum)" -rankprofile[].fef.property[].name "rankingExpression(__token_length@cf90db10).rankingScript" +rankprofile[].fef.property[].name "rankingExpression(__token_length@a16087c578950aea).rankingScript" rankprofile[].fef.property[].value "reduce(map(attribute(tokens), f(x)(x > 0)), sum)" rankprofile[].fef.property[].name "rankingExpression(input_ids).rankingScript" -rankprofile[].fef.property[].value "tensor<float>(d0[1],d1[128])((if (d1 < 1.0, 101.0, if (d1 < 1.0 + rankingExpression(__token_length@3cbfb934), query(input){d0:(d1 - (1.0))}, if (d1 < (1.0 + rankingExpression(__token_length@3cbfb934) + 1.0), 102.0, if (d1 < (1.0 + rankingExpression(__token_length@3cbfb934) + 1.0 + rankingExpression(__token_length@cf90db10)), attribute(tokens){d0:(d1 - (1.0 + rankingExpression(__token_length@3cbfb934) + 1.0))}, if (d1 < (1.0 + rankingExpression(__token_length@3cbfb934) + 1.0 + rankingExpression(__token_length@cf90db10) + 1.0), 102.0, 0.0)))))))" +rankprofile[].fef.property[].value "tensor<float>(d0[1],d1[128])((if (d1 < 1.0, 101.0, if (d1 < 1.0 + rankingExpression(__token_length@4d7c1b66085df918), query(input){d0:(d1 - (1.0))}, if (d1 < (1.0 + rankingExpression(__token_length@4d7c1b66085df918) + 1.0), 102.0, if (d1 < (1.0 + rankingExpression(__token_length@4d7c1b66085df918) + 1.0 + rankingExpression(__token_length@a16087c578950aea)), attribute(tokens){d0:(d1 - (1.0 + rankingExpression(__token_length@4d7c1b66085df918) + 1.0))}, if (d1 < (1.0 + rankingExpression(__token_length@4d7c1b66085df918) + 1.0 + rankingExpression(__token_length@a16087c578950aea) + 1.0), 102.0, 0.0)))))))" rankprofile[].fef.property[].name "rankingExpression(input_ids).type" rankprofile[].fef.property[].value "tensor<float>(d0[1],d1[128])" rankprofile[].fef.property[].name "rankingExpression(token_type_ids).rankingScript" -rankprofile[].fef.property[].value "tensor<float>(d0[1],d1[128])((if (d1 < (1.0 + rankingExpression(__token_length@3cbfb934) + 1.0), 0.0, if (d1 < (1.0 + rankingExpression(__token_length@3cbfb934) + 1.0 + rankingExpression(__token_length@cf90db10) + 1.0), 1.0, 0.0))))" +rankprofile[].fef.property[].value "tensor<float>(d0[1],d1[128])((if (d1 < (1.0 + rankingExpression(__token_length@4d7c1b66085df918) + 1.0), 0.0, if (d1 < (1.0 + rankingExpression(__token_length@4d7c1b66085df918) + 1.0 + rankingExpression(__token_length@a16087c578950aea) + 1.0), 1.0, 0.0))))" rankprofile[].fef.property[].name "rankingExpression(token_type_ids).type" rankprofile[].fef.property[].value "tensor<float>(d0[1],d1[128])" rankprofile[].fef.property[].name "rankingExpression(attention_mask).rankingScript" -rankprofile[].fef.property[].value "tensor<float>(d0[1],d1[128])((if (d1 < (1.0 + rankingExpression(__token_length@3cbfb934) + 1.0 + rankingExpression(__token_length@cf90db10) + 1.0), 1.0, 0.0)))" +rankprofile[].fef.property[].value "tensor<float>(d0[1],d1[128])((if (d1 < (1.0 + rankingExpression(__token_length@4d7c1b66085df918) + 1.0 + rankingExpression(__token_length@a16087c578950aea) + 1.0), 1.0, 0.0)))" rankprofile[].fef.property[].name "rankingExpression(attention_mask).type" rankprofile[].fef.property[].value "tensor<float>(d0[1],d1[128])" rankprofile[].fef.property[].name "vespa.rank.globalphase" diff --git a/config-model/src/test/java/com/yahoo/schema/processing/RankingExpressionWithOnnxModelTestCase.java b/config-model/src/test/java/com/yahoo/schema/processing/RankingExpressionWithOnnxModelTestCase.java index 69c68124908..b094130ed0f 100644 --- a/config-model/src/test/java/com/yahoo/schema/processing/RankingExpressionWithOnnxModelTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/processing/RankingExpressionWithOnnxModelTestCase.java @@ -171,7 +171,7 @@ public class RankingExpressionWithOnnxModelTestCase { assertEquals("test_dynamic_model_with_transformer_tokens", config.rankprofile(7).name()); assertEquals("rankingExpression(my_function).rankingScript", config.rankprofile(7).fef().property(1).name()); - assertEquals("tensor<float>(d0[1],d1[10])((if (d1 < (1.0 + rankingExpression(__token_length@892e3154) + 1.0), 0.0, if (d1 < (1.0 + rankingExpression(__token_length@892e3154) + 1.0 + rankingExpression(__token_length@892e3154) + 1.0), 1.0, 0.0))))", config.rankprofile(7).fef().property(1).value()); + assertEquals("tensor<float>(d0[1],d1[10])((if (d1 < (1.0 + rankingExpression(__token_length@a2e4b6abdeb5fb3a) + 1.0), 0.0, if (d1 < (1.0 + rankingExpression(__token_length@a2e4b6abdeb5fb3a) + 1.0 + rankingExpression(__token_length@a2e4b6abdeb5fb3a) + 1.0), 1.0, 0.0))))", config.rankprofile(7).fef().property(1).value()); assertEquals("test_unbound_model", config.rankprofile(8).name()); assertEquals("rankingExpression(my_function).rankingScript", config.rankprofile(8).fef().property(0).name()); |