From baa9c48be8732564e00730efe680df26a8f47f4c Mon Sep 17 00:00:00 2001 From: Arne Juul Date: Mon, 20 Mar 2023 12:19:34 +0000 Subject: use withTransformedExpressions for wiring --- .../ai/vespa/models/evaluation/BindingExtractor.java | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) (limited to 'model-evaluation/src') diff --git a/model-evaluation/src/main/java/ai/vespa/models/evaluation/BindingExtractor.java b/model-evaluation/src/main/java/ai/vespa/models/evaluation/BindingExtractor.java index bc71e51655c..8cdd5387acd 100644 --- a/model-evaluation/src/main/java/ai/vespa/models/evaluation/BindingExtractor.java +++ b/model-evaluation/src/main/java/ai/vespa/models/evaluation/BindingExtractor.java @@ -96,6 +96,11 @@ class BindingExtractor { for (ExpressionNode child : tfn.children()) { result.merge(extractBindTargets(child)); } + // ignore return value: + tfn.withTransformedExpressions(expr -> { + result.merge(extractBindTargets(expr)); + return expr; + }); var f = tfn.function(); if (f instanceof Generate) { var tt = f.type(null); @@ -103,20 +108,6 @@ class BindingExtractor { result.removeTarget(dim.name()); } } - else if (f instanceof Slice s) { - for (var selectorFunc : s.selectorFunctions()) { - if (selectorFunc instanceof TensorFunctionNode.ExpressionTensorFunction expr) { - result.merge(extractBindTargets(expr.wrappedExpression())); - } - } - } - else if (f instanceof DynamicTensor d) { - for (var tf : d.cellGeneratorFunctions()) { - if (tf instanceof TensorFunctionNode.ExpressionTensorFunction expr) { - result.merge(extractBindTargets(expr.wrappedExpression())); - } - } - } return result; } else if (isOnnx(node)) { -- cgit v1.2.3