diff options
author | Harald Musum <musum@yahooinc.com> | 2024-01-03 23:45:27 +0100 |
---|---|---|
committer | Harald Musum <musum@yahooinc.com> | 2024-01-03 23:45:27 +0100 |
commit | 7b84c88f35eb0abb4ae0eeed56239d9d3cada37d (patch) | |
tree | 44ceb64811836b8ad5adc4aa60b0a4a9ff151c5a /config-model-api | |
parent | 776ace0650b26fd6ba0e1452c81c139d7554834d (diff) |
Supply cluster id to OnnxModelCost
Diffstat (limited to 'config-model-api')
-rw-r--r-- | config-model-api/abi-spec.json | 5 | ||||
-rw-r--r-- | config-model-api/src/main/java/com/yahoo/config/model/api/OnnxModelCost.java | 9 |
2 files changed, 10 insertions, 4 deletions
diff --git a/config-model-api/abi-spec.json b/config-model-api/abi-spec.json index b4bf45d655a..e1081ebec99 100644 --- a/config-model-api/abi-spec.json +++ b/config-model-api/abi-spec.json @@ -1477,7 +1477,7 @@ ], "methods" : [ "public void <init>()", - "public com.yahoo.config.model.api.OnnxModelCost$Calculator newCalculator(com.yahoo.config.application.api.ApplicationPackage, com.yahoo.config.provision.ApplicationId)", + "public com.yahoo.config.model.api.OnnxModelCost$Calculator newCalculator(com.yahoo.config.application.api.ApplicationPackage, com.yahoo.config.provision.ApplicationId, com.yahoo.config.provision.ClusterSpec$Id)", "public long aggregatedModelCostInBytes()", "public void registerModel(com.yahoo.config.application.api.ApplicationFile, com.yahoo.config.model.api.OnnxModelOptions)", "public void registerModel(java.net.URI, com.yahoo.config.model.api.OnnxModelOptions)", @@ -1519,7 +1519,8 @@ "abstract" ], "methods" : [ - "public abstract com.yahoo.config.model.api.OnnxModelCost$Calculator newCalculator(com.yahoo.config.application.api.ApplicationPackage, com.yahoo.config.provision.ApplicationId)", + "public com.yahoo.config.model.api.OnnxModelCost$Calculator newCalculator(com.yahoo.config.application.api.ApplicationPackage, com.yahoo.config.provision.ApplicationId)", + "public abstract com.yahoo.config.model.api.OnnxModelCost$Calculator newCalculator(com.yahoo.config.application.api.ApplicationPackage, com.yahoo.config.provision.ApplicationId, com.yahoo.config.provision.ClusterSpec$Id)", "public static com.yahoo.config.model.api.OnnxModelCost disabled()" ], "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 17a0d64aac9..4764d501865 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 @@ -4,6 +4,7 @@ package com.yahoo.config.model.api; import com.yahoo.config.application.api.ApplicationFile; import com.yahoo.config.application.api.ApplicationPackage; import com.yahoo.config.provision.ApplicationId; +import com.yahoo.config.provision.ClusterSpec; import java.net.URI; import java.util.Map; @@ -14,7 +15,11 @@ import java.util.Optional; */ public interface OnnxModelCost { - Calculator newCalculator(ApplicationPackage appPkg, ApplicationId applicationId); + // TODO: Remove when no longer in use (oldest model version is 8.283) + default Calculator newCalculator(ApplicationPackage appPkg, ApplicationId applicationId) { + return newCalculator(appPkg, applicationId, null); + } + Calculator newCalculator(ApplicationPackage appPkg, ApplicationId applicationId, ClusterSpec.Id clusterId); interface Calculator { long aggregatedModelCostInBytes(); @@ -41,7 +46,7 @@ public interface OnnxModelCost { static OnnxModelCost disabled() { return new DisabledOnnxModelCost(); } class DisabledOnnxModelCost implements OnnxModelCost, Calculator { - @Override public Calculator newCalculator(ApplicationPackage appPkg, ApplicationId applicationId) { return this; } + @Override public Calculator newCalculator(ApplicationPackage appPkg, ApplicationId applicationId, ClusterSpec.Id clusterId) { return this; } @Override public long aggregatedModelCostInBytes() {return 0;} @Override public void registerModel(ApplicationFile path, OnnxModelOptions onnxModelOptions) {} @Override public void registerModel(URI uri, OnnxModelOptions onnxModelOptions) {} |