diff options
| author | Lester Solbakken <lesters@users.noreply.github.com> | 2019-09-26 22:14:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-26 22:14:31 +0200 |
| commit | 29ccb5bd910fcbbf1a874a0855b51eb16b7bab25 (patch) | |
| tree | e0b4482c6640a86c39840832a17024e61bd853d7 /config-model | |
| parent | 4fadd99eca043ceb8fbc0d796bc6542a69de6ddd (diff) | |
| parent | e44a0e7e2e662a3c82fcd6852a05523321e4ca93 (diff) | |
Merge pull request #10785 from vespa-engine/lesters/avoid-renaming-missing-dimensions
Lesters/avoid renaming missing dimensions
Diffstat (limited to 'config-model')
| -rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/ml/ConvertedModel.java | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/ml/ConvertedModel.java b/config-model/src/main/java/com/yahoo/vespa/model/ml/ConvertedModel.java index 877b1ac72a9..4acb47df179 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/ml/ConvertedModel.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/ml/ConvertedModel.java @@ -409,6 +409,24 @@ public class ConvertedModel { return reduceBatchDimensionExpression(tensorFunction, typeContext); } } + // Modify any renames in expression to disregard batch dimension + else if (children.size() == 1 && children.get(0) instanceof TensorFunctionNode) { + TensorFunction childFunction = (((TensorFunctionNode) children.get(0)).function()); + TensorType childType = childFunction.type(typeContext); + Rename rename = (Rename) tensorFunction; + List<String> from = new ArrayList<>(); + List<String> to = new ArrayList<>(); + for (TensorType.Dimension dimension : childType.dimensions()) { + int i = rename.fromDimensions().indexOf(dimension.name()); + if (i < 0) { + throw new IllegalArgumentException("Rename does not contain dimension '" + + dimension + "' in child expression type: " + childType); + } + from.add(rename.fromDimensions().get(i)); + to.add(rename.toDimensions().get(i)); + } + return new TensorFunctionNode(new Rename(childFunction, from, to)); + } } } if (node instanceof ReferenceNode) { |