Add feature falg for controlling onnx dryrun verification.

2 files changed, 10 insertions, 0 deletions

diff --git a/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java b/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java
index fe1bf93f32b..c62dc6e4631 100644
--- a/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java
+++ b/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java
@@ -63,6 +63,7 @@ public class TestProperties implements ModelContext.Properties, ModelContext.Fea
     private int maxMergeQueueSize = 1024;
     private int largeRankExpressionLimit = 0x10000;
     private boolean allowDisableMtls = true;
+    private boolean dryRunOnnxOnSetup = false;
     private List<X509Certificate> operatorCertificates = Collections.emptyList();
 
     @Override public ModelContext.FeatureFlags featureFlags() { return this; }
@@ -107,7 +108,12 @@ public class TestProperties implements ModelContext.Properties, ModelContext.Fea
     @Override public int largeRankExpressionLimit() { return largeRankExpressionLimit; }
     @Override public int maxConcurrentMergesPerNode() { return maxConcurrentMergesPerNode; }
     @Override public int maxMergeQueueSize() { return maxMergeQueueSize; }
+    @Override public boolean dryRunOnnxOnSetup() { return dryRunOnnxOnSetup; }
 
+    public TestProperties setDryRunOnnxOnSetup(boolean value) {
+        dryRunOnnxOnSetup = value;
+        return this;
+    }
     public TestProperties useExternalRankExpression(boolean value) {
         useExternalRankExpression = value;
         return this;
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 7c533cce006..1796a4cba17 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
@@ -35,6 +35,7 @@ public class RankProfileList extends Derived implements RankProfilesConfig.Produ
     private final RankingConstants rankingConstants;
     private final LargeRankExpressions largeRankExpressions;
     private final OnnxModels onnxModels;
+    private final boolean dryRunOnnxOnSetup;
 
     public static RankProfileList empty = new RankProfileList();
 
@@ -42,6 +43,7 @@ public class RankProfileList extends Derived implements RankProfilesConfig.Produ
         rankingConstants = new RankingConstants();
         largeRankExpressions = new LargeRankExpressions();
         onnxModels = new OnnxModels();
+        dryRunOnnxOnSetup = true;
     }
 
     /**
@@ -62,6 +64,7 @@ public class RankProfileList extends Derived implements RankProfilesConfig.Produ
         this.rankingConstants = rankingConstants;
         this.largeRankExpressions = largeRankExpressions;
         onnxModels = search == null ? new OnnxModels() : search.onnxModels();  // as ONNX models come from parsing rank expressions
+        dryRunOnnxOnSetup = deployProperties.featureFlags().dryRunOnnxOnSetup();
         deriveRankProfiles(rankProfileRegistry, queryProfiles, importedModels, search, attributeFields, deployProperties);
     }
 
@@ -137,6 +140,7 @@ public class RankProfileList extends Derived implements RankProfilesConfig.Produ
                 log.warning("Illegal file reference " + model); // Let tests pass ... we should find a better way
             else {
                 OnnxModelsConfig.Model.Builder modelBuilder = new OnnxModelsConfig.Model.Builder();
+                modelBuilder.dry_run_on_setup(dryRunOnnxOnSetup);
                 modelBuilder.name(model.getName());
                 modelBuilder.fileref(model.getFileReference());
                 model.getInputMap().forEach((name, source) -> modelBuilder.input(new OnnxModelsConfig.Model.Input.Builder().name(name).source(source)));