diff options
| author | Lester Solbakken <lesters@users.noreply.github.com> | 2021-06-21 16:20:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-21 16:20:18 +0200 |
| commit | 2afb8fd23f101be08f4123d3a25202a0066acdba (patch) | |
| tree | 69bcee215e94ade0538e5ccf742875fe3b4875bf /eval | |
| parent | b73c2d3d2d0102ebf26b8f545455028cecca03ad (diff) | |
| parent | e528749669775293f6aaaeeee23fc99f1070940b (diff) | |
Merge pull request #18345 from vespa-engine/havardpe/conformance-test-bit-extraction
enable conformance testing of bit extraction
Diffstat (limited to 'eval')
| -rw-r--r-- | eval/src/apps/tensor_conformance/generate.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/eval/src/apps/tensor_conformance/generate.cpp b/eval/src/apps/tensor_conformance/generate.cpp index 01936a879d0..8a596ad38d4 100644 --- a/eval/src/apps/tensor_conformance/generate.cpp +++ b/eval/src/apps/tensor_conformance/generate.cpp @@ -245,7 +245,7 @@ void generate_op2_join(const vespalib::string &op2_expr, const Sequence &seq, Te generate_join_expr(fmt("join(a,b,f(a,b)(%s))", op2_expr.c_str()), seq, dst); } -[[maybe_unused]] void generate_op2_join(const vespalib::string &op2_expr, const Sequence &seq_a, const Sequence &seq_b, TestBuilder &dst) { +void generate_op2_join(const vespalib::string &op2_expr, const Sequence &seq_a, const Sequence &seq_b, TestBuilder &dst) { generate_join_expr(op2_expr, seq_a, seq_b, dst); generate_join_expr(fmt("join(a,b,f(a,b)(%s))", op2_expr.c_str()), seq_a, seq_b, dst); } @@ -272,8 +272,7 @@ void generate_join(TestBuilder &dst) { generate_op2_join("fmod(a,b)", Div16(N()), dst); generate_op2_join("min(a,b)", Div16(N()), dst); generate_op2_join("max(a,b)", Div16(N()), dst); - // TODO: test bit(a,b) when implemented in Java - // generate_op2_join("bit(a,b)", Seq({-128, -43, -1, 0, 85, 127}), Seq({0, 1, 2, 3, 4, 5, 6, 7}), dst); + generate_op2_join("bit(a,b)", Seq({-128, -43, -1, 0, 85, 127}), Seq({0, 1, 2, 3, 4, 5, 6, 7}), dst); // inverted lambda generate_join_expr("join(a,b,f(a,b)(b-a))", Div16(N()), dst); // custom lambda @@ -304,7 +303,7 @@ void generate_op2_merge(const vespalib::string &op2_expr, const Sequence &seq, T generate_merge_expr(fmt("merge(a,b,f(a,b)(%s))", op2_expr.c_str()), seq, dst); } -[[maybe_unused]] void generate_op2_merge(const vespalib::string &op2_expr, const Sequence &seq_a, const Sequence &seq_b, TestBuilder &dst) { +void generate_op2_merge(const vespalib::string &op2_expr, const Sequence &seq_a, const Sequence &seq_b, TestBuilder &dst) { generate_merge_expr(op2_expr, seq_a, seq_b, dst); generate_merge_expr(fmt("merge(a,b,f(a,b)(%s))", op2_expr.c_str()), seq_a, seq_b, dst); } @@ -331,8 +330,7 @@ void generate_merge(TestBuilder &dst) { generate_op2_merge("fmod(a,b)", Div16(N()), dst); generate_op2_merge("min(a,b)", Div16(N()), dst); generate_op2_merge("max(a,b)", Div16(N()), dst); - // TODO: test bit(a,b) when implemented in Java - // generate_op2_merge("bit(a,b)", Seq({-128, -43, -1, 0, 85, 127}), Seq({0, 1, 2, 3, 4, 5, 6, 7}), dst); + generate_op2_merge("bit(a,b)", Seq({-128, -43, -1, 0, 85, 127}), Seq({0, 1, 2, 3, 4, 5, 6, 7}), dst); // inverted lambda generate_merge_expr("merge(a,b,f(a,b)(b-a))", Div16(N()), dst); // custom lambda |