diff options
author | Lester Solbakken <lesters@users.noreply.github.com> | 2019-07-09 12:12:15 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-07-09 12:12:15 +0200 |
commit | 6e667b63879e23f9ec74817d6dc2ba3bf124bb93 (patch) | |
tree | 7d730892d2857085b009d97a599c88cb8e6f95cc /vespajlib | |
parent | d9f23398047d5ff9fe9c068cc58fc2e310394c93 (diff) | |
parent | fde3e35a631fdfdbcf41a2466a65712b9a3f5ee2 (diff) |
Merge pull request #9996 from vespa-engine/havardpe/propagate-float-cell-type-and-avoid-using-it-too-much-right-now
propagate float and stop using it too much
Diffstat (limited to 'vespajlib')
-rw-r--r-- | vespajlib/src/main/java/com/yahoo/tensor/TensorType.java | 7 |
1 files changed, 6 insertions, 1 deletions
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; |