summaryrefslogtreecommitdiffstats
path: root/eval/src/tests
diff options
context:
space:
mode:
authorArne H Juul <arnej27959@users.noreply.github.com>2019-06-12 13:39:50 +0200
committerGitHub <noreply@github.com>2019-06-12 13:39:50 +0200
commit2b9aa7f40171f918fe1a906de8334d637aa8810b (patch)
treec4a030494b4ea4b30ce45982a664cc4f49c80c3d /eval/src/tests
parenta7fe82abe533cf8633af17a0e914fdc89d6db231 (diff)
parent91f3fce64d2d1e97449b55400eee12bd92b650b6 (diff)
Merge pull request #9729 from vespa-engine/havardpe/float-cell-serialization
serialize float cells
Diffstat (limited to 'eval/src/tests')
-rw-r--r--eval/src/tests/tensor/tensor_serialization/tensor_serialization_test.cpp33
1 files changed, 21 insertions, 12 deletions
diff --git a/eval/src/tests/tensor/tensor_serialization/tensor_serialization_test.cpp b/eval/src/tests/tensor/tensor_serialization/tensor_serialization_test.cpp
index b43a127bc60..d1491e4f758 100644
--- a/eval/src/tests/tensor/tensor_serialization/tensor_serialization_test.cpp
+++ b/eval/src/tests/tensor/tensor_serialization/tensor_serialization_test.cpp
@@ -76,8 +76,8 @@ TEST("test tensor serialization for SparseTensor") {
TensorSpec("tensor(x{})")
.add({{"x", "1"}}, 3)));
TEST_DO(verify_serialized({ 0x01, 0x02, 0x01, 0x78, 0x01, 0x79, 0x01, 0x00,
- 0x00, 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00 },
+ 0x00, 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00 },
TensorSpec("tensor(x{},y{})")
.add({{"x", ""}, {"y", ""}}, 3)));
TEST_DO(verify_serialized({ 0x01, 0x02, 0x01, 0x78, 0x01, 0x79, 0x01, 0x01,
@@ -85,23 +85,32 @@ TEST("test tensor serialization for SparseTensor") {
0x00, 0x00 },
TensorSpec("tensor(x{},y{})")
.add({{"x", "1"}, {"y", ""}}, 3)));
- TEST_DO(verify_serialized({ 0x01, 0x02, 0x01, 0x78, 0x01, 0x79, 0x01, 0x00,
- 0x01, 0x33, 0x40, 0x08, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00 },
+ TEST_DO(verify_serialized({ 0x01, 0x02, 0x01, 0x78, 0x01, 0x79, 0x01, 0x00,
+ 0x01, 0x33, 0x40, 0x08, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00 },
TensorSpec("tensor(x{},y{})")
.add({{"x", ""}, {"y", "3"}}, 3)));
- TEST_DO(verify_serialized({ 0x01, 0x02, 0x01, 0x78, 0x01, 0x79, 0x01, 0x01,
- 0x32, 0x01, 0x34, 0x40, 0x08, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00 },
+ TEST_DO(verify_serialized({ 0x01, 0x02, 0x01, 0x78, 0x01, 0x79, 0x01, 0x01,
+ 0x32, 0x01, 0x34, 0x40, 0x08, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00 },
TensorSpec("tensor(x{},y{})")
.add({{"x", "2"}, {"y", "4"}}, 3)));
- TEST_DO(verify_serialized({ 0x01, 0x02, 0x01, 0x78, 0x01, 0x79,
- 0x01, 0x01, 0x31, 0x00, 0x40, 0x08,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+ TEST_DO(verify_serialized({ 0x01, 0x02, 0x01, 0x78, 0x01, 0x79,
+ 0x01, 0x01, 0x31, 0x00, 0x40, 0x08,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
TensorSpec("tensor(x{},y{})")
.add({{"x", "1"}, {"y", ""}}, 3)));
}
+TEST("test float cells from sparse tensor") {
+ TEST_DO(verify_serialized({ 0x05, 0x01,
+ 0x02, 0x01, 0x78, 0x01, 0x79,
+ 0x01, 0x01, 0x31, 0x00,
+ 0x40, 0x40, 0x00, 0x00 },
+ TensorSpec("tensor<float>(x{},y{})")
+ .add({{"x", "1"}, {"y", ""}}, 3)));
+}
+
TEST("test tensor serialization for DenseTensor") {
TEST_DO(verify_serialized({0x02, 0x00,
0x00, 0x00, 0x00, 0x00,
@@ -187,7 +196,7 @@ TEST("test tensor serialization for DenseTensor") {
.add({{"x", 2}, {"y", 4}}, 3)));
}
-TEST("test 'float' cells") {
+TEST("test float cells for dense tensor") {
TEST_DO(verify_serialized({0x06, 0x01, 0x02, 0x01, 0x78, 0x03,
0x01, 0x79, 0x05,
0x00, 0x00, 0x00, 0x00,