Add option to use default signature for onnx models

1 files changed, 5 insertions, 2 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 1263b9bed6e..c42da6dcd19 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
@@ -172,13 +172,16 @@ public class ConvertedModel {
         ExpressionFunction expression = expressions.get(arguments.toName());
         if (expression != null) return expression;
 
-        if ( ! arguments.signature().isPresent()) {
+        expression = expressions.get("default." + arguments.toName());
+        if (expression != null) return expression;
+
+        if (arguments.signature().isEmpty()) {
             if (expressions.size() > 1)
                 throw new IllegalArgumentException("Multiple candidate expressions " + missingExpressionMessageSuffix());
             return expressions.values().iterator().next();
         }
 
-        if ( ! arguments.output().isPresent()) {
+        if (arguments.output().isEmpty()) {
             List<Map.Entry<String, ExpressionFunction>> entriesWithTheRightPrefix =
                     expressions.entrySet().stream().filter(entry -> entry.getKey().startsWith(arguments.signature().get() + ".")).collect(Collectors.toList());
             if (entriesWithTheRightPrefix.size() < 1)