diff options
| -rw-r--r-- | vespajlib/src/main/java/com/yahoo/tensor/functions/Concat.java | 12 |
1 files changed, 7 insertions, 5 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 43fa14713a7..ebb4dbcc3b6 100644 --- a/vespajlib/src/main/java/com/yahoo/tensor/functions/Concat.java +++ b/vespajlib/src/main/java/com/yahoo/tensor/functions/Concat.java @@ -191,7 +191,8 @@ public class Concat<NAMETYPE extends Name> extends PrimitiveTensorFunction<NAMET case concat: labels[out++] = String.valueOf(concatDimIdx); break; - //default: throw new IllegalArgumentException("cannot handle: "+how); + default: + throw new IllegalArgumentException("cannot handle: "+how); } } return TensorAddress.of(labels); @@ -244,7 +245,8 @@ public class Concat<NAMETYPE extends Name> extends PrimitiveTensorFunction<NAMET case concat: ccDimIndex = addr.numericLabel(i); break; - // default: throw new IllegalArgumentException("cannot handle: "+how.handleDims.get(i)); + default: + throw new IllegalArgumentException("cannot handle: "+how.handleDims.get(i)); } } TensorAddress commonAddr = TensorAddress.of(commonLabels); @@ -296,9 +298,9 @@ public class Concat<NAMETYPE extends Name> extends PrimitiveTensorFunction<NAMET public Tensor evaluate(EvaluationContext<NAMETYPE> context) { Tensor a = argumentA.evaluate(context); Tensor b = argumentB.evaluate(context); - // if (a instanceof IndexedTensor && b instanceof IndexedTensor) { - // return oldEvaluate(a, b); - // } + if (a instanceof IndexedTensor && b instanceof IndexedTensor) { + return oldEvaluate(a, b); + } var helper = new Helper(a, b, dimension); return helper.result; } |