summaryrefslogtreecommitdiffstats
path: root/eval/src/apps/make_tensor_binary_format_test_spec
diff options
context:
space:
mode:
Diffstat (limited to 'eval/src/apps/make_tensor_binary_format_test_spec')
-rw-r--r--eval/src/apps/make_tensor_binary_format_test_spec/make_tensor_binary_format_test_spec.cpp36
-rw-r--r--eval/src/apps/make_tensor_binary_format_test_spec/test_spec.json349
2 files changed, 30 insertions, 355 deletions
diff --git a/eval/src/apps/make_tensor_binary_format_test_spec/make_tensor_binary_format_test_spec.cpp b/eval/src/apps/make_tensor_binary_format_test_spec/make_tensor_binary_format_test_spec.cpp
index a7695408a85..6b10d2782f2 100644
--- a/eval/src/apps/make_tensor_binary_format_test_spec/make_tensor_binary_format_test_spec.cpp
+++ b/eval/src/apps/make_tensor_binary_format_test_spec/make_tensor_binary_format_test_spec.cpp
@@ -5,6 +5,7 @@
#include <vespa/vespalib/util/stringfmt.h>
#include <vespa/eval/eval/tensor_spec.h>
#include <vespa/eval/eval/value_type.h>
+#include <vespa/eval/eval/test/test_io.h>
#include <iostream>
using namespace vespalib;
@@ -297,27 +298,24 @@ void make_vector_map_test(Cursor &test,
//-----------------------------------------------------------------------------
-void make_tests(Cursor &tests) {
- make_number_test(tests.addObject(), 0.0);
- make_number_test(tests.addObject(), 42.0);
- make_vector_test(tests.addObject(), 3);
- make_matrix_test(tests.addObject(), 2, 3);
- make_map_test(tests.addObject(), {});
- make_map_test(tests.addObject(), {"a", "b", "c"});
- make_mesh_test(tests.addObject(), {}, "a");
- make_mesh_test(tests.addObject(), {"foo", "bar"}, "a");
- make_vector_map_test(tests.addObject(), "x", {}, "y", 10);
- make_vector_map_test(tests.addObject(), "y", {}, "x", 10);
- make_vector_map_test(tests.addObject(), "x", {"a", "b"}, "y", 3);
- make_vector_map_test(tests.addObject(), "y", {"a", "b"}, "x", 3);
+void make_tests(test::TestWriter &writer) {
+ make_number_test(writer.create(), 0.0);
+ make_number_test(writer.create(), 42.0);
+ make_vector_test(writer.create(), 3);
+ make_matrix_test(writer.create(), 2, 3);
+ make_map_test(writer.create(), {});
+ make_map_test(writer.create(), {"a", "b", "c"});
+ make_mesh_test(writer.create(), {}, "a");
+ make_mesh_test(writer.create(), {"foo", "bar"}, "a");
+ make_vector_map_test(writer.create(), "x", {}, "y", 10);
+ make_vector_map_test(writer.create(), "y", {}, "x", 10);
+ make_vector_map_test(writer.create(), "x", {"a", "b"}, "y", 3);
+ make_vector_map_test(writer.create(), "y", {"a", "b"}, "x", 3);
}
int main(int, char **) {
- Slime slime;
- Cursor &top = slime.setObject();
- Cursor &tests = top.setArray("tests");
- make_tests(tests);
- top.setLong("num_tests", tests.entries());
- fprintf(stdout, "%s", slime.toString().c_str());
+ test::StdOut std_out;
+ test::TestWriter writer(std_out);
+ make_tests(writer);
return 0;
}
diff --git a/eval/src/apps/make_tensor_binary_format_test_spec/test_spec.json b/eval/src/apps/make_tensor_binary_format_test_spec/test_spec.json
index 1b74b4b8838..701b829e5bc 100644
--- a/eval/src/apps/make_tensor_binary_format_test_spec/test_spec.json
+++ b/eval/src/apps/make_tensor_binary_format_test_spec/test_spec.json
@@ -1,336 +1,13 @@
-{
- "tests": [
- {
- "tensor": {
- "type": "double",
- "cells": [
- {
- "address": {
- },
- "value": 0
- }
- ]
- },
- "binary": [
- "0x0100010000000000000000",
- "0x02000000000000000000",
- "0x0300000000000000000000",
- "0x010000"
- ]
- },
- {
- "tensor": {
- "type": "double",
- "cells": [
- {
- "address": {
- },
- "value": 42
- }
- ]
- },
- "binary": [
- "0x0100014045000000000000",
- "0x02004045000000000000",
- "0x0300004045000000000000"
- ]
- },
- {
- "tensor": {
- "type": "tensor(x[3])",
- "cells": [
- {
- "address": {
- "x": 0
- },
- "value": 1
- },
- {
- "address": {
- "x": 1
- },
- "value": 2
- },
- {
- "address": {
- "x": 2
- },
- "value": 3
- }
- ]
- },
- "binary": [
- "0x02010178033FF000000000000040000000000000004008000000000000",
- "0x0300010178033FF000000000000040000000000000004008000000000000"
- ]
- },
- {
- "tensor": {
- "type": "tensor(x[2],y[3])",
- "cells": [
- {
- "address": {
- "x": 0,
- "y": 0
- },
- "value": 11
- },
- {
- "address": {
- "x": 0,
- "y": 1
- },
- "value": 12
- },
- {
- "address": {
- "x": 0,
- "y": 2
- },
- "value": 13
- },
- {
- "address": {
- "x": 1,
- "y": 0
- },
- "value": 21
- },
- {
- "address": {
- "x": 1,
- "y": 1
- },
- "value": 22
- },
- {
- "address": {
- "x": 1,
- "y": 2
- },
- "value": 23
- }
- ]
- },
- "binary": [
- "0x020201780201790340260000000000004028000000000000402A000000000000403500000000000040360000000000004037000000000000",
- "0x03000201780201790340260000000000004028000000000000402A000000000000403500000000000040360000000000004037000000000000"
- ]
- },
- {
- "tensor": {
- "type": "tensor(x{})",
- "cells": [
- ]
- },
- "binary": [
- "0x0101017800",
- "0x030101780000"
- ]
- },
- {
- "tensor": {
- "type": "tensor(x{})",
- "cells": [
- {
- "address": {
- "x": "a"
- },
- "value": 1
- },
- {
- "address": {
- "x": "b"
- },
- "value": 2
- },
- {
- "address": {
- "x": "c"
- },
- "value": 3
- }
- ]
- },
- "binary": [
- "0x010101780301613FF00000000000000162400000000000000001634008000000000000",
- "0x03010178000301613FF00000000000000162400000000000000001634008000000000000",
- "0x010101780301613FF00000000000000163400800000000000001624000000000000000",
- "0x03010178000301613FF00000000000000163400800000000000001624000000000000000",
- "0x01010178030162400000000000000001613FF000000000000001634008000000000000",
- "0x0301017800030162400000000000000001613FF000000000000001634008000000000000",
- "0x0101017803016240000000000000000163400800000000000001613FF0000000000000",
- "0x030101780003016240000000000000000163400800000000000001613FF0000000000000",
- "0x01010178030163400800000000000001613FF000000000000001624000000000000000",
- "0x0301017800030163400800000000000001613FF000000000000001624000000000000000",
- "0x0101017803016340080000000000000162400000000000000001613FF0000000000000",
- "0x030101780003016340080000000000000162400000000000000001613FF0000000000000"
- ]
- },
- {
- "tensor": {
- "type": "tensor(x{},y{})",
- "cells": [
- ]
- },
- "binary": [
- "0x01020178017900",
- "0x0302017801790000"
- ]
- },
- {
- "tensor": {
- "type": "tensor(x{},y{})",
- "cells": [
- {
- "address": {
- "x": "bar",
- "y": "a"
- },
- "value": 21
- },
- {
- "address": {
- "x": "foo",
- "y": "a"
- },
- "value": 11
- }
- ]
- },
- "binary": [
- "0x0102017801790203666F6F016140260000000000000362617201614035000000000000",
- "0x030201780179000203666F6F016140260000000000000362617201614035000000000000",
- "0x01020178017902036261720161403500000000000003666F6F01614026000000000000",
- "0x0302017801790002036261720161403500000000000003666F6F01614026000000000000"
- ]
- },
- {
- "tensor": {
- "type": "tensor(x{},y[10])",
- "cells": [
- ]
- },
- "binary": [
- "0x030101780101790A00"
- ]
- },
- {
- "tensor": {
- "type": "tensor(x[10],y{})",
- "cells": [
- ]
- },
- "binary": [
- "0x030101790101780A00"
- ]
- },
- {
- "tensor": {
- "type": "tensor(x{},y[3])",
- "cells": [
- {
- "address": {
- "x": "a",
- "y": 0
- },
- "value": 11
- },
- {
- "address": {
- "x": "a",
- "y": 1
- },
- "value": 12
- },
- {
- "address": {
- "x": "a",
- "y": 2
- },
- "value": 13
- },
- {
- "address": {
- "x": "b",
- "y": 0
- },
- "value": 21
- },
- {
- "address": {
- "x": "b",
- "y": 1
- },
- "value": 22
- },
- {
- "address": {
- "x": "b",
- "y": 2
- },
- "value": 23
- }
- ]
- },
- "binary": [
- "0x030101780101790302016140260000000000004028000000000000402A0000000000000162403500000000000040360000000000004037000000000000",
- "0x0301017801017903020162403500000000000040360000000000004037000000000000016140260000000000004028000000000000402A000000000000"
- ]
- },
- {
- "tensor": {
- "type": "tensor(x[3],y{})",
- "cells": [
- {
- "address": {
- "x": 0,
- "y": "a"
- },
- "value": 11
- },
- {
- "address": {
- "x": 0,
- "y": "b"
- },
- "value": 21
- },
- {
- "address": {
- "x": 1,
- "y": "a"
- },
- "value": 12
- },
- {
- "address": {
- "x": 1,
- "y": "b"
- },
- "value": 22
- },
- {
- "address": {
- "x": 2,
- "y": "a"
- },
- "value": 13
- },
- {
- "address": {
- "x": 2,
- "y": "b"
- },
- "value": 23
- }
- ]
- },
- "binary": [
- "0x030101790101780302016140260000000000004028000000000000402A0000000000000162403500000000000040360000000000004037000000000000",
- "0x0301017901017803020162403500000000000040360000000000004037000000000000016140260000000000004028000000000000402A000000000000"
- ]
- }
- ],
- "num_tests": 12
-}
+{"tensor":{"type":"double","cells":[{"address":{},"value":0}]},"binary":["0x0100010000000000000000","0x02000000000000000000","0x0300000000000000000000","0x010000"]}
+{"tensor":{"type":"double","cells":[{"address":{},"value":42}]},"binary":["0x0100014045000000000000","0x02004045000000000000","0x0300004045000000000000"]}
+{"tensor":{"type":"tensor(x[3])","cells":[{"address":{"x":0},"value":1},{"address":{"x":1},"value":2},{"address":{"x":2},"value":3}]},"binary":["0x02010178033FF000000000000040000000000000004008000000000000","0x0300010178033FF000000000000040000000000000004008000000000000"]}
+{"tensor":{"type":"tensor(x[2],y[3])","cells":[{"address":{"x":0,"y":0},"value":11},{"address":{"x":0,"y":1},"value":12},{"address":{"x":0,"y":2},"value":13},{"address":{"x":1,"y":0},"value":21},{"address":{"x":1,"y":1},"value":22},{"address":{"x":1,"y":2},"value":23}]},"binary":["0x020201780201790340260000000000004028000000000000402A000000000000403500000000000040360000000000004037000000000000","0x03000201780201790340260000000000004028000000000000402A000000000000403500000000000040360000000000004037000000000000"]}
+{"tensor":{"type":"tensor(x{})","cells":[]},"binary":["0x0101017800","0x030101780000"]}
+{"tensor":{"type":"tensor(x{})","cells":[{"address":{"x":"a"},"value":1},{"address":{"x":"b"},"value":2},{"address":{"x":"c"},"value":3}]},"binary":["0x010101780301613FF00000000000000162400000000000000001634008000000000000","0x03010178000301613FF00000000000000162400000000000000001634008000000000000","0x010101780301613FF00000000000000163400800000000000001624000000000000000","0x03010178000301613FF00000000000000163400800000000000001624000000000000000","0x01010178030162400000000000000001613FF000000000000001634008000000000000","0x0301017800030162400000000000000001613FF000000000000001634008000000000000","0x0101017803016240000000000000000163400800000000000001613FF0000000000000","0x030101780003016240000000000000000163400800000000000001613FF0000000000000","0x01010178030163400800000000000001613FF000000000000001624000000000000000","0x0301017800030163400800000000000001613FF000000000000001624000000000000000","0x0101017803016340080000000000000162400000000000000001613FF0000000000000","0x030101780003016340080000000000000162400000000000000001613FF0000000000000"]}
+{"tensor":{"type":"tensor(x{},y{})","cells":[]},"binary":["0x01020178017900","0x0302017801790000"]}
+{"tensor":{"type":"tensor(x{},y{})","cells":[{"address":{"x":"bar","y":"a"},"value":21},{"address":{"x":"foo","y":"a"},"value":11}]},"binary":["0x0102017801790203666F6F016140260000000000000362617201614035000000000000","0x030201780179000203666F6F016140260000000000000362617201614035000000000000","0x01020178017902036261720161403500000000000003666F6F01614026000000000000","0x0302017801790002036261720161403500000000000003666F6F01614026000000000000"]}
+{"tensor":{"type":"tensor(x{},y[10])","cells":[]},"binary":["0x030101780101790A00"]}
+{"tensor":{"type":"tensor(x[10],y{})","cells":[]},"binary":["0x030101790101780A00"]}
+{"tensor":{"type":"tensor(x{},y[3])","cells":[{"address":{"x":"a","y":0},"value":11},{"address":{"x":"a","y":1},"value":12},{"address":{"x":"a","y":2},"value":13},{"address":{"x":"b","y":0},"value":21},{"address":{"x":"b","y":1},"value":22},{"address":{"x":"b","y":2},"value":23}]},"binary":["0x030101780101790302016140260000000000004028000000000000402A0000000000000162403500000000000040360000000000004037000000000000","0x0301017801017903020162403500000000000040360000000000004037000000000000016140260000000000004028000000000000402A000000000000"]}
+{"tensor":{"type":"tensor(x[3],y{})","cells":[{"address":{"x":0,"y":"a"},"value":11},{"address":{"x":0,"y":"b"},"value":21},{"address":{"x":1,"y":"a"},"value":12},{"address":{"x":1,"y":"b"},"value":22},{"address":{"x":2,"y":"a"},"value":13},{"address":{"x":2,"y":"b"},"value":23}]},"binary":["0x030101790101780302016140260000000000004028000000000000402A0000000000000162403500000000000040360000000000004037000000000000","0x0301017901017803020162403500000000000040360000000000004037000000000000016140260000000000004028000000000000402A000000000000"]}
+{"num_tests":12}