diff options
| author | Harald Musum <musum@yahooinc.com> | 2023-10-26 13:33:42 +0200 |
|---|---|---|
| committer | Harald Musum <musum@yahooinc.com> | 2023-10-26 13:33:42 +0200 |
| commit | f3b406ef3a704b4bb7a25b477a5f6cd776f4870b (patch) | |
| tree | 7a50eea958cf8c3b1c88f8fa5d534269e450d40c /config-model-api | |
| parent | 444b2217bc11103d01a1262c9baa84ee3a4eb4ef (diff) | |
Add default implementation to interface
Diffstat (limited to 'config-model-api')
| -rw-r--r-- | config-model-api/abi-spec.json | 3 | ||||
| -rw-r--r-- | config-model-api/src/main/java/com/yahoo/config/model/api/OnnxModelCost.java | 7 |
2 files changed, 6 insertions, 4 deletions
diff --git a/config-model-api/abi-spec.json b/config-model-api/abi-spec.json index 5d9ae6bc26e..ce73f8300db 100644 --- a/config-model-api/abi-spec.json +++ b/config-model-api/abi-spec.json @@ -1471,7 +1471,6 @@ ], "methods" : [ "public void <init>()", - "public com.yahoo.config.model.api.OnnxModelCost$Calculator newCalculator(com.yahoo.config.application.api.ApplicationPackage, com.yahoo.config.application.api.DeployLogger)", "public com.yahoo.config.model.api.OnnxModelCost$Calculator newCalculator(com.yahoo.config.application.api.ApplicationPackage, com.yahoo.config.provision.ApplicationId)", "public long aggregatedModelCostInBytes()", "public void registerModel(com.yahoo.config.application.api.ApplicationFile)", @@ -1488,7 +1487,7 @@ "abstract" ], "methods" : [ - "public abstract com.yahoo.config.model.api.OnnxModelCost$Calculator newCalculator(com.yahoo.config.application.api.ApplicationPackage, com.yahoo.config.application.api.DeployLogger)", + "public com.yahoo.config.model.api.OnnxModelCost$Calculator newCalculator(com.yahoo.config.application.api.ApplicationPackage, com.yahoo.config.application.api.DeployLogger)", "public abstract com.yahoo.config.model.api.OnnxModelCost$Calculator newCalculator(com.yahoo.config.application.api.ApplicationPackage, com.yahoo.config.provision.ApplicationId)", "public static com.yahoo.config.model.api.OnnxModelCost disabled()" ], 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 02a32852e08..abfddfe40be 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 @@ -14,7 +14,11 @@ import java.net.URI; */ public interface OnnxModelCost { - Calculator newCalculator(ApplicationPackage appPkg, DeployLogger deployLogger); // TODO: Remove when 8.249 is oldest model in use + // TODO: Remove when 8.250 is oldest model in use + default Calculator newCalculator(ApplicationPackage appPkg, DeployLogger deployLogger) { + return newCalculator(appPkg, ApplicationId.defaultId()); + } + Calculator newCalculator(ApplicationPackage appPkg, ApplicationId applicationId); interface Calculator { @@ -26,7 +30,6 @@ public interface OnnxModelCost { static OnnxModelCost disabled() { return new DisabledOnnxModelCost(); } class DisabledOnnxModelCost implements OnnxModelCost, Calculator { - @Override public Calculator newCalculator(ApplicationPackage appPkg, DeployLogger deployLogger) { return this; } @Override public Calculator newCalculator(ApplicationPackage appPkg, ApplicationId applicationId) { return this; } @Override public long aggregatedModelCostInBytes() {return 0;} @Override public void registerModel(ApplicationFile path) {} |