diff options
| author | Jon Bratseth <bratseth@gmail.com> | 2022-04-07 15:07:04 +0200 |
|---|---|---|
| committer | Jon Bratseth <bratseth@gmail.com> | 2022-04-07 15:07:04 +0200 |
| commit | fac065affc2d04e4b927e98a732b046fa73b43cf (patch) | |
| tree | be49e600826bc03584ce4b97076dcfdfe7cbfedf /config-model | |
| parent | 80fb04701abab984b773f438ff998312becf8d50 (diff) | |
No colon between name and type
Diffstat (limited to 'config-model')
4 files changed, 10 insertions, 10 deletions
diff --git a/config-model/src/main/javacc/IntermediateParser.jj b/config-model/src/main/javacc/IntermediateParser.jj index 6e056bdfe0c..4767c286f25 100644 --- a/config-model/src/main/javacc/IntermediateParser.jj +++ b/config-model/src/main/javacc/IntermediateParser.jj @@ -2061,7 +2061,7 @@ void inputs(ParsedRankProfile profile) : } { <INPUTS> <LBRACE> (<NL>)* - ( reference = queryFeature() <COLON> type = tensorType("Type of " + reference) { profile.addInput(reference, type); } (<NL>)*) * + ( reference = queryFeature() type = tensorType("Type of " + reference) { profile.addInput(reference, type); } (<NL>)*) * <RBRACE> } diff --git a/config-model/src/main/javacc/SDParser.jj b/config-model/src/main/javacc/SDParser.jj index c0a7113239e..81631a70dbd 100644 --- a/config-model/src/main/javacc/SDParser.jj +++ b/config-model/src/main/javacc/SDParser.jj @@ -2199,7 +2199,7 @@ void inputs(RankProfile profile) : } { <INPUTS> <LBRACE> (<NL>)* - ( reference = queryFeature() <COLON> type = tensorType("Type of " + reference) { profile.addInput(reference, type); } (<NL>)*) * + ( reference = queryFeature() type = tensorType("Type of " + reference) { profile.addInput(reference, type); } (<NL>)*) * <RBRACE> } diff --git a/config-model/src/test/derived/neuralnet_noqueryprofile/neuralnet.sd b/config-model/src/test/derived/neuralnet_noqueryprofile/neuralnet.sd index 8b2ccae34ef..4241e9dab85 100644 --- a/config-model/src/test/derived/neuralnet_noqueryprofile/neuralnet.sd +++ b/config-model/src/test/derived/neuralnet_noqueryprofile/neuralnet.sd @@ -72,12 +72,12 @@ search neuralnet { rank-profile defaultRankProfile inherits default { inputs { - query(W_0): tensor(x[9],hidden[9]) - query(b_0): tensor(hidden[9]) - query(W_1): tensor(hidden[9],out[9]) - query(b_1): tensor(out[9]) - query(W_out): tensor(out[9]) - query(b_out): tensor(out[1]) + query(W_0) tensor(x[9],hidden[9]) + query(b_0) tensor(hidden[9]) + query(W_1) tensor(hidden[9],out[9]) + query(b_1) tensor(out[9]) + query(W_out) tensor(out[9]) + query(b_out) tensor(out[1]) } constants { diff --git a/config-model/src/test/java/com/yahoo/vespa/model/test/utils/ApplicationPackageUtils.java b/config-model/src/test/java/com/yahoo/vespa/model/test/utils/ApplicationPackageUtils.java index 87e7501770e..952de2a6f40 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/test/utils/ApplicationPackageUtils.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/test/utils/ApplicationPackageUtils.java @@ -41,8 +41,8 @@ public class ApplicationPackageUtils { " }" + " rank-profile inputs {" + " inputs {" + - " query(foo): tensor<float>(x[10])" + - " query(bar): tensor(key{},x[1000])" + + " query(foo) tensor<float>(x[10])" + + " query(bar) tensor(key{},x[1000])" + " }" + " }" + "}"; |