allow integer labels for literal format, but add strict checking of

addresses to avoid crashing into asserts in CreateValueFromTensorSpec

6 files changed, 11 insertions, 5 deletions

diff --git a/eval/src/tests/eval/value_cache/dense.json b/eval/src/tests/eval/value_cache/dense.json
index 2263053f01f..f310ee9dc32 100644
--- a/eval/src/tests/eval/value_cache/dense.json
+++ b/eval/src/tests/eval/value_cache/dense.json
@@ -1,8 +1,8 @@
 {
     "dimensions": ["x","y"],
     "cells": [
-        { "address": { "x": "0", "y": "0" }, "value": 1.0 },
-        { "address": { "x": "0", "y": "1" }, "value": 2.0 },
-        { "address": { "x": "1", "y": "0" }, "value": 3.0 },
+        { "address": { "x": 0, "y": 0 }, "value": 1.0 },
+        { "address": { "y": 1, "x": 0 }, "value": 2.0 },
+        { "address": { "x": "1", "y": 0 }, "value": 3.0 },
         { "address": { "x": "1", "y": "1" }, "value": 4.0 }]
 }
diff --git a/eval/src/tests/eval/value_cache/sparse-short1.json b/eval/src/tests/eval/value_cache/sparse-short1.json
index 741a2160898..5b6aa6d6104 100644
--- a/eval/src/tests/eval/value_cache/sparse-short1.json
+++ b/eval/src/tests/eval/value_cache/sparse-short1.json
@@ -1,5 +1,5 @@
 {
-    "foo": 1.0,
+    "foo": 1,
     "cells": 2.0,
     "values": 0.5,
     "blocks": 1.5
diff --git a/eval/src/tests/eval/value_cache/sparse-short2.json b/eval/src/tests/eval/value_cache/sparse-short2.json
index 7eb377968e4..552fec39bcc 100644
--- a/eval/src/tests/eval/value_cache/sparse-short2.json
+++ b/eval/src/tests/eval/value_cache/sparse-short2.json
@@ -1,6 +1,6 @@
 {
     "cells": {
-        "foo": 1.0,
+        "foo": 1,
         "cells": 2.0,
         "values": 0.5,
         "blocks": 1.5
diff --git a/eval/src/tests/eval/value_cache/sparse.json b/eval/src/tests/eval/value_cache/sparse.json
index a80e7906286..f52ad888c61 100644
--- a/eval/src/tests/eval/value_cache/sparse.json
+++ b/eval/src/tests/eval/value_cache/sparse.json
@@ -2,5 +2,6 @@
     "dimensions": ["x","y"],
     "cells": [
         { "address": { "x": "foo", "y": "bar" }, "value": 1.0 },
+        { "address": { "x": 17, "y": 42 }, "value": 1742.0 },
         { "address": { "x": "bar", "y": "foo" }, "value": 2.0 }]
 }
diff --git a/eval/src/tests/eval/value_cache/sparse.json.lz4 b/eval/src/tests/eval/value_cache/sparse.json.lz4
index 0de6fae56e1..4064222d403 100644
--- a/eval/src/tests/eval/value_cache/sparse.json.lz4
+++ b/eval/src/tests/eval/value_cache/sparse.json.lz4
diff --git a/eval/src/tests/eval/value_cache/tensor_loader_test.cpp b/eval/src/tests/eval/value_cache/tensor_loader_test.cpp
index c10da861c83..ba2412d6f70 100644
--- a/eval/src/tests/eval/value_cache/tensor_loader_test.cpp
+++ b/eval/src/tests/eval/value_cache/tensor_loader_test.cpp
@@ -28,6 +28,7 @@ TensorSpec make_simple_dense_tensor() {
 
 TensorSpec make_sparse_tensor() {
     return TensorSpec("tensor(x{},y{})")
+        .add({{"x", "17"}, {"y", "42"}}, 1742.0)
         .add({{"x", "foo"}, {"y", "bar"}}, 1.0)
         .add({{"x", "bar"}, {"y", "foo"}}, 2.0);
 }
@@ -74,6 +75,10 @@ TEST_F("require that dense tensors can be loaded", ConstantTensorLoader(factory)
     TEST_DO(verify_tensor(make_dense_tensor(), f1.create(TEST_PATH("dense.json"), "tensor(x[2],y[2])")));
 }
 
+TEST_F("require that sparse tensors can be loaded", ConstantTensorLoader(factory)) {
+    TEST_DO(verify_tensor(make_sparse_tensor(), f1.create(TEST_PATH("sparse.json"), "tensor(x{},y{})")));
+}
+
 TEST_F("require that mixed tensors can be loaded", ConstantTensorLoader(factory)) {
     TEST_DO(verify_tensor(make_mixed_tensor(), f1.create(TEST_PATH("mixed.json"), "tensor(x{},y[2])")));
 }