From fde3e35a631fdfdbcf41a2466a65712b9a3f5ee2 Mon Sep 17 00:00:00 2001 From: Håvard Pettersen Date: Tue, 9 Jul 2019 08:59:07 +0000 Subject: propagate float and stop using it too much --- vespajlib/src/main/java/com/yahoo/tensor/TensorType.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'vespajlib/src/main/java') diff --git a/vespajlib/src/main/java/com/yahoo/tensor/TensorType.java b/vespajlib/src/main/java/com/yahoo/tensor/TensorType.java index 8e566fac0b6..9869f1e908c 100644 --- a/vespajlib/src/main/java/com/yahoo/tensor/TensorType.java +++ b/vespajlib/src/main/java/com/yahoo/tensor/TensorType.java @@ -168,7 +168,11 @@ public class TensorType { @Override public String toString() { - return "tensor(" + dimensions.stream().map(Dimension::toString).collect(Collectors.joining(",")) + ")"; + if ((rank() == 0) || (valueType == Value.DOUBLE)) { + return "tensor(" + dimensions.stream().map(Dimension::toString).collect(Collectors.joining(",")) + ")"; + } else { + return "tensor<" + valueType + ">(" + dimensions.stream().map(Dimension::toString).collect(Collectors.joining(",")) + ")"; + } } @Override @@ -177,6 +181,7 @@ public class TensorType { if (o == null || getClass() != o.getClass()) return false; TensorType other = (TensorType)o; + if ( (this.rank() == 0) && (other.rank() == 0)) return true; if ( this.valueType != other.valueType) return false; if ( ! this.dimensions.equals(other.dimensions)) return false; return true; -- cgit v1.2.3