diff options
| author | Harald Musum <musum@yahooinc.com> | 2023-05-08 19:12:11 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-08 19:12:11 +0200 |
| commit | 0a187b361368673d99a465df438f206f2f66297e (patch) | |
| tree | 8f0787e8e43ea79f5fa3072e4d19b51eb3c1b9c1 /searchcore/src/apps/verify_ranksetup | |
| parent | f7692f30240fd7e10f145aaa522194f926683d71 (diff) | |
Revert "Move ranking config to configdefinitions module"
Diffstat (limited to 'searchcore/src/apps/verify_ranksetup')
| -rw-r--r-- | searchcore/src/apps/verify_ranksetup/verify_ranksetup.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/searchcore/src/apps/verify_ranksetup/verify_ranksetup.cpp b/searchcore/src/apps/verify_ranksetup/verify_ranksetup.cpp index d80604919de..deba3925eb1 100644 --- a/searchcore/src/apps/verify_ranksetup/verify_ranksetup.cpp +++ b/searchcore/src/apps/verify_ranksetup/verify_ranksetup.cpp @@ -4,10 +4,7 @@ #include "config-verify-ranksetup.h" #include <vespa/config-attributes.h> #include <vespa/config-indexschema.h> -#include <vespa/config-onnx-models.h> #include <vespa/config-rank-profiles.h> -#include <vespa/config-ranking-constants.h> -#include <vespa/config-ranking-expressions.h> #include <vespa/config/helper/legacy.h> #include <vespa/config/common/configcontext.h> #include <vespa/config/common/exceptions.h> @@ -16,11 +13,14 @@ #include <vespa/eval/eval/fast_value.h> #include <vespa/eval/eval/value_codec.h> #include <vespa/searchcommon/common/schemaconfigurer.h> +#include <vespa/searchcore/config/config-ranking-constants.h> +#include <vespa/searchcore/config/config-ranking-expressions.h> +#include <vespa/searchcore/config/config-onnx-models.h> #include <vespa/searchcore/proton/matching/indexenvironment.h> +#include <vespa/searchcore/proton/matching/ranking_expressions.h> +#include <vespa/searchcore/proton/matching/onnx_models.h> #include <vespa/searchlib/features/setup.h> #include <vespa/searchlib/fef/fef.h> -#include <vespa/searchlib/fef/onnx_models.h> -#include <vespa/searchlib/fef/ranking_expressions.h> #include <vespa/searchlib/fef/test/plugin/setup.h> #include <vespa/config/subscription/configsubscriber.hpp> #include <vespa/vespalib/util/stringfmt.h> @@ -33,9 +33,9 @@ using config::ConfigRuntimeException; using config::ConfigSubscriber; using config::IConfigContext; using config::InvalidConfigException; -using search::fef::IRankingAssetsRepo; -using search::fef::OnnxModels; -using search::fef::RankingExpressions; +using proton::matching::IRankingAssetsRepo; +using proton::matching::RankingExpressions; +using proton::matching::OnnxModels; using vespa::config::search::AttributesConfig; using vespa::config::search::IndexschemaConfig; using vespa::config::search::RankProfilesConfig; |