Revert "Bratseth/emit float tensors in config"

4 files changed, 8 insertions, 8 deletions

diff --git a/config-model/src/test/derived/tensor/attributes.cfg b/config-model/src/test/derived/tensor/attributes.cfg
index a72772276a8..4b54e67f8b8 100644
--- a/config-model/src/test/derived/tensor/attributes.cfg
+++ b/config-model/src/test/derived/tensor/attributes.cfg
@@ -17,7 +17,7 @@ attribute[].arity 8
 attribute[].lowerbound -9223372036854775808
 attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
-attribute[].tensortype "tensor<float>(x[2],y[1])"
+attribute[].tensortype "tensor(x[2],y[])"
 attribute[].imported false
 attribute[].name "f3"
 attribute[].datatype TENSOR
diff --git a/config-model/src/test/derived/tensor/documenttypes.cfg b/config-model/src/test/derived/tensor/documenttypes.cfg
index fba11509ad8..56818298eb8 100644
--- a/config-model/src/test/derived/tensor/documenttypes.cfg
+++ b/config-model/src/test/derived/tensor/documenttypes.cfg
@@ -29,7 +29,7 @@ documenttype[].datatype[].sstruct.field[].name "f2"
 documenttype[].datatype[].sstruct.field[].id 2080644671
 documenttype[].datatype[].sstruct.field[].id_v6 1424572148
 documenttype[].datatype[].sstruct.field[].datatype 21
-documenttype[].datatype[].sstruct.field[].detailedtype "tensor<float>(x[2],y[1])"
+documenttype[].datatype[].sstruct.field[].detailedtype "tensor(x[2],y[])"
 documenttype[].datatype[].sstruct.field[].name "f3"
 documenttype[].datatype[].sstruct.field[].id 1295091863
 documenttype[].datatype[].sstruct.field[].id_v6 1444109654
diff --git a/config-model/src/test/derived/tensor/rank-profiles.cfg b/config-model/src/test/derived/tensor/rank-profiles.cfg
index 45233f3e1ca..471343da63c 100644
--- a/config-model/src/test/derived/tensor/rank-profiles.cfg
+++ b/config-model/src/test/derived/tensor/rank-profiles.cfg
@@ -1,6 +1,6 @@
 rankprofile[].name "default"
 rankprofile[].fef.property[].name "vespa.type.attribute.f2"
-rankprofile[].fef.property[].value "tensor<float>(x[2],y[1])"
+rankprofile[].fef.property[].value "tensor(x[2],y[])"
 rankprofile[].fef.property[].name "vespa.type.attribute.f3"
 rankprofile[].fef.property[].value "tensor(x{})"
 rankprofile[].fef.property[].name "vespa.type.attribute.f4"
@@ -15,7 +15,7 @@ rankprofile[].fef.property[].value "0"
 rankprofile[].fef.property[].name "vespa.dump.ignoredefaultfeatures"
 rankprofile[].fef.property[].value "true"
 rankprofile[].fef.property[].name "vespa.type.attribute.f2"
-rankprofile[].fef.property[].value "tensor<float>(x[2],y[1])"
+rankprofile[].fef.property[].value "tensor(x[2],y[])"
 rankprofile[].fef.property[].name "vespa.type.attribute.f3"
 rankprofile[].fef.property[].value "tensor(x{})"
 rankprofile[].fef.property[].name "vespa.type.attribute.f4"
@@ -26,7 +26,7 @@ rankprofile[].fef.property[].value "rankingExpression(firstphase)"
 rankprofile[].fef.property[].name "rankingExpression(firstphase).rankingScript"
 rankprofile[].fef.property[].value "reduce(map(attribute(f4), f(x)(x * x)) + reduce(tensor(x[2],y[3])(random), count) * rename(attribute(f4), (x, y), (y, x)), sum)"
 rankprofile[].fef.property[].name "vespa.type.attribute.f2"
-rankprofile[].fef.property[].value "tensor<float>(x[2],y[1])"
+rankprofile[].fef.property[].value "tensor(x[2],y[])"
 rankprofile[].fef.property[].name "vespa.type.attribute.f3"
 rankprofile[].fef.property[].value "tensor(x{})"
 rankprofile[].fef.property[].name "vespa.type.attribute.f4"
@@ -37,7 +37,7 @@ rankprofile[].fef.property[].value "rankingExpression(firstphase)"
 rankprofile[].fef.property[].name "rankingExpression(firstphase).rankingScript"
 rankprofile[].fef.property[].value "reduce(reduce(join(attribute(f4), tensor(x[2],y[2],z[3])((x==y)*(y==z)), f(a,b)(a * b)), sum, x), sum)"
 rankprofile[].fef.property[].name "vespa.type.attribute.f2"
-rankprofile[].fef.property[].value "tensor<float>(x[2],y[1])"
+rankprofile[].fef.property[].value "tensor(x[2],y[])"
 rankprofile[].fef.property[].name "vespa.type.attribute.f3"
 rankprofile[].fef.property[].value "tensor(x{})"
 rankprofile[].fef.property[].name "vespa.type.attribute.f4"
@@ -52,7 +52,7 @@ rankprofile[].fef.property[].value "rankingExpression(firstphase)"
 rankprofile[].fef.property[].name "rankingExpression(firstphase).rankingScript"
 rankprofile[].fef.property[].value "reduce(rankingExpression(joinedtensors), sum)"
 rankprofile[].fef.property[].name "vespa.type.attribute.f2"
-rankprofile[].fef.property[].value "tensor<float>(x[2],y[1])"
+rankprofile[].fef.property[].value "tensor(x[2],y[])"
 rankprofile[].fef.property[].name "vespa.type.attribute.f3"
 rankprofile[].fef.property[].value "tensor(x{})"
 rankprofile[].fef.property[].name "vespa.type.attribute.f4"
diff --git a/config-model/src/test/derived/tensor/tensor.sd b/config-model/src/test/derived/tensor/tensor.sd
index 3dee10b5f8a..e3e8cf43347 100644
--- a/config-model/src/test/derived/tensor/tensor.sd
+++ b/config-model/src/test/derived/tensor/tensor.sd
@@ -5,7 +5,7 @@ search tensor {
     field f1 type tensor(x[]) {
       indexing: summary
     }
-    field f2 type tensor<float>(x[2],y[1]) {
+    field f2 type tensor(x[2],y[]) {
       indexing: attribute
     }
     field f3 type tensor(x{}) {