Merge pull request #22269 from vespa-engine/bratseth/inputs-4

Test input inheritance

3 files changed, 18 insertions, 2 deletions

diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/RankProfile.java b/config-model/src/main/java/com/yahoo/searchdefinition/RankProfile.java
index 893595befd3..029c0efb55f 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/RankProfile.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/RankProfile.java
@@ -773,7 +773,7 @@ public class RankProfile implements Cloneable {
                                                        input.getValue() + ", with type " + input.getValue() + "" +
                                                        " but this input is already defined with type " + existingType +
                                                        " in another profile this inherits");
-                inputs.put(input.getKey(), input.getValue());
+                allInputs.put(input.getKey(), input.getValue());
             }
         }
         allInputs.putAll(inputs);
diff --git a/config-model/src/test/derived/neuralnet_noqueryprofile/neuralnet.sd b/config-model/src/test/derived/neuralnet_noqueryprofile/neuralnet.sd
index 4241e9dab85..9069f59bbe3 100644
--- a/config-model/src/test/derived/neuralnet_noqueryprofile/neuralnet.sd
+++ b/config-model/src/test/derived/neuralnet_noqueryprofile/neuralnet.sd
@@ -69,7 +69,7 @@ search neuralnet {
 
     }
 
-    rank-profile defaultRankProfile inherits default {
+    rank-profile default {
 
         inputs {
             query(W_0)   tensor(x[9],hidden[9])
@@ -80,6 +80,10 @@ search neuralnet {
             query(b_out) tensor(out[1])
         }
 
+    }
+
+    rank-profile defaultRankProfile inherits default {
+
         constants {
             maxSignedSixtyFourBitInteger: 9223372036854775807
         }
diff --git a/config-model/src/test/derived/neuralnet_noqueryprofile/rank-profiles.cfg b/config-model/src/test/derived/neuralnet_noqueryprofile/rank-profiles.cfg
index 9c3cfd28b9a..f5134dd15f9 100644
--- a/config-model/src/test/derived/neuralnet_noqueryprofile/rank-profiles.cfg
+++ b/config-model/src/test/derived/neuralnet_noqueryprofile/rank-profiles.cfg
@@ -1,4 +1,16 @@
 rankprofile[].name "default"
+rankprofile[].fef.property[].name "vespa.type.query.W_0"
+rankprofile[].fef.property[].value "tensor(hidden[9],x[9])"
+rankprofile[].fef.property[].name "vespa.type.query.b_0"
+rankprofile[].fef.property[].value "tensor(hidden[9])"
+rankprofile[].fef.property[].name "vespa.type.query.W_1"
+rankprofile[].fef.property[].value "tensor(hidden[9],out[9])"
+rankprofile[].fef.property[].name "vespa.type.query.b_1"
+rankprofile[].fef.property[].value "tensor(out[9])"
+rankprofile[].fef.property[].name "vespa.type.query.W_out"
+rankprofile[].fef.property[].value "tensor(out[9])"
+rankprofile[].fef.property[].name "vespa.type.query.b_out"
+rankprofile[].fef.property[].value "tensor(out[1])"
 rankprofile[].name "unranked"
 rankprofile[].fef.property[].name "vespa.rank.firstphase"
 rankprofile[].fef.property[].value "value(0)"