aboutsummaryrefslogtreecommitdiffstats
path: root/config-model
diff options
context:
space:
mode:
authorHarald Musum <musum@yahooinc.com>2023-12-10 23:22:50 +0100
committerHarald Musum <musum@yahooinc.com>2023-12-10 23:22:50 +0100
commit434123d31726641d1bd554e21d9a717e410694b6 (patch)
treee0aee16de349e4e834a16b6932548103212fd5c1 /config-model
parent6fe24af8450a78b97bb2dccfd53cfa80cfdb7f65 (diff)
Consider options not being present for one of the models as well
Diffstat (limited to 'config-model')
-rw-r--r--config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/RestartOnDeployForOnnxModelChangesValidator.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/RestartOnDeployForOnnxModelChangesValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/RestartOnDeployForOnnxModelChangesValidator.java
index 5f3dbb07479..c72be979a16 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/RestartOnDeployForOnnxModelChangesValidator.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/RestartOnDeployForOnnxModelChangesValidator.java
@@ -60,8 +60,9 @@ public class RestartOnDeployForOnnxModelChangesValidator implements ChangeValida
private Optional<String> modelChanged(OnnxModelCost.ModelInfo a, OnnxModelCost.ModelInfo b) {
if (a.estimatedCost() != b.estimatedCost()) return Optional.of("estimated cost");
if (a.hash() != b.hash()) return Optional.of("model hash");
- if (a.onnxModelOptions().isPresent() && b.onnxModelOptions().isPresent()
- && ! a.onnxModelOptions().get().equals(b.onnxModelOptions().get()))
+ if (a.onnxModelOptions().isPresent() && b.onnxModelOptions().isEmpty()) return Optional.of("model option(s)");
+ if (a.onnxModelOptions().isEmpty() && b.onnxModelOptions().isPresent()) return Optional.of("model option(s)");
+ if (a.onnxModelOptions().isPresent() && ! a.onnxModelOptions().get().equals(b.onnxModelOptions().get()))
return Optional.of("model option(s)");
return Optional.empty();
}