diff options
author | Lester Solbakken <lesters@oath.com> | 2019-09-19 15:03:41 +0200 |
---|---|---|
committer | Lester Solbakken <lesters@oath.com> | 2019-09-19 15:03:41 +0200 |
commit | b6e4d92c3996270ab9397a8c7a06eb909b88b6a7 (patch) | |
tree | b3a6e15910d455a81149e481bacc63e445a8d690 /model-integration/src/main/java/ai/vespa/rankingexpression/importer/operations | |
parent | d082531b8c6244de5bc99ed887f706be3a1084df (diff) |
Avoid rename operations for tensorflow protobuf constants
Diffstat (limited to 'model-integration/src/main/java/ai/vespa/rankingexpression/importer/operations')
-rw-r--r-- | model-integration/src/main/java/ai/vespa/rankingexpression/importer/operations/Const.java | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/model-integration/src/main/java/ai/vespa/rankingexpression/importer/operations/Const.java b/model-integration/src/main/java/ai/vespa/rankingexpression/importer/operations/Const.java index fc59ad35ef8..3ad5cb1d19f 100644 --- a/model-integration/src/main/java/ai/vespa/rankingexpression/importer/operations/Const.java +++ b/model-integration/src/main/java/ai/vespa/rankingexpression/importer/operations/Const.java @@ -20,7 +20,6 @@ import java.util.Optional; public class Const extends IntermediateOperation { private final AttributeMap attributeMap; - private OrderedTensorType standardNamingType; // using standard naming convention: d0, d1, ... public Const(String modelName, String nodeName, @@ -30,7 +29,6 @@ public class Const extends IntermediateOperation { super(modelName, nodeName, inputs); this.attributeMap = attributeMap; this.type = type.rename(vespaName() + "_"); - standardNamingType = OrderedTensorType.standardType(type); setConstantValue(value()); } @@ -55,13 +53,7 @@ public class Const extends IntermediateOperation { } else { expressionNode = new ReferenceNode(Reference.simple("constant", vespaName())); } - TensorFunction output = new TensorFunctionNode.TensorFunctionExpressionNode(expressionNode); - if ( ! standardNamingType.equals(type)) { - List<String> renameFrom = standardNamingType.dimensionNames(); - List<String> renameTo = type.dimensionNames(); - output = new Rename(output, renameFrom, renameTo); - } - return output; + return new TensorFunctionNode.TensorFunctionExpressionNode(expressionNode); } /** Constant names are prefixed by "modelName_" to avoid name conflicts between models */ |