diff options
author | Håvard Pettersen <havardpe@oath.com> | 2021-05-03 13:05:13 +0000 |
---|---|---|
committer | Håvard Pettersen <havardpe@oath.com> | 2021-05-03 13:05:13 +0000 |
commit | 8879d23b34f51c2bf73a025d59834e724a707643 (patch) | |
tree | 36dd18c039601d333ef9eb80178425906bdfc586 | |
parent | 54164220f1d224808aa86bf5777eaef837d61034 (diff) |
un-ignore no longer failing tests
-rw-r--r-- | eval/src/apps/tensor_conformance/generate.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/eval/src/apps/tensor_conformance/generate.cpp b/eval/src/apps/tensor_conformance/generate.cpp index 3c2a9b12272..9ae33c1234f 100644 --- a/eval/src/apps/tensor_conformance/generate.cpp +++ b/eval/src/apps/tensor_conformance/generate.cpp @@ -436,9 +436,9 @@ void generate_converting_lambda(TestBuilder &dst) { auto sparse = GenSpec::from_desc("y5_2"); auto mixed = GenSpec::from_desc("x3y5_2"); // change cell type and dimension types - dst.add_ignore_java("tensor<bfloat16>(x[5])(a{x:(x)})", {{"a", dense}}); - dst.add_ignore_java("tensor<bfloat16>(y[10])(a{y:(y)})", {{"a", sparse}}); - dst.add_ignore_java("tensor<bfloat16>(x[5],y[10])(a{x:(x),y:(y)})", {{"a", mixed}}); + dst.add("tensor<bfloat16>(x[5])(a{x:(x)})", {{"a", dense}}); + dst.add("tensor<bfloat16>(y[10])(a{y:(y)})", {{"a", sparse}}); + dst.add("tensor<bfloat16>(x[5],y[10])(a{x:(x),y:(y)})", {{"a", mixed}}); } //----------------------------------------------------------------------------- @@ -492,12 +492,12 @@ void generate_nan_existence(TestBuilder &dst) { const vespalib::string inner_expr = "f(x,y)(if(isNan(x),11,x)+if(isNan(y),22,y))"; vespalib::string merge_expr = fmt("merge(a,b,%s)", inner_expr.c_str()); vespalib::string join_expr = fmt("join(a,b,%s)", inner_expr.c_str()); - dst.add_ignore_java(merge_expr, {{"a", sparse1}, {"b", sparse2}}); - dst.add_ignore_java(merge_expr, {{"a", mixed1}, {"b", mixed2}}); - dst.add_ignore_java(join_expr, {{"a", sparse1}, {"b", sparse2}}); - dst.add_ignore_java(join_expr, {{"a", mixed1}, {"b", mixed2}}); - dst.add_ignore_java(join_expr, {{"a", sparse1}, {"b", mixed2}}); - dst.add_ignore_java(join_expr, {{"a", mixed1}, {"b", sparse2}}); + dst.add(merge_expr, {{"a", sparse1}, {"b", sparse2}}); + dst.add(merge_expr, {{"a", mixed1}, {"b", mixed2}}); + dst.add(join_expr, {{"a", sparse1}, {"b", sparse2}}); + dst.add(join_expr, {{"a", mixed1}, {"b", mixed2}}); + dst.add(join_expr, {{"a", sparse1}, {"b", mixed2}}); + dst.add(join_expr, {{"a", mixed1}, {"b", sparse2}}); } //----------------------------------------------------------------------------- |