summaryrefslogtreecommitdiffstats
path: root/vespajlib
diff options
context:
space:
mode:
authorArne Juul <arnej@verizonmedia.com>2021-04-26 18:34:45 +0000
committerArne Juul <arnej@verizonmedia.com>2021-04-26 18:34:45 +0000
commitc65623b0c50c69c3dbc70e49e416d31c8d47f0f5 (patch)
treeb9021f4784574ddddc3d6f6bbaa8f24d8c41c5cd /vespajlib
parenta7cbead3cd8e9f9a762e60aff9cafa7405242334 (diff)
enable temporarily disabled code
Diffstat (limited to 'vespajlib')
-rw-r--r--vespajlib/src/main/java/com/yahoo/tensor/functions/Concat.java12
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;
}