Make onnx feature an alias of onnxModel

4 files changed, 11 insertions, 10 deletions

diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/MapEvaluationTypeContext.java b/config-model/src/main/java/com/yahoo/searchdefinition/MapEvaluationTypeContext.java
index ab42e4d821a..9dcba72161b 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/MapEvaluationTypeContext.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/MapEvaluationTypeContext.java
@@ -218,7 +218,7 @@ public class MapEvaluationTypeContext extends FunctionReferenceContext implement
     }
 
     private Optional<TensorType> onnxFeatureType(Reference reference) {
-        if ( ! reference.name().equals("onnxModel"))
+        if ( ! reference.name().equals("onnxModel") && ! reference.name().equals("onnx"))
             return Optional.empty();
 
         if ( ! featureTypes.containsKey(reference)) {
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/expressiontransforms/OnnxFeatureConverter.java b/config-model/src/main/java/com/yahoo/searchdefinition/expressiontransforms/OnnxFeatureConverter.java
index d23a8376e7a..6a497460c5f 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/expressiontransforms/OnnxFeatureConverter.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/expressiontransforms/OnnxFeatureConverter.java
@@ -38,7 +38,7 @@ public class OnnxFeatureConverter extends ExpressionTransformer<RankProfileTrans
     }
 
     private ExpressionNode transformFeature(ReferenceNode feature, RankProfileTransformContext context) {
-        if ( ! feature.getName().equals("onnx") && ! feature.getName().equals("onnx_vespa")) return feature;
+        if ( ! feature.getName().equals("onnx_vespa")) return feature;
 
         try {
             FeatureArguments arguments = asFeatureArguments(feature.getArguments());
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/expressiontransforms/OnnxModelTransformer.java b/config-model/src/main/java/com/yahoo/searchdefinition/expressiontransforms/OnnxModelTransformer.java
index 69cdae10e47..a3acc64bd4a 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/expressiontransforms/OnnxModelTransformer.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/expressiontransforms/OnnxModelTransformer.java
@@ -27,6 +27,7 @@ import java.util.List;
  *     onnxModel("path/to/model").output
  *     onnxModel("path/to/model", "path/to/output")
  *     onnxModel("path/to/model", "unused", "path/to/output")    // signature is unused
+ *     onnx(...)   // same as with onnxModel, onnx is an alias of onnxModel
  *
  * To the format expected by the backend:
  *
@@ -55,7 +56,7 @@ public class OnnxModelTransformer extends ExpressionTransformer<RankProfileTrans
     public static ExpressionNode transformFeature(ReferenceNode feature, RankProfile rankProfile) {
         ImmutableSearch search = rankProfile.getSearch();
         final String featureName = feature.getName();
-        if ( ! featureName.equals("onnxModel")) return feature;
+        if ( ! featureName.equals("onnxModel") && ! featureName.equals("onnx")) return feature;
 
         Arguments arguments = feature.getArguments();
         if (arguments.isEmpty())
diff --git a/config-model/src/test/integration/onnx-model/schemas/test.sd b/config-model/src/test/integration/onnx-model/schemas/test.sd
index a87222e77ee..eac6f650fef 100644
--- a/config-model/src/test/integration/onnx-model/schemas/test.sd
+++ b/config-model/src/test/integration/onnx-model/schemas/test.sd
@@ -46,7 +46,7 @@ search test {
             expression: tensor(d0[2])(1)
         }
         first-phase {
-            expression: onnxModel(my_model).out{d0:1}
+            expression: onnx(my_model).out{d0:1}
         }
     }
 
@@ -61,7 +61,7 @@ search test {
             expression: my_function()
         }
         first-phase {
-            expression: onnxModel("files/model.onnx", "path/to/output:1"){d0:1}
+            expression: onnx("files/model.onnx", "path/to/output:1"){d0:1}
         }
     }
 
@@ -73,8 +73,8 @@ search test {
             expression: 1
         }
         summary-features {
-            onnxModel(another_model).out
-            onnxModel("files/summary_model.onnx", "path/to/output:2")
+            onnx(another_model).out
+            onnx("files/summary_model.onnx", "path/to/output:2")
         }
     }
 
@@ -83,7 +83,7 @@ search test {
             expression: tensor(d0[1],d1[2])(d1)
         }
         first-phase {
-            expression: onnxModel(dynamic_model){d0:0,d1:1}
+            expression: onnx(dynamic_model){d0:0,d1:1}
         }
     }
 
@@ -95,7 +95,7 @@ search test {
             expression: my_function_2()
         }
         first-phase {
-            expression: onnxModel(dynamic_model){d0:0,d1:2}
+            expression: onnx(dynamic_model){d0:0,d1:2}
         }
     }
 
@@ -104,7 +104,7 @@ search test {
             expression: tensor(d0[1],d1[2])(d1)
         }
         first-phase {
-            expression: onnxModel(unbound_model){d0:0,d1:1}
+            expression: onnx(unbound_model){d0:0,d1:1}
         }
     }