aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarald Musum <musum@yahooinc.com>2023-09-25 19:47:35 +0200
committerHarald Musum <musum@yahooinc.com>2023-09-25 19:47:35 +0200
commit8f010aec706f1c53b5d2d6775ddcbd61e234ae2e (patch)
treed7af7fa3c55dd1d157d2e1bd2ae8cbdf282d1eb4
parent27472f94770a6644d44b765cedf802d8bb38ac03 (diff)
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.java1
-rw-r--r--config-model/src/main/java/com/yahoo/vespa/model/DefaultOnnxModelCost.java2
2 files changed, 2 insertions, 1 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 595cd97e6b6..9507f7db7b6 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,6 +12,7 @@ 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 9794cfe4ad7..fddf8409376 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()) {
+ if (f.exists() && appPkg != null) {
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));