diff options
author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2019-12-18 15:46:50 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-12-18 15:46:50 +0100 |
commit | d57cfc7220266e90570ad4fe4e3140bc1a9093d6 (patch) | |
tree | 4a52a57198f23c697bbaac2ccb5d064599a5201b /model-integration | |
parent | f6ecb4c3ac4183a32d327205bb3e9cbf6fee52e8 (diff) |
Revert "Add option to use default signature for onnx models"
Diffstat (limited to 'model-integration')
3 files changed, 6 insertions, 6 deletions
diff --git a/model-integration/src/main/java/ai/vespa/rankingexpression/importer/IntermediateGraph.java b/model-integration/src/main/java/ai/vespa/rankingexpression/importer/IntermediateGraph.java index 16c1b913188..14aa3ebf84e 100644 --- a/model-integration/src/main/java/ai/vespa/rankingexpression/importer/IntermediateGraph.java +++ b/model-integration/src/main/java/ai/vespa/rankingexpression/importer/IntermediateGraph.java @@ -58,7 +58,7 @@ public class IntermediateGraph { return signatures.computeIfAbsent(signature, (k) -> new GraphSignature()).outputs; } - public static String defaultSignature() { + public String defaultSignature() { return "default"; } diff --git a/model-integration/src/main/java/ai/vespa/rankingexpression/importer/onnx/GraphImporter.java b/model-integration/src/main/java/ai/vespa/rankingexpression/importer/onnx/GraphImporter.java index 75ed19c010c..d42338deaf8 100644 --- a/model-integration/src/main/java/ai/vespa/rankingexpression/importer/onnx/GraphImporter.java +++ b/model-integration/src/main/java/ai/vespa/rankingexpression/importer/onnx/GraphImporter.java @@ -151,7 +151,7 @@ class GraphImporter { OrderedTensorType type = TypeConverter.typeFrom(valueInfoProto.getType()); operation = new Argument(intermediateGraph.name(), valueInfoProto.getName(), type); - intermediateGraph.inputs(IntermediateGraph.defaultSignature()) + intermediateGraph.inputs(intermediateGraph.defaultSignature()) .put(IntermediateOperation.namePartOf(name), operation.vespaName()); } else if (isConstantTensor(name, onnxGraph)) { @@ -171,7 +171,7 @@ class GraphImporter { } if (isOutputNode(name, onnxGraph)) { - intermediateGraph.outputs(IntermediateGraph.defaultSignature()) + intermediateGraph.outputs(intermediateGraph.defaultSignature()) .put(IntermediateOperation.namePartOf(name), operation.name()); } } @@ -238,7 +238,7 @@ class GraphImporter { } private static void verifyNoWarnings(IntermediateGraph intermediateGraph) { - for (java.util.Map.Entry<String, String> output : intermediateGraph.outputs(IntermediateGraph.defaultSignature()).entrySet()) { + for (java.util.Map.Entry<String, String> output : intermediateGraph.outputs(intermediateGraph.defaultSignature()).entrySet()) { IntermediateOperation operation = intermediateGraph.get(output.getValue()); Set<String> warnings = getWarnings(operation); if (warnings.size() > 0) { @@ -248,7 +248,7 @@ class GraphImporter { } private static void verifyOutputTypes(Onnx.GraphProto onnxGraph, IntermediateGraph intermediateGraph) { - for (java.util.Map.Entry<String, String> output : intermediateGraph.outputs(IntermediateGraph.defaultSignature()).entrySet()) { + for (java.util.Map.Entry<String, String> output : intermediateGraph.outputs(intermediateGraph.defaultSignature()).entrySet()) { IntermediateOperation operation = intermediateGraph.get(output.getValue()); Onnx.ValueInfoProto onnxNode = getOutputNode(output.getKey(), onnxGraph); OrderedTensorType type = operation.type().orElseThrow( diff --git a/model-integration/src/test/java/ai/vespa/rankingexpression/importer/onnx/OnnxOperationsTestCase.java b/model-integration/src/test/java/ai/vespa/rankingexpression/importer/onnx/OnnxOperationsTestCase.java index 9927f4df04f..6954abe5157 100644 --- a/model-integration/src/test/java/ai/vespa/rankingexpression/importer/onnx/OnnxOperationsTestCase.java +++ b/model-integration/src/test/java/ai/vespa/rankingexpression/importer/onnx/OnnxOperationsTestCase.java @@ -391,7 +391,7 @@ public class OnnxOperationsTestCase { private TensorFunction optimizeAndRename(String opName, IntermediateOperation op) { IntermediateGraph graph = new IntermediateGraph(modelName); graph.put(opName, op); - graph.outputs(IntermediateGraph.defaultSignature()).put(opName, opName); + graph.outputs(graph.defaultSignature()).put(opName, opName); graph.optimize(); return op.function().get(); } |