diff options
author | Lester Solbakken <lesters@users.noreply.github.com> | 2018-02-05 15:42:49 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-02-05 15:42:49 +0100 |
commit | 45da6a8b2aab6defe1b6c26133be84de6829df28 (patch) | |
tree | f0384c839befe6e354f358ef9740b899d3cbd565 | |
parent | 24094168ea91eb1663d9fe2f40b8ba62b552ce19 (diff) | |
parent | 3d87bf891490138cce7d3fad9cc342f29ccd8600 (diff) |
Merge pull request #4922 from vespa-engine/bratseth/add-logging
Add logging when adding a constant
4 files changed, 10 insertions, 5 deletions
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/expressiontransforms/ConstantTensorTransformer.java b/config-model/src/main/java/com/yahoo/searchdefinition/expressiontransforms/ConstantTensorTransformer.java index 543ac78fc86..6b9d6c3e3ac 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/expressiontransforms/ConstantTensorTransformer.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/expressiontransforms/ConstantTensorTransformer.java @@ -34,7 +34,7 @@ public class ConstantTensorTransformer extends ExpressionTransformer<RankProfile } private ExpressionNode transformFeature(ReferenceNode node, RankProfileTransformContext context) { - if (!node.getArguments().isEmpty()) { + if ( ! node.getArguments().isEmpty()) { return transformArguments(node, context); } else { return transformConstantReference(node, context); diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/expressiontransforms/TensorFlowFeatureConverter.java b/config-model/src/main/java/com/yahoo/searchdefinition/expressiontransforms/TensorFlowFeatureConverter.java index 6c4a5dae4cb..495ca7dd14a 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/expressiontransforms/TensorFlowFeatureConverter.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/expressiontransforms/TensorFlowFeatureConverter.java @@ -34,6 +34,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Optional; +import java.util.logging.Logger; /** * Replaces instances of the tensorflow(model-path, signature, output) @@ -45,6 +46,8 @@ import java.util.Optional; // TODO: Avoid name conflicts across models for constants public class TensorFlowFeatureConverter extends ExpressionTransformer<RankProfileTransformContext> { + private static final Logger log = Logger.getLogger(TensorFlowFeatureConverter.class.getName()); + private final TensorFlowImporter tensorFlowImporter = new TensorFlowImporter(); /** A cache of imported models indexed by model path. This avoids importing the same model multiple times. */ @@ -158,9 +161,11 @@ public class TensorFlowFeatureConverter extends ExpressionTransformer<RankProfil private void transformConstant(ModelStore store, RankProfile profile, String constantName, Tensor constantValue) { Path constantPath = store.writeConstant(constantName, constantValue); - if ( ! profile.getSearch().getRankingConstants().containsKey(constantName)) + if ( ! profile.getSearch().getRankingConstants().containsKey(constantName)) { + log.info("Adding constant '" + constantName + "' of type " + constantValue.type()); profile.getSearch().addRankingConstant(new RankingConstant(constantName, constantValue.type(), constantPath.toString())); + } } private String skippedOutputsDescription(TensorFlowModel.Signature signature) { diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/RankSetupValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/RankSetupValidator.java index ee9cb2d564a..721e1c08989 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/RankSetupValidator.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/RankSetupValidator.java @@ -36,9 +36,9 @@ import java.util.logging.Logger; * by running through the binary 'vespa-verify-ranksetup' * * @author vegardh - * */ public class RankSetupValidator extends Validator { + private static final Logger log = Logger.getLogger(RankSetupValidator.class.getName()); private final boolean force; @@ -60,7 +60,7 @@ public class RankSetupValidator extends Validator { final String name = docDb.getDerivedConfiguration().getSearch().getName(); String searchDir = clusterDir + name + "/"; writeConfigs(searchDir, docDb); - if (!validate("dir:" + searchDir, sc, name, deployState.getDeployLogger(), cfgDir)) { + if ( ! validate("dir:" + searchDir, sc, name, deployState.getDeployLogger(), cfgDir)) { return; } } 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 216b677f6ff..9cd4f4dced9 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 "features" which found in the given constants by their constant value + * Replaces constant reference pseudofeatures in expressions by their constant value * * @author bratseth */ |