diff options
author | Harald Musum <musum@yahooinc.com> | 2023-09-26 09:34:20 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-09-26 09:34:20 +0200 |
commit | 6829440c1dbcdd472b91fceaca86b43500e57f9d (patch) | |
tree | 28781e19bbb45749bfe61dc4ea2de8d0de2a5676 | |
parent | 4231e6077a18b6fdf96ac899a7301882ef50d742 (diff) |
Revert "Try to add back method removed from API but still in use"
-rw-r--r-- | config-model-api/src/main/java/com/yahoo/config/model/api/OnnxModelCost.java | 1 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/DefaultOnnxModelCost.java | 2 |
2 files changed, 1 insertions, 2 deletions
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 9507f7db7b6..595cd97e6b6 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 @@ -12,7 +12,6 @@ import com.yahoo.config.application.api.DeployLogger; */ public interface OnnxModelCost { - default Calculator newCalculator(DeployLogger logger) { return newCalculator(null, logger); } Calculator newCalculator(ApplicationPackage appPkg, DeployLogger logger); interface Calculator { diff --git a/config-model/src/main/java/com/yahoo/vespa/model/DefaultOnnxModelCost.java b/config-model/src/main/java/com/yahoo/vespa/model/DefaultOnnxModelCost.java index fddf8409376..9794cfe4ad7 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/DefaultOnnxModelCost.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/DefaultOnnxModelCost.java @@ -56,7 +56,7 @@ public class DefaultOnnxModelCost implements OnnxModelCost { String path = f.getPath().getRelative(); if (alreadyAnalyzed(path)) return; log.log(Level.FINE, () -> "Register model '%s'".formatted(path)); - if (f.exists() && appPkg != null) { + if (f.exists()) { var memoryStats = OnnxModelProbe.probeMemoryStats(appPkg, f.getPath()).orElse(null); if (memoryStats != null) { log.log(Level.FINE, () -> "Register model '%s' with memory stats: %s".formatted(path, memoryStats)); |