diff options
| author | Harald Musum <musum@yahooinc.com> | 2024-01-05 09:27:03 +0100 |
|---|---|---|
| committer | Harald Musum <musum@yahooinc.com> | 2024-01-05 09:27:03 +0100 |
| commit | 5490d78fb03dc5b05d6f52f311ac623868b234d6 (patch) | |
| tree | 771bf662ab40d9072d3a3455c7da441eba4bf9c0 /config-model-api | |
| parent | 690db20944acf2fa551c4b648959aae51496b40e (diff) | |
Simplify
Constructor with optional onnxmodeloptions is not used anymore
Diffstat (limited to 'config-model-api')
| -rw-r--r-- | config-model-api/abi-spec.json | 4 | ||||
| -rw-r--r-- | config-model-api/src/main/java/com/yahoo/config/model/api/OnnxModelCost.java | 14 |
2 files changed, 3 insertions, 15 deletions
diff --git a/config-model-api/abi-spec.json b/config-model-api/abi-spec.json index 79283641074..ccd256d0c88 100644 --- a/config-model-api/abi-spec.json +++ b/config-model-api/abi-spec.json @@ -1500,15 +1500,13 @@ ], "methods" : [ "public void <init>(java.lang.String, long, long, com.yahoo.config.model.api.OnnxModelOptions)", - "public void <init>(java.lang.String, long, long, java.util.Optional)", - "public com.yahoo.config.model.api.OnnxModelOptions options()", "public final java.lang.String toString()", "public final int hashCode()", "public final boolean equals(java.lang.Object)", "public java.lang.String modelId()", "public long estimatedCost()", "public long hash()", - "public java.util.Optional onnxModelOptions()" + "public com.yahoo.config.model.api.OnnxModelOptions onnxModelOptions()" ], "fields" : [ ] }, diff --git a/config-model-api/src/main/java/com/yahoo/config/model/api/OnnxModelCost.java b/config-model-api/src/main/java/com/yahoo/config/model/api/OnnxModelCost.java index 4764d501865..1efd98184cc 100644 --- a/config-model-api/src/main/java/com/yahoo/config/model/api/OnnxModelCost.java +++ b/config-model-api/src/main/java/com/yahoo/config/model/api/OnnxModelCost.java @@ -8,10 +8,10 @@ import com.yahoo.config.provision.ClusterSpec; import java.net.URI; import java.util.Map; -import java.util.Optional; /** * @author bjorncs + * @author hmusum */ public interface OnnxModelCost { @@ -31,17 +31,7 @@ public interface OnnxModelCost { void store(); } - record ModelInfo(String modelId, long estimatedCost, long hash, Optional<OnnxModelOptions> onnxModelOptions) { - - public ModelInfo(String modelId, long estimatedCost, long hash, OnnxModelOptions onnxModelOptions) { - this(modelId, estimatedCost, hash, Optional.of(onnxModelOptions)); - } - - public OnnxModelOptions options() { - return onnxModelOptions.orElseThrow(() -> new IllegalStateException("No onnxModelOptions exist")); - } - - } + record ModelInfo(String modelId, long estimatedCost, long hash, OnnxModelOptions onnxModelOptions) {} static OnnxModelCost disabled() { return new DisabledOnnxModelCost(); } |