aboutsummaryrefslogtreecommitdiffstats
path: root/vespajlib/src/main/java/com/yahoo/tensor/functions/Concat.java
diff options
context:
space:
mode:
authorLester Solbakken <lesters@yahoo-inc.com>2017-11-16 10:54:01 +0100
committerLester Solbakken <lesters@yahoo-inc.com>2017-11-16 10:54:01 +0100
commitac09f9c90be29e19583d78649807a9587118741b (patch)
tree1fc7bd1779012abe0fe9b1a6c8bd60ca54e69456 /vespajlib/src/main/java/com/yahoo/tensor/functions/Concat.java
parent05adec4027b7af6954f42b5172792caf1d912827 (diff)
Java tensors: support unequal size when concatenating
Diffstat (limited to 'vespajlib/src/main/java/com/yahoo/tensor/functions/Concat.java')
-rw-r--r--vespajlib/src/main/java/com/yahoo/tensor/functions/Concat.java4
1 files changed, 1 insertions, 3 deletions
diff --git a/vespajlib/src/main/java/com/yahoo/tensor/functions/Concat.java b/vespajlib/src/main/java/com/yahoo/tensor/functions/Concat.java
index 401f9a10eda..1dbb94fdb20 100644
--- a/vespajlib/src/main/java/com/yahoo/tensor/functions/Concat.java
+++ b/vespajlib/src/main/java/com/yahoo/tensor/functions/Concat.java
@@ -134,9 +134,7 @@ public class Concat extends PrimitiveTensorFunction {
if (currentDimension.equals(concatDimension))
concatSizes.set(i, aSize + bSize);
else if (aSize != 0 && bSize != 0 && aSize!=bSize )
- throw new IllegalArgumentException("Dimension " + currentDimension + " must be of the same size when " +
- "concatenating " + a.type() + " and " + b.type() + " along dimension " +
- concatDimension + ", but was " + aSize + " and " + bSize);
+ concatSizes.set(i, Math.min(aSize, bSize));
else
concatSizes.set(i, Math.max(aSize, bSize));
}