summaryrefslogtreecommitdiffstats
path: root/eval
diff options
context:
space:
mode:
authorArne Juul <arnej@yahoo-inc.com>2019-08-19 12:48:59 +0000
committerArne Juul <arnej@yahoo-inc.com>2019-08-19 12:48:59 +0000
commit0166d7c4a7f30560ba05e03614deb3577ec49d07 (patch)
treebbbd9334002f92296d3fd5218754d685b6d26f9f /eval
parentc7e680a9a76e9ac8acb8b9215eb8a629db87793d (diff)
update tests after review
Diffstat (limited to 'eval')
-rw-r--r--eval/src/apps/tensor_conformance/generate.cpp5
-rw-r--r--eval/src/apps/tensor_conformance/test_spec.json2
2 files changed, 3 insertions, 4 deletions
diff --git a/eval/src/apps/tensor_conformance/generate.cpp b/eval/src/apps/tensor_conformance/generate.cpp
index ab6b5c36ad0..eaccdc0acb5 100644
--- a/eval/src/apps/tensor_conformance/generate.cpp
+++ b/eval/src/apps/tensor_conformance/generate.cpp
@@ -211,6 +211,8 @@ void generate_xw_product(TestBuilder &dst) {
dst.add("reduce(a*b,sum,x)",
{{"a", spec(float_cells({x(2)}), Seq({ 1, 2 }))}, {"b", matrix}},
spec(y(3), Seq({(1*3+2*11),(1*5+2*13),(1*7+2*17)})));
+ dst.add("reduce(a*b,sum,x)", {{"a", spec(x(2), Seq({ 1, 2 }))}, {"b", fmatrix}},
+ spec(y(3), Seq({(1*3+2*11),(1*5+2*13),(1*7+2*17)})));
dst.add("reduce(a*b,sum,x)",
{{"a", spec(float_cells({x(2)}), Seq({ 1, 2 }))}, {"b", fmatrix}},
spec(float_cells({y(3)}), Seq({(1*3+2*11),(1*5+2*13),(1*7+2*17)})));
@@ -223,9 +225,6 @@ void generate_xw_product(TestBuilder &dst) {
void generate_tensor_concat(TestBuilder &dst) {
dst.add("concat(a,b,x)", {{"a", spec(10.0)}, {"b", spec(20.0)}}, spec(x(2), Seq({10.0, 20.0})));
dst.add("concat(a,b,x)", {{"a", spec(x(1), Seq({10.0}))}, {"b", spec(20.0)}}, spec(x(2), Seq({10.0, 20.0})));
- dst.add("concat(a,b,x)", {{"a", spec(float_cells({x(1)}), Seq({10.0}))},
- {"b", spec(20.0)}},
- spec(float_cells({x(2)}), Seq({10.0, 20.0})));
dst.add("concat(a,b,x)", {{"a", spec(10.0)}, {"b", spec(x(1), Seq({20.0}))}}, spec(x(2), Seq({10.0, 20.0})));
dst.add("concat(a,b,x)", {{"a", spec(x(3), Seq({1.0, 2.0, 3.0}))}, {"b", spec(x(2), Seq({4.0, 5.0}))}},
spec(x(5), Seq({1.0, 2.0, 3.0, 4.0, 5.0})));
diff --git a/eval/src/apps/tensor_conformance/test_spec.json b/eval/src/apps/tensor_conformance/test_spec.json
index a5f4b3835dc..222a03cfc3b 100644
--- a/eval/src/apps/tensor_conformance/test_spec.json
+++ b/eval/src/apps/tensor_conformance/test_spec.json
@@ -1785,11 +1785,11 @@
{"expression":"reduce(a*b,sum)","inputs":{"a":"0x060101017803400000004040000040A00000","b":"0x06010101780340E000004130000041500000"},"result":{"expect":"0x0200405C000000000000"}}
{"expression":"reduce(a*b,sum,x)","inputs":{"a":"0x02010178023FF00000000000004000000000000000","b":"0x020201780201790340080000000000004014000000000000401C0000000000004026000000000000402A0000000000004031000000000000"},"result":{"expect":"0x02010179034039000000000000403F0000000000004044800000000000"}}
{"expression":"reduce(a*b,sum,x)","inputs":{"a":"0x0601010178023F80000040000000","b":"0x020201780201790340080000000000004014000000000000401C0000000000004026000000000000402A0000000000004031000000000000"},"result":{"expect":"0x02010179034039000000000000403F0000000000004044800000000000"}}
+{"expression":"reduce(a*b,sum,x)","inputs":{"a":"0x02010178023FF00000000000004000000000000000","b":"0x0601020178020179034040000040A0000040E00000413000004150000041880000"},"result":{"expect":"0x02010179034039000000000000403F0000000000004044800000000000"}}
{"expression":"reduce(a*b,sum,x)","inputs":{"a":"0x0601010178023F80000040000000","b":"0x0601020178020179034040000040A0000040E00000413000004150000041880000"},"result":{"expect":"0x06010101790341C8000041F8000042240000"}}
{"expression":"reduce(a*b,sum,y)","inputs":{"a":"0x02010179033FF000000000000040000000000000004008000000000000","b":"0x020201780201790340080000000000004014000000000000401C0000000000004026000000000000402A0000000000004031000000000000"},"result":{"expect":"0x020101780240410000000000004056000000000000"}}
{"expression":"concat(a,b,x)","inputs":{"a":"0x02004024000000000000","b":"0x02004034000000000000"},"result":{"expect":"0x020101780240240000000000004034000000000000"}}
{"expression":"concat(a,b,x)","inputs":{"a":"0x02010178014024000000000000","b":"0x02004034000000000000"},"result":{"expect":"0x020101780240240000000000004034000000000000"}}
-{"expression":"concat(a,b,x)","inputs":{"a":"0x06010101780141200000","b":"0x02004034000000000000"},"result":{"expect":"0x0601010178024120000041A00000"}}
{"expression":"concat(a,b,x)","inputs":{"a":"0x02004024000000000000","b":"0x02010178014034000000000000"},"result":{"expect":"0x020101780240240000000000004034000000000000"}}
{"expression":"concat(a,b,x)","inputs":{"a":"0x02010178033FF000000000000040000000000000004008000000000000","b":"0x020101780240100000000000004014000000000000"},"result":{"expect":"0x02010178053FF00000000000004000000000000000400800000000000040100000000000004014000000000000"}}
{"expression":"concat(a,b,y)","inputs":{"a":"0x02020178020179023FF0000000000000400000000000000040080000000000004010000000000000","b":"0x020101790240140000000000004018000000000000"},"result":{"expect":"0x02020178020179043FF00000000000004000000000000000401400000000000040180000000000004008000000000000401000000000000040140000000000004018000000000000"}}