diff options
| author | Haavard <havardpe@yahoo-inc.com> | 2016-09-07 10:37:31 +0000 |
|---|---|---|
| committer | Haavard <havardpe@yahoo-inc.com> | 2016-09-07 11:19:45 +0000 |
| commit | 362daa184516ba852e46ae9501e6744e526be21b (patch) | |
| tree | 341d2a2fbceb21209ba755e6323bf3afded68abf | |
| parent | 49076b17dbcba8bac9ec2c83f8ad2aea3ad15248 (diff) | |
tensors without dimensions are numbers
| -rw-r--r-- | vespalib/src/tests/tensor/tensor_type/tensor_type_test.cpp | 4 | ||||
| -rw-r--r-- | vespalib/src/vespa/vespalib/tensor/tensor_type.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/vespalib/src/tests/tensor/tensor_type/tensor_type_test.cpp b/vespalib/src/tests/tensor/tensor_type/tensor_type_test.cpp index 362e7dfbba4..1cb32d34149 100644 --- a/vespalib/src/tests/tensor/tensor_type/tensor_type_test.cpp +++ b/vespalib/src/tests/tensor/tensor_type/tensor_type_test.cpp @@ -279,8 +279,8 @@ TEST("require that tensor type can be converted to value type") { TensorType::sparse({"x", "y", "z"}).as_value_type()); EXPECT_EQUAL(ValueType::tensor_type({{"x", 10}, {"y", 20}, {"z", 30}}), TensorType::dense({{"x", 10}, {"y", 20}, {"z", 30}}).as_value_type()); - EXPECT_EQUAL(ValueType::tensor_type({}), TensorType::sparse({}).as_value_type()); - EXPECT_EQUAL(ValueType::tensor_type({}), TensorType::dense({}).as_value_type()); + EXPECT_EQUAL(ValueType::double_type(), TensorType::sparse({}).as_value_type()); + EXPECT_EQUAL(ValueType::double_type(), TensorType::dense({}).as_value_type()); } TEST("require that invalid tensor type spec is parsed as invalid") { diff --git a/vespalib/src/vespa/vespalib/tensor/tensor_type.cpp b/vespalib/src/vespa/vespalib/tensor/tensor_type.cpp index e52f45ab4c4..2aacd579aa2 100644 --- a/vespalib/src/vespa/vespalib/tensor/tensor_type.cpp +++ b/vespalib/src/vespa/vespalib/tensor/tensor_type.cpp @@ -113,7 +113,7 @@ TensorType::keep_dimensions_in(const TensorType &rhs) const ValueType TensorType::as_value_type() const { - if (is_number()) { + if (is_number() || (is_tensor() && dimensions().empty())) { return ValueType::double_type(); } if (is_tensor()) { |