diff options
author | Haavard <havardpe@yahoo-inc.com> | 2017-01-23 14:24:11 +0000 |
---|---|---|
committer | Haavard <havardpe@yahoo-inc.com> | 2017-01-23 14:24:11 +0000 |
commit | ec2a4866b81fb53a5ca449f6074bdcfcf81310dc (patch) | |
tree | 2c2a2f188af98f6a5534b93e9e7689b9de024ace /searchcore | |
parent | 30866d93d050953fdf0b82f88b6300af40fe8cf9 (diff) |
make stuff compile and test
Diffstat (limited to 'searchcore')
15 files changed, 28 insertions, 28 deletions
diff --git a/searchcore/src/apps/verify_ranksetup/verify_ranksetup.cpp b/searchcore/src/apps/verify_ranksetup/verify_ranksetup.cpp index 3c2828b72ba..6d950206a11 100644 --- a/searchcore/src/apps/verify_ranksetup/verify_ranksetup.cpp +++ b/searchcore/src/apps/verify_ranksetup/verify_ranksetup.cpp @@ -15,9 +15,9 @@ LOG_SETUP("verify_ranksetup"); #include <vespa/searchlib/features/setup.h> #include <vespa/searchlib/fef/fef.h> #include <vespa/searchlib/fef/test/plugin/setup.h> -#include <vespa/vespalib/eval/tensor_spec.h> -#include <vespa/vespalib/eval/value_cache/constant_value.h> -#include <vespa/vespalib/tensor/default_tensor_engine.h> +#include <vespa/eval/eval/tensor_spec.h> +#include <vespa/eval/eval/value_cache/constant_value.h> +#include <vespa/eval/tensor/default_tensor_engine.h> using config::ConfigContext; using config::ConfigHandle; diff --git a/searchcore/src/tests/proton/attribute/attribute_test.cpp b/searchcore/src/tests/proton/attribute/attribute_test.cpp index 3493ecb4e07..d2d97546f0c 100644 --- a/searchcore/src/tests/proton/attribute/attribute_test.cpp +++ b/searchcore/src/tests/proton/attribute/attribute_test.cpp @@ -31,10 +31,10 @@ LOG_SETUP("attribute_test"); #include <vespa/searchlib/predicate/predicate_hash.h> #include <vespa/searchlib/common/foregroundtaskexecutor.h> #include <vespa/searchcore/proton/test/directory_handler.h> -#include <vespa/vespalib/tensor/tensor.h> -#include <vespa/vespalib/tensor/types.h> -#include <vespa/vespalib/tensor/default_tensor.h> -#include <vespa/vespalib/tensor/tensor_factory.h> +#include <vespa/eval/tensor/tensor.h> +#include <vespa/eval/tensor/types.h> +#include <vespa/eval/tensor/default_tensor.h> +#include <vespa/eval/tensor/tensor_factory.h> #include <vespa/searchlib/tensor/tensor_attribute.h> diff --git a/searchcore/src/tests/proton/docsummary/docsummary.cpp b/searchcore/src/tests/proton/docsummary/docsummary.cpp index d0705e7b538..11d0be1412b 100644 --- a/searchcore/src/tests/proton/docsummary/docsummary.cpp +++ b/searchcore/src/tests/proton/docsummary/docsummary.cpp @@ -20,13 +20,13 @@ #include <tests/proton/common/dummydbowner.h> #include <vespa/vespalib/testkit/testapp.h> #include <vespa/searchlib/transactionlog/nosyncproxy.h> -#include <vespa/vespalib/tensor/tensor_factory.h> -#include <vespa/vespalib/tensor/default_tensor.h> +#include <vespa/eval/tensor/tensor_factory.h> +#include <vespa/eval/tensor/default_tensor.h> #include <vespa/searchlib/tensor/tensor_attribute.h> #include <vespa/searchcore/proton/common/hw_info.h> #include <vespa/vespalib/data/slime/slime.h> #include <vespa/config/helper/configgetter.hpp> -#include <vespa/vespalib/tensor/serialization/typed_binary_format.h> +#include <vespa/eval/tensor/serialization/typed_binary_format.h> #include <vespa/vespalib/objects/nbostream.h> #include <vespa/log/log.h> diff --git a/searchcore/src/tests/proton/docsummary/summaryfieldconverter_test.cpp b/searchcore/src/tests/proton/docsummary/summaryfieldconverter_test.cpp index 27a50c9c57f..c2659d5b06c 100644 --- a/searchcore/src/tests/proton/docsummary/summaryfieldconverter_test.cpp +++ b/searchcore/src/tests/proton/docsummary/summaryfieldconverter_test.cpp @@ -42,10 +42,10 @@ #include <vespa/vespalib/data/slime/json_format.h> #include <vespa/vespalib/data/slime/binary_format.h> #include <vespa/searchlib/util/slime_output_raw_buf_adapter.h> -#include <vespa/vespalib/tensor/tensor.h> -#include <vespa/vespalib/tensor/types.h> -#include <vespa/vespalib/tensor/default_tensor.h> -#include <vespa/vespalib/tensor/tensor_factory.h> +#include <vespa/eval/tensor/tensor.h> +#include <vespa/eval/tensor/types.h> +#include <vespa/eval/tensor/default_tensor.h> +#include <vespa/eval/tensor/tensor_factory.h> #include <vespa/vespalib/data/slime/slime.h> using vespa::config::search::SummarymapConfig; diff --git a/searchcore/src/tests/proton/matching/constant_value_repo/constant_value_repo_test.cpp b/searchcore/src/tests/proton/matching/constant_value_repo/constant_value_repo_test.cpp index 87f62845a3d..45ce6780201 100644 --- a/searchcore/src/tests/proton/matching/constant_value_repo/constant_value_repo_test.cpp +++ b/searchcore/src/tests/proton/matching/constant_value_repo/constant_value_repo_test.cpp @@ -5,7 +5,7 @@ #include <vespa/searchcore/proton/matching/constant_value_repo.h> #include <vespa/searchcore/proton/matching/error_constant_value.h> -#include <vespa/vespalib/eval/value_cache/constant_value.h> +#include <vespa/eval/eval/value_cache/constant_value.h> using namespace proton::matching; using namespace vespalib::eval; diff --git a/searchcore/src/vespa/searchcore/proton/attribute/document_field_retriever.cpp b/searchcore/src/vespa/searchcore/proton/attribute/document_field_retriever.cpp index 0995c1f4b68..d63bb60dbae 100644 --- a/searchcore/src/vespa/searchcore/proton/attribute/document_field_retriever.cpp +++ b/searchcore/src/vespa/searchcore/proton/attribute/document_field_retriever.cpp @@ -6,7 +6,7 @@ #include <vespa/document/fieldvalue/tensorfieldvalue.h> #include <vespa/searchcommon/attribute/attributecontent.h> #include <vespa/searchlib/tensor/tensor_attribute.h> -#include <vespa/vespalib/tensor/tensor.h> +#include <vespa/eval/tensor/tensor.h> #include <vespa/vespalib/util/exceptions.h> #include <vespa/log/log.h> diff --git a/searchcore/src/vespa/searchcore/proton/docsummary/documentstoreadapter.cpp b/searchcore/src/vespa/searchcore/proton/docsummary/documentstoreadapter.cpp index 4f61873b938..4278e71b63c 100644 --- a/searchcore/src/vespa/searchcore/proton/docsummary/documentstoreadapter.cpp +++ b/searchcore/src/vespa/searchcore/proton/docsummary/documentstoreadapter.cpp @@ -3,8 +3,8 @@ #include "documentstoreadapter.h" #include "summaryfieldconverter.h" #include <vespa/document/fieldvalue/stringfieldvalue.h> -#include <vespa/vespalib/tensor/tensor.h> -#include <vespa/vespalib/tensor/serialization/typed_binary_format.h> +#include <vespa/eval/tensor/tensor.h> +#include <vespa/eval/tensor/serialization/typed_binary_format.h> #include <vespa/vespalib/objects/nbostream.h> #include <vespa/document/fieldvalue/tensorfieldvalue.h> #include <vespa/log/log.h> diff --git a/searchcore/src/vespa/searchcore/proton/docsummary/summaryfieldconverter.cpp b/searchcore/src/vespa/searchcore/proton/docsummary/summaryfieldconverter.cpp index c74442bd72b..f14ffcd3f5f 100644 --- a/searchcore/src/vespa/searchcore/proton/docsummary/summaryfieldconverter.cpp +++ b/searchcore/src/vespa/searchcore/proton/docsummary/summaryfieldconverter.cpp @@ -41,8 +41,8 @@ #include <vespa/vespalib/data/slime/convenience.h> #include <vespa/vespalib/data/slime/binary_format.h> #include <vespa/vespalib/data/slime/json_format.h> -#include <vespa/vespalib/tensor/serialization/slime_binary_format.h> -#include <vespa/vespalib/tensor/serialization/typed_binary_format.h> +#include <vespa/eval/tensor/serialization/slime_binary_format.h> +#include <vespa/eval/tensor/serialization/typed_binary_format.h> #include <vespa/vespalib/objects/nbostream.h> #include <vespa/searchlib/util/slime_output_raw_buf_adapter.h> #include <vespa/vespalib/util/exceptions.h> diff --git a/searchcore/src/vespa/searchcore/proton/matching/constant_value_repo.h b/searchcore/src/vespa/searchcore/proton/matching/constant_value_repo.h index 08a3fb0ae8b..88ec57d4f6f 100644 --- a/searchcore/src/vespa/searchcore/proton/matching/constant_value_repo.h +++ b/searchcore/src/vespa/searchcore/proton/matching/constant_value_repo.h @@ -4,7 +4,7 @@ #include "i_constant_value_repo.h" #include "ranking_constants.h" -#include <vespa/vespalib/eval/value_cache/constant_value.h> +#include <vespa/eval/eval/value_cache/constant_value.h> namespace proton { namespace matching { diff --git a/searchcore/src/vespa/searchcore/proton/matching/error_constant_value.h b/searchcore/src/vespa/searchcore/proton/matching/error_constant_value.h index 768b13292bd..1824bb3ce41 100644 --- a/searchcore/src/vespa/searchcore/proton/matching/error_constant_value.h +++ b/searchcore/src/vespa/searchcore/proton/matching/error_constant_value.h @@ -2,7 +2,7 @@ #pragma once -#include <vespa/vespalib/eval/value_cache/constant_value.h> +#include <vespa/eval/eval/value_cache/constant_value.h> namespace proton { namespace matching { diff --git a/searchcore/src/vespa/searchcore/proton/matching/i_constant_value_repo.h b/searchcore/src/vespa/searchcore/proton/matching/i_constant_value_repo.h index 6cda3d6ff40..d4bd4a8c978 100644 --- a/searchcore/src/vespa/searchcore/proton/matching/i_constant_value_repo.h +++ b/searchcore/src/vespa/searchcore/proton/matching/i_constant_value_repo.h @@ -2,7 +2,7 @@ #pragma once -#include <vespa/vespalib/eval/value_cache/constant_value.h> +#include <vespa/eval/eval/value_cache/constant_value.h> namespace proton { namespace matching { diff --git a/searchcore/src/vespa/searchcore/proton/matching/indexenvironment.h b/searchcore/src/vespa/searchcore/proton/matching/indexenvironment.h index decee78c826..70ed757029f 100644 --- a/searchcore/src/vespa/searchcore/proton/matching/indexenvironment.h +++ b/searchcore/src/vespa/searchcore/proton/matching/indexenvironment.h @@ -8,7 +8,7 @@ #include <vespa/searchlib/fef/properties.h> #include <vespa/searchlib/fef/tablemanager.h> #include <vespa/searchcommon/common/schema.h> -#include <vespa/vespalib/eval/value_cache/constant_value.h> +#include <vespa/eval/eval/value_cache/constant_value.h> namespace proton { namespace matching { diff --git a/searchcore/src/vespa/searchcore/proton/server/attribute_config_validator.cpp b/searchcore/src/vespa/searchcore/proton/server/attribute_config_validator.cpp index 0219cabba2a..39883168984 100644 --- a/searchcore/src/vespa/searchcore/proton/server/attribute_config_validator.cpp +++ b/searchcore/src/vespa/searchcore/proton/server/attribute_config_validator.cpp @@ -4,7 +4,7 @@ #include <vespa/log/log.h> LOG_SETUP(".proton.server.attribute_config_validator"); #include "attribute_config_validator.h" -#include <vespa/vespalib/eval/value_type.h> +#include <vespa/eval/eval/value_type.h> #include <vespa/vespalib/util/stringfmt.h> using vespa::config::search::AttributesConfig; diff --git a/searchcore/src/vespa/searchcore/proton/server/searchabledocsubdb.cpp b/searchcore/src/vespa/searchcore/proton/server/searchabledocsubdb.cpp index f866b36db21..c720b94c9e0 100644 --- a/searchcore/src/vespa/searchcore/proton/server/searchabledocsubdb.cpp +++ b/searchcore/src/vespa/searchcore/proton/server/searchabledocsubdb.cpp @@ -12,7 +12,7 @@ #include <vespa/searchcorespi/plugin/iindexmanagerfactory.h> #include <vespa/vespalib/io/fileutil.h> #include <vespa/vespalib/util/closuretask.h> -#include <vespa/vespalib/tensor/default_tensor_engine.h> +#include <vespa/eval/tensor/default_tensor_engine.h> #include <vespa/vespalib/util/exceptions.h> using vespa::config::search::AttributesConfig; diff --git a/searchcore/src/vespa/searchcore/proton/server/searchabledocsubdb.h b/searchcore/src/vespa/searchcore/proton/server/searchabledocsubdb.h index b1d80b57bc3..f4286a4c54c 100644 --- a/searchcore/src/vespa/searchcore/proton/server/searchabledocsubdb.h +++ b/searchcore/src/vespa/searchcore/proton/server/searchabledocsubdb.h @@ -19,8 +19,8 @@ #include <vespa/searchcore/proton/index/indexmanager.h> #include <vespa/searchcore/proton/matching/constant_value_repo.h> #include <vespa/searchcore/config/config-proton.h> -#include <vespa/vespalib/eval/value_cache/constant_tensor_loader.h> -#include <vespa/vespalib/eval/value_cache/constant_value_cache.h> +#include <vespa/eval/eval/value_cache/constant_tensor_loader.h> +#include <vespa/eval/eval/value_cache/constant_value_cache.h> #include <vespa/vespalib/util/blockingthreadstackexecutor.h> #include <vespa/vespalib/util/varholder.h> |