diff options
| author | Arne Juul <arnej@yahoo-inc.com> | 2019-08-20 12:21:37 +0000 |
|---|---|---|
| committer | Arne Juul <arnej@yahoo-inc.com> | 2019-08-20 12:21:37 +0000 |
| commit | 7df067cfb84f0d6e00e87bf69276d7a353c9f972 (patch) | |
| tree | c537a1291c9f91a47e7a660cc49de11f722783bb /vespajlib/src/main/java/com/yahoo/tensor/functions/Join.java | |
| parent | d88f2b235136691dcf08014cca60121ad2e3b62a (diff) | |
use same rules for cell value type resolving as C++
* pick cell value type from tensors with dimensions only
* in Concat, use the expected combined cell value type for unit tensor
Diffstat (limited to 'vespajlib/src/main/java/com/yahoo/tensor/functions/Join.java')
| -rw-r--r-- | vespajlib/src/main/java/com/yahoo/tensor/functions/Join.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/vespajlib/src/main/java/com/yahoo/tensor/functions/Join.java b/vespajlib/src/main/java/com/yahoo/tensor/functions/Join.java index 062e0d92e80..2939b964f04 100644 --- a/vespajlib/src/main/java/com/yahoo/tensor/functions/Join.java +++ b/vespajlib/src/main/java/com/yahoo/tensor/functions/Join.java @@ -390,8 +390,7 @@ public class Join extends PrimitiveTensorFunction { private static TensorType commonDimensions(Tensor a, Tensor b) { TensorType aType = a.type(); TensorType bType = b.type(); - TensorType.Builder typeBuilder = new TensorType.Builder(TensorType.Value.largestOf(aType.valueType(), - bType.valueType())); + TensorType.Builder typeBuilder = new TensorType.Builder(TensorType.combinedValueType(aType, bType)); for (int i = 0; i < aType.dimensions().size(); ++i) { TensorType.Dimension aDim = aType.dimensions().get(i); for (int j = 0; j < bType.dimensions().size(); ++j) { |