diff options
3 files changed, 4 insertions, 4 deletions
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/expressiontransforms/ConvertedModel.java b/config-model/src/main/java/com/yahoo/searchdefinition/expressiontransforms/ConvertedModel.java index 6acb9ff1f7e..2f93bcc2e12 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/expressiontransforms/ConvertedModel.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/expressiontransforms/ConvertedModel.java @@ -624,7 +624,7 @@ public class ConvertedModel { private List<Pair<String, Tensor>> readSmallConstants() { try { ApplicationFile file = application.getFile(modelFiles.smallConstantsPath()); - if (!file.exists()) return Collections.emptyList(); + if ( ! file.exists()) return Collections.emptyList(); List<Pair<String, Tensor>> constants = new ArrayList<>(); BufferedReader reader = new BufferedReader(file.createReader()); @@ -701,7 +701,7 @@ public class ConvertedModel { } public Path smallConstantsPath() { - return storedModelPath().append("constants.txt"); + return storedModelReplicatedPath().append("constants.txt"); } /** Path to the large (ranking) constants directory */ diff --git a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/integration/ml/ModelImporter.java b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/integration/ml/ModelImporter.java index 9833e52cb61..38b98ceca75 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/integration/ml/ModelImporter.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/integration/ml/ModelImporter.java @@ -139,7 +139,7 @@ public abstract class ModelImporter { Value value = operation.getConstantValue().orElseThrow(() -> new IllegalArgumentException("Operation '" + operation.vespaName() + "' " + - "is constant but does not have a value.")); + "is constant but does not have a value.")); if ( ! (value instanceof TensorValue)) { return operation.function(); // scalar values are inserted directly into the expression } diff --git a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/transform/ConstantDereferencer.java b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/transform/ConstantDereferencer.java index 06d5ad187d8..a541eac2421 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/transform/ConstantDereferencer.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/transform/ConstantDereferencer.java @@ -12,7 +12,7 @@ import java.util.ArrayList; import java.util.List; /** - * Replaces constant reference pseudofeatures in expressions by their constant value + * Replaces constant reference pseudofeatures which are scalars by their constant value * * @author bratseth */ |