Merge pull request #14450 from vespa-engine/lesters/explicit-onnx-config

Add explicit config for onnx models

1 files changed, 8 insertions, 4 deletions

diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/derived/RankProfileList.java b/config-model/src/main/java/com/yahoo/searchdefinition/derived/RankProfileList.java
index 00076c84532..84442fedc48 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/derived/RankProfileList.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/derived/RankProfileList.java
@@ -122,10 +122,14 @@ public class RankProfileList extends Derived implements RankProfilesConfig.Produ
         for (OnnxModel model : onnxModels.asMap().values()) {
             if ("".equals(model.getFileReference()))
                 log.warning("Illegal file reference " + model); // Let tests pass ... we should find a better way
-            else
-                builder.model(new OnnxModelsConfig.Model.Builder()
-                        .name(model.getName())
-                        .fileref(model.getFileReference()));
+            else {
+                OnnxModelsConfig.Model.Builder modelBuilder = new OnnxModelsConfig.Model.Builder();
+                modelBuilder.name(model.getName());
+                modelBuilder.fileref(model.getFileReference());
+                model.getInputMap().forEach(mapper -> modelBuilder.input(new OnnxModelsConfig.Model.Input.Builder().name(mapper.getOnnxName()).source(mapper.getVespaName())));
+                model.getOutputMap().forEach(mapper -> modelBuilder.output(new OnnxModelsConfig.Model.Output.Builder().name(mapper.getOnnxName()).as(mapper.getVespaName())));
+                builder.model(modelBuilder);
+            }
         }
     }
 }