diff options
| author | Håvard Pettersen <havardpe@oath.com> | 2021-02-03 13:56:07 +0000 |
|---|---|---|
| committer | Håvard Pettersen <havardpe@oath.com> | 2021-02-04 12:19:58 +0000 |
| commit | 8c8a2061cc06036374ca46971798c35534a6a253 (patch) | |
| tree | 1f4c5d0bd93655ed71d9f4b6d82be02da1902be3 /eval/src/apps/tensor_conformance | |
| parent | 20369863ee98ff9ca07078bf7465f229573663b0 (diff) | |
tensor model initial cleanup
drop Mask concept
move implementation to cpp file
Diffstat (limited to 'eval/src/apps/tensor_conformance')
| -rw-r--r-- | eval/src/apps/tensor_conformance/generate.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/eval/src/apps/tensor_conformance/generate.cpp b/eval/src/apps/tensor_conformance/generate.cpp index ea535758cda..e3d0c3c1063 100644 --- a/eval/src/apps/tensor_conformance/generate.cpp +++ b/eval/src/apps/tensor_conformance/generate.cpp @@ -1,7 +1,8 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "generate.h" -#include <vespa/eval/eval/test/tensor_model.hpp> +#include <vespa/vespalib/testkit/test_kit.h> +#include <vespa/eval/eval/test/tensor_model.h> #include <vespa/eval/eval/operation.h> #include <vespa/eval/eval/aggr.h> #include <vespa/vespalib/util/stringfmt.h> @@ -81,7 +82,7 @@ void generate_op1_map(const vespalib::string &op1_expr, map_fun_t ref_op, const void generate_tensor_map(TestBuilder &dst) { generate_op1_map("-a", operation::Neg::f, Sub2(Div16(N())), dst); - generate_op1_map("!a", operation::Not::f, Mask2Seq(SkipNth(3)), dst); + generate_op1_map("!a", operation::Not::f, Seq({0.0, 1.0, 1.0}), dst); generate_op1_map("cos(a)", operation::Cos::f, Div16(N()), dst); generate_op1_map("sin(a)", operation::Sin::f, Div16(N()), dst); generate_op1_map("tan(a)", operation::Tan::f, Div16(N()), dst); @@ -98,7 +99,7 @@ void generate_tensor_map(TestBuilder &dst) { generate_op1_map("ceil(a)", operation::Ceil::f, Div16(N()), dst); generate_op1_map("fabs(a)", operation::Fabs::f, Div16(N()), dst); generate_op1_map("floor(a)", operation::Floor::f, Div16(N()), dst); - generate_op1_map("isNan(a)", operation::IsNan::f, Mask2Seq(SkipNth(3), 1.0, my_nan), dst); + generate_op1_map("isNan(a)", operation::IsNan::f, Seq({my_nan, 1.0, 1.0}), dst); generate_op1_map("relu(a)", operation::Relu::f, Sub2(Div16(N())), dst); generate_op1_map("sigmoid(a)", operation::Sigmoid::f, Sub2(Div16(N())), dst); generate_op1_map("elu(a)", operation::Elu::f, Sub2(Div16(N())), dst); @@ -168,8 +169,8 @@ void generate_tensor_join(TestBuilder &dst) { generate_op2_join("a<=b", Div16(N()), dst); generate_op2_join("a>b", Div16(N()), dst); generate_op2_join("a>=b", Div16(N()), dst); - generate_op2_join("a&&b", Mask2Seq(SkipNth(3)), dst); - generate_op2_join("a||b", Mask2Seq(SkipNth(3)), dst); + generate_op2_join("a&&b", Seq({0.0, 1.0, 1.0}), dst); + generate_op2_join("a||b", Seq({0.0, 1.0, 1.0}), dst); generate_op2_join("atan2(a,b)", Div16(N()), dst); generate_op2_join("ldexp(a,b)", Div16(N()), dst); generate_op2_join("fmod(a,b)", Div16(N()), dst); |