From 2b10d02c9a931050faa8c3aab303949fcbe3fed0 Mon Sep 17 00:00:00 2001
From: Håvard Pettersen <havardpe@oath.com>
Date: Fri, 29 Jan 2021 13:04:51 +0000
Subject: do not allow generating free floats

---
 eval/src/tests/eval/gen_spec/gen_spec_test.cpp | 14 ++++++--------
 eval/src/vespa/eval/eval/test/gen_spec.cpp     |  2 +-
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/eval/src/tests/eval/gen_spec/gen_spec_test.cpp b/eval/src/tests/eval/gen_spec/gen_spec_test.cpp
index bf4f7006058..bae25a68760 100644
--- a/eval/src/tests/eval/gen_spec/gen_spec_test.cpp
+++ b/eval/src/tests/eval/gen_spec/gen_spec_test.cpp
@@ -52,19 +52,17 @@ TEST(GenSpec, default_spec) {
 
 //-----------------------------------------------------------------------------
 
-TensorSpec scalar_1   = TensorSpec("double").add({}, 1.0);
-TensorSpec scalar_1_f = TensorSpec("float").add({}, 1.0);
-TensorSpec scalar_5   = TensorSpec("double").add({}, 5.0);
-TensorSpec scalar_5_f = TensorSpec("float").add({}, 5.0);
+TensorSpec scalar_1 = TensorSpec("double").add({}, 1.0);
+TensorSpec scalar_5 = TensorSpec("double").add({}, 5.0);
 
 TEST(GenSpec, scalar_double) {
     EXPECT_EQ(GenSpec().gen(), scalar_1);
     EXPECT_EQ(GenSpec().seq_bias(5.0).gen(), scalar_5);
 }
 
-TEST(GenSpec, scalar_float) {
-    EXPECT_EQ(GenSpec().cells_float().gen(), scalar_1_f);
-    EXPECT_EQ(GenSpec().cells_float().seq_bias(5.0).gen(), scalar_5_f);
+TEST(GenSpec, not_scalar_float_just_yet) {
+    EXPECT_EQ(GenSpec().cells_float().gen(), scalar_1);
+    EXPECT_EQ(GenSpec().cells_float().seq_bias(5.0).gen(), scalar_5);
 }
 
 //-----------------------------------------------------------------------------
@@ -90,7 +88,7 @@ GenSpec dbl() { return GenSpec().cells_double(); }
 
 TEST(GenSpec, value_type) {
     EXPECT_EQ(dbl().type().to_spec(), "double");
-    EXPECT_EQ(flt().type().to_spec(), "float");
+    EXPECT_EQ(flt().type().to_spec(), "double"); // NB
     EXPECT_EQ(dbl().idx("x", 10).type().to_spec(), "tensor(x[10])");
     EXPECT_EQ(flt().idx("x", 10).type().to_spec(), "tensor<float>(x[10])");
     EXPECT_EQ(dbl().map("y", {}).type().to_spec(), "tensor(y{})");
diff --git a/eval/src/vespa/eval/eval/test/gen_spec.cpp b/eval/src/vespa/eval/eval/test/gen_spec.cpp
index c86b7a5836f..9c40c65620e 100644
--- a/eval/src/vespa/eval/eval/test/gen_spec.cpp
+++ b/eval/src/vespa/eval/eval/test/gen_spec.cpp
@@ -29,7 +29,7 @@ GenSpec::type() const
     for (const auto &dim: _dims) {
         dim_types.push_back(dim.type());
     }
-    auto type = ValueType::make_type(_cells, dim_types);
+    auto type = ValueType::tensor_type(dim_types, _cells);
     assert(!type.is_error());
     return type;
 }
-- 
cgit v1.2.3