diff options
67 files changed, 147 insertions, 144 deletions
diff --git a/document/CMakeLists.txt b/document/CMakeLists.txt index 72acb9399a9..8e76a9009c5 100644 --- a/document/CMakeLists.txt +++ b/document/CMakeLists.txt @@ -6,6 +6,7 @@ vespa_define_module( vespalib staging_vespalib config_cloudconfig + eval EXTERNAL_DEPENDS lz4 diff --git a/document/src/tests/documentupdatetestcase.cpp b/document/src/tests/documentupdatetestcase.cpp index 1e009498295..7040d04efdc 100644 --- a/document/src/tests/documentupdatetestcase.cpp +++ b/document/src/tests/documentupdatetestcase.cpp @@ -18,10 +18,10 @@ #include <vespa/document/repo/configbuilder.h> #include <vespa/document/repo/documenttyperepo.h> #include <vespa/vdstestlib/cppunit/macros.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/testkit/testapp.h> #include <vespa/vespalib/objects/nbostream.h> diff --git a/document/src/tests/serialization/vespadocumentserializer_test.cpp b/document/src/tests/serialization/vespadocumentserializer_test.cpp index b22f33a5fd0..6b7af0c0a93 100644 --- a/document/src/tests/serialization/vespadocumentserializer_test.cpp +++ b/document/src/tests/serialization/vespadocumentserializer_test.cpp @@ -32,11 +32,11 @@ #include <vespa/document/serialization/vespadocumentdeserializer.h> #include <vespa/document/serialization/vespadocumentserializer.h> #include <vespa/document/serialization/annotationserializer.h> -#include <vespa/vespalib/tensor/types.h> -#include <vespa/vespalib/tensor/tensor_builder.h> -#include <vespa/vespalib/tensor/tensor.h> -#include <vespa/vespalib/tensor/default_tensor.h> -#include <vespa/vespalib/tensor/tensor_factory.h> +#include <vespa/eval/tensor/types.h> +#include <vespa/eval/tensor/tensor_builder.h> +#include <vespa/eval/tensor/tensor.h> +#include <vespa/eval/tensor/default_tensor.h> +#include <vespa/eval/tensor/tensor_factory.h> #include <stdlib.h> #include <vespa/vespalib/data/slime/cursor.h> #include <vespa/vespalib/data/slime/slime.h> diff --git a/document/src/tests/tensor_fieldvalue/tensor_fieldvalue_test.cpp b/document/src/tests/tensor_fieldvalue/tensor_fieldvalue_test.cpp index f0dd49c472c..b61cb4895df 100644 --- a/document/src/tests/tensor_fieldvalue/tensor_fieldvalue_test.cpp +++ b/document/src/tests/tensor_fieldvalue/tensor_fieldvalue_test.cpp @@ -6,10 +6,10 @@ LOG_SETUP("fieldvalue_test"); #include <vespa/fastos/fastos.h> #include <vespa/document/fieldvalue/tensorfieldvalue.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/testkit/testapp.h> diff --git a/document/src/vespa/document/CMakeLists.txt b/document/src/vespa/document/CMakeLists.txt index 6d5483333cd..6b8126a3258 100644 --- a/document/src/vespa/document/CMakeLists.txt +++ b/document/src/vespa/document/CMakeLists.txt @@ -16,5 +16,5 @@ vespa_add_library(document $<TARGET_OBJECTS:document_predicate> INSTALL lib64 DEPENDS - vespalib_vespalib_tensor + eval ) diff --git a/document/src/vespa/document/fieldvalue/tensorfieldvalue.cpp b/document/src/vespa/document/fieldvalue/tensorfieldvalue.cpp index cf98399d7f8..d6396c43a46 100644 --- a/document/src/vespa/document/fieldvalue/tensorfieldvalue.cpp +++ b/document/src/vespa/document/fieldvalue/tensorfieldvalue.cpp @@ -1,7 +1,7 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "tensorfieldvalue.h" -#include <vespa/vespalib/tensor/tensor.h> +#include <vespa/eval/tensor/tensor.h> #include <ostream> using vespalib::tensor::Tensor; diff --git a/document/src/vespa/document/serialization/vespadocumentdeserializer.cpp b/document/src/vespa/document/serialization/vespadocumentdeserializer.cpp index 0ee9c7f4b32..b1b827b6c69 100644 --- a/document/src/vespa/document/serialization/vespadocumentdeserializer.cpp +++ b/document/src/vespa/document/serialization/vespadocumentdeserializer.cpp @@ -21,8 +21,8 @@ #include <vespa/vespalib/data/slime/slime.h> #include <vespa/vespalib/stllike/asciistream.h> #include <vespa/vespalib/util/backtrace.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/document/util/serializableexceptions.h> #include <vespa/document/base/exceptions.h> #include <vespa/vespalib/objects/nbostream.h> diff --git a/document/src/vespa/document/serialization/vespadocumentserializer.cpp b/document/src/vespa/document/serialization/vespadocumentserializer.cpp index 71727178f6d..baece7b004f 100644 --- a/document/src/vespa/document/serialization/vespadocumentserializer.cpp +++ b/document/src/vespa/document/serialization/vespadocumentserializer.cpp @@ -26,7 +26,7 @@ #include <vespa/document/util/compressionconfig.h> #include <vespa/vespalib/data/slime/binary_format.h> #include <vespa/vespalib/objects/nbostream.h> -#include <vespa/vespalib/tensor/serialization/typed_binary_format.h> +#include <vespa/eval/tensor/serialization/typed_binary_format.h> #include <utility> #include <vector> diff --git a/searchcommon/CMakeLists.txt b/searchcommon/CMakeLists.txt index 8418f32e736..c8ed07848d4 100644 --- a/searchcommon/CMakeLists.txt +++ b/searchcommon/CMakeLists.txt @@ -6,6 +6,7 @@ vespa_define_module( vespalib config_cloudconfig configdefinitions + eval TESTS src/tests/attribute/config diff --git a/searchcommon/src/vespa/searchcommon/attribute/config.h b/searchcommon/src/vespa/searchcommon/attribute/config.h index d26cf1da930..d0b2535950f 100644 --- a/searchcommon/src/vespa/searchcommon/attribute/config.h +++ b/searchcommon/src/vespa/searchcommon/attribute/config.h @@ -6,7 +6,7 @@ #include <vespa/searchcommon/attribute/collectiontype.h> #include <vespa/searchcommon/common/growstrategy.h> #include <vespa/searchcommon/common/compaction_strategy.h> -#include <vespa/vespalib/eval/value_type.h> +#include <vespa/eval/eval/value_type.h> namespace search { namespace attribute { 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> diff --git a/searchlib/CMakeLists.txt b/searchlib/CMakeLists.txt index 6d6395fe25a..4bed02092a5 100644 --- a/searchlib/CMakeLists.txt +++ b/searchlib/CMakeLists.txt @@ -5,6 +5,7 @@ vespa_define_module( vespalog vespalib staging_vespalib + eval fnet configdefinitions metrics diff --git a/searchlib/src/apps/vespa-ranking-expression-analyzer/vespa-ranking-expression-analyzer.cpp b/searchlib/src/apps/vespa-ranking-expression-analyzer/vespa-ranking-expression-analyzer.cpp index 42676c715d3..d43aeec671c 100644 --- a/searchlib/src/apps/vespa-ranking-expression-analyzer/vespa-ranking-expression-analyzer.cpp +++ b/searchlib/src/apps/vespa-ranking-expression-analyzer/vespa-ranking-expression-analyzer.cpp @@ -4,17 +4,17 @@ #include <map> #include <vespa/searchlib/features/rankingexpression/feature_name_extractor.h> #include <vector> -#include <vespa/vespalib/eval/llvm/compiled_function.h> -#include <vespa/vespalib/eval/function.h> -#include <vespa/vespalib/eval/interpreted_function.h> -#include <vespa/vespalib/eval/basic_nodes.h> -#include <vespa/vespalib/eval/call_nodes.h> -#include <vespa/vespalib/eval/operator_nodes.h> +#include <vespa/eval/eval/llvm/compiled_function.h> +#include <vespa/eval/eval/function.h> +#include <vespa/eval/eval/interpreted_function.h> +#include <vespa/eval/eval/basic_nodes.h> +#include <vespa/eval/eval/call_nodes.h> +#include <vespa/eval/eval/operator_nodes.h> #include <vespa/vespalib/util/benchmark_timer.h> -#include <vespa/vespalib/eval/gbdt.h> -#include <vespa/vespalib/eval/vm_forest.h> -#include <vespa/vespalib/eval/llvm/deinline_forest.h> -#include <vespa/vespalib/tensor/default_tensor_engine.h> +#include <vespa/eval/eval/gbdt.h> +#include <vespa/eval/eval/vm_forest.h> +#include <vespa/eval/eval/llvm/deinline_forest.h> +#include <vespa/eval/tensor/default_tensor_engine.h> #include <cmath> //----------------------------------------------------------------------------- diff --git a/searchlib/src/tests/attribute/tensorattribute/tensorattribute_test.cpp b/searchlib/src/tests/attribute/tensorattribute/tensorattribute_test.cpp index b8b9bf46409..a1fa038f6d2 100644 --- a/searchlib/src/tests/attribute/tensorattribute/tensorattribute_test.cpp +++ b/searchlib/src/tests/attribute/tensorattribute/tensorattribute_test.cpp @@ -5,8 +5,8 @@ #include <vespa/searchlib/tensor/generic_tensor_attribute.h> #include <vespa/searchlib/tensor/dense_tensor_attribute.h> #include <vespa/searchlib/attribute/attributeguard.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/vespalib/io/fileutil.h> #include <vespa/vespalib/data/fileheader.h> #include <vespa/log/log.h> diff --git a/searchlib/src/tests/features/constant/constant_test.cpp b/searchlib/src/tests/features/constant/constant_test.cpp index ee7e4a7e353..d990943367b 100644 --- a/searchlib/src/tests/features/constant/constant_test.cpp +++ b/searchlib/src/tests/features/constant/constant_test.cpp @@ -5,11 +5,11 @@ #include <vespa/searchlib/fef/fef.h> #include <vespa/searchlib/fef/test/ftlib.h> #include <vespa/searchlib/fef/test/indexenvironment.h> -#include <vespa/vespalib/eval/function.h> -#include <vespa/vespalib/eval/tensor_spec.h> -#include <vespa/vespalib/tensor/default_tensor.h> -#include <vespa/vespalib/tensor/default_tensor_engine.h> -#include <vespa/vespalib/tensor/tensor_factory.h> +#include <vespa/eval/eval/function.h> +#include <vespa/eval/eval/tensor_spec.h> +#include <vespa/eval/tensor/default_tensor.h> +#include <vespa/eval/tensor/default_tensor_engine.h> +#include <vespa/eval/tensor/tensor_factory.h> using search::feature_t; using namespace search::fef; diff --git a/searchlib/src/tests/features/ranking_expression/ranking_expression_test.cpp b/searchlib/src/tests/features/ranking_expression/ranking_expression_test.cpp index ceec2369c4b..963f4a58bb0 100644 --- a/searchlib/src/tests/features/ranking_expression/ranking_expression_test.cpp +++ b/searchlib/src/tests/features/ranking_expression/ranking_expression_test.cpp @@ -2,7 +2,7 @@ #include <vespa/fastos/fastos.h> #include <vespa/vespalib/testkit/test_kit.h> -#include <vespa/vespalib/eval/value_type.h> +#include <vespa/eval/eval/value_type.h> #include <vespa/searchlib/fef/feature_type.h> #include <vespa/searchlib/fef/featurenameparser.h> #include <vespa/searchlib/features/rankingexpressionfeature.h> diff --git a/searchlib/src/tests/features/tensor/tensor_test.cpp b/searchlib/src/tests/features/tensor/tensor_test.cpp index da476118e0b..fd59cd8b9d7 100644 --- a/searchlib/src/tests/features/tensor/tensor_test.cpp +++ b/searchlib/src/tests/features/tensor/tensor_test.cpp @@ -10,12 +10,12 @@ #include <vespa/searchlib/fef/test/indexenvironmentbuilder.h> #include <vespa/searchlib/fef/test/queryenvironment.h> #include <vespa/searchlib/tensor/tensor_attribute.h> -#include <vespa/vespalib/eval/function.h> -#include <vespa/vespalib/eval/tensor_spec.h> -#include <vespa/vespalib/tensor/default_tensor.h> -#include <vespa/vespalib/tensor/default_tensor_engine.h> -#include <vespa/vespalib/tensor/serialization/typed_binary_format.h> -#include <vespa/vespalib/tensor/tensor_factory.h> +#include <vespa/eval/eval/function.h> +#include <vespa/eval/eval/tensor_spec.h> +#include <vespa/eval/tensor/default_tensor.h> +#include <vespa/eval/tensor/default_tensor_engine.h> +#include <vespa/eval/tensor/serialization/typed_binary_format.h> +#include <vespa/eval/tensor/tensor_factory.h> #include <vespa/vespalib/objects/nbostream.h> using search::feature_t; diff --git a/searchlib/src/tests/features/tensor_from_labels/tensor_from_labels_test.cpp b/searchlib/src/tests/features/tensor_from_labels/tensor_from_labels_test.cpp index 81ac57d5535..e0e6b4746a4 100644 --- a/searchlib/src/tests/features/tensor_from_labels/tensor_from_labels_test.cpp +++ b/searchlib/src/tests/features/tensor_from_labels/tensor_from_labels_test.cpp @@ -12,9 +12,9 @@ #include <vespa/searchlib/fef/test/indexenvironment.h> #include <vespa/searchlib/fef/test/indexenvironmentbuilder.h> #include <vespa/searchlib/fef/test/queryenvironment.h> -#include <vespa/vespalib/eval/function.h> -#include <vespa/vespalib/tensor/tensor.h> -#include <vespa/vespalib/tensor/default_tensor_engine.h> +#include <vespa/eval/eval/function.h> +#include <vespa/eval/tensor/tensor.h> +#include <vespa/eval/tensor/default_tensor_engine.h> using search::feature_t; using namespace search::fef; diff --git a/searchlib/src/tests/features/tensor_from_weighted_set/tensor_from_weighted_set_test.cpp b/searchlib/src/tests/features/tensor_from_weighted_set/tensor_from_weighted_set_test.cpp index 6abe353e44d..839b1efec74 100644 --- a/searchlib/src/tests/features/tensor_from_weighted_set/tensor_from_weighted_set_test.cpp +++ b/searchlib/src/tests/features/tensor_from_weighted_set/tensor_from_weighted_set_test.cpp @@ -12,10 +12,10 @@ #include <vespa/searchlib/fef/test/indexenvironment.h> #include <vespa/searchlib/fef/test/indexenvironmentbuilder.h> #include <vespa/searchlib/fef/test/queryenvironment.h> -#include <vespa/vespalib/eval/function.h> -#include <vespa/vespalib/eval/tensor_spec.h> -#include <vespa/vespalib/tensor/default_tensor_engine.h> -#include <vespa/vespalib/tensor/tensor.h> +#include <vespa/eval/eval/function.h> +#include <vespa/eval/eval/tensor_spec.h> +#include <vespa/eval/tensor/default_tensor_engine.h> +#include <vespa/eval/tensor/tensor.h> using search::feature_t; using namespace search::fef; diff --git a/searchlib/src/tests/fef/object_passing/object_passing_test.cpp b/searchlib/src/tests/fef/object_passing/object_passing_test.cpp index 4e7a39f994e..53f9b028e9d 100644 --- a/searchlib/src/tests/fef/object_passing/object_passing_test.cpp +++ b/searchlib/src/tests/fef/object_passing/object_passing_test.cpp @@ -9,7 +9,7 @@ #include <vespa/searchlib/fef/test/plugin/sum.h> #include <vespa/searchlib/fef/rank_program.h> #include <vespa/searchlib/fef/verify_feature.h> -#include <vespa/vespalib/eval/value_type.h> +#include <vespa/eval/eval/value_type.h> #include <vespa/searchlib/fef/feature_type.h> using namespace search::fef; diff --git a/searchlib/src/tests/tensor/dense_tensor_store/dense_tensor_store_test.cpp b/searchlib/src/tests/tensor/dense_tensor_store/dense_tensor_store_test.cpp index f46e36d418b..628958a921a 100644 --- a/searchlib/src/tests/tensor/dense_tensor_store/dense_tensor_store_test.cpp +++ b/searchlib/src/tests/tensor/dense_tensor_store/dense_tensor_store_test.cpp @@ -4,11 +4,11 @@ LOG_SETUP("dense_tensor_store_test"); #include <vespa/vespalib/testkit/test_kit.h> #include <vespa/searchlib/tensor/dense_tensor_store.h> -#include <vespa/vespalib/eval/tensor_spec.h> -#include <vespa/vespalib/eval/value_type.h> -#include <vespa/vespalib/tensor/default_tensor_engine.h> -#include <vespa/vespalib/tensor/tensor.h> -#include <vespa/vespalib/tensor/dense/mutable_dense_tensor_view.h> +#include <vespa/eval/eval/tensor_spec.h> +#include <vespa/eval/eval/value_type.h> +#include <vespa/eval/tensor/default_tensor_engine.h> +#include <vespa/eval/tensor/tensor.h> +#include <vespa/eval/tensor/dense/mutable_dense_tensor_view.h> using search::tensor::DenseTensorStore; using vespalib::eval::TensorSpec; diff --git a/searchlib/src/vespa/searchlib/features/attributefeature.cpp b/searchlib/src/vespa/searchlib/features/attributefeature.cpp index a07552bdeb8..9a4dea637b3 100644 --- a/searchlib/src/vespa/searchlib/features/attributefeature.cpp +++ b/searchlib/src/vespa/searchlib/features/attributefeature.cpp @@ -17,7 +17,7 @@ LOG_SETUP(".features.attributefeature"); #include <vespa/searchlib/fef/fieldinfo.h> #include <vespa/searchlib/fef/indexproperties.h> #include <vespa/searchlib/attribute/singlenumericattribute.h> -#include <vespa/vespalib/eval/value_type.h> +#include <vespa/eval/eval/value_type.h> #include <vespa/searchlib/fef/feature_type.h> using search::attribute::IAttributeVector; diff --git a/searchlib/src/vespa/searchlib/features/attributefeature.h b/searchlib/src/vespa/searchlib/features/attributefeature.h index fdefea2aeee..034bb246c89 100644 --- a/searchlib/src/vespa/searchlib/features/attributefeature.h +++ b/searchlib/src/vespa/searchlib/features/attributefeature.h @@ -4,7 +4,7 @@ #include <vespa/searchlib/fef/blueprint.h> #include <vespa/searchlib/fef/featureexecutor.h> -#include <vespa/vespalib/eval/value_type.h> +#include <vespa/eval/eval/value_type.h> namespace search { namespace features { diff --git a/searchlib/src/vespa/searchlib/features/constant_feature.cpp b/searchlib/src/vespa/searchlib/features/constant_feature.cpp index 99414f8af86..54fc40b0019 100644 --- a/searchlib/src/vespa/searchlib/features/constant_feature.cpp +++ b/searchlib/src/vespa/searchlib/features/constant_feature.cpp @@ -7,7 +7,7 @@ LOG_SETUP(".features.constant_feature"); #include <vespa/searchlib/fef/featureexecutor.h> #include "valuefeature.h" -#include <vespa/vespalib/eval/value_cache/constant_value.h> +#include <vespa/eval/eval/value_cache/constant_value.h> using namespace search::fef; diff --git a/searchlib/src/vespa/searchlib/features/constant_tensor_executor.h b/searchlib/src/vespa/searchlib/features/constant_tensor_executor.h index 07b4abd53b0..58a47c97f05 100644 --- a/searchlib/src/vespa/searchlib/features/constant_tensor_executor.h +++ b/searchlib/src/vespa/searchlib/features/constant_tensor_executor.h @@ -3,10 +3,10 @@ #pragma once #include <vespa/searchlib/fef/featureexecutor.h> -#include <vespa/vespalib/eval/tensor_spec.h> -#include <vespa/vespalib/eval/value.h> -#include <vespa/vespalib/eval/value_type.h> -#include <vespa/vespalib/tensor/default_tensor_engine.h> +#include <vespa/eval/eval/tensor_spec.h> +#include <vespa/eval/eval/value.h> +#include <vespa/eval/eval/value_type.h> +#include <vespa/eval/tensor/default_tensor_engine.h> #include <memory> namespace search { diff --git a/searchlib/src/vespa/searchlib/features/dense_tensor_attribute_executor.h b/searchlib/src/vespa/searchlib/features/dense_tensor_attribute_executor.h index 39aa0ea9922..53eaf769e6b 100644 --- a/searchlib/src/vespa/searchlib/features/dense_tensor_attribute_executor.h +++ b/searchlib/src/vespa/searchlib/features/dense_tensor_attribute_executor.h @@ -3,8 +3,8 @@ #pragma once #include <vespa/searchlib/fef/featureexecutor.h> -#include <vespa/vespalib/eval/value.h> -#include <vespa/vespalib/tensor/dense/mutable_dense_tensor_view.h> +#include <vespa/eval/eval/value.h> +#include <vespa/eval/tensor/dense/mutable_dense_tensor_view.h> namespace search { namespace tensor { class DenseTensorAttribute; } diff --git a/searchlib/src/vespa/searchlib/features/element_similarity_feature.cpp b/searchlib/src/vespa/searchlib/features/element_similarity_feature.cpp index 0cf4ba591c6..52e75a33fdf 100644 --- a/searchlib/src/vespa/searchlib/features/element_similarity_feature.cpp +++ b/searchlib/src/vespa/searchlib/features/element_similarity_feature.cpp @@ -4,8 +4,8 @@ #include <vespa/log/log.h> LOG_SETUP(".features.elementsimilarity"); #include "element_similarity_feature.h" -#include <vespa/vespalib/eval/llvm/compiled_function.h> -#include <vespa/vespalib/eval/llvm/compile_cache.h> +#include <vespa/eval/eval/llvm/compiled_function.h> +#include <vespa/eval/eval/llvm/compile_cache.h> namespace search { namespace features { diff --git a/searchlib/src/vespa/searchlib/features/queryfeature.cpp b/searchlib/src/vespa/searchlib/features/queryfeature.cpp index 6ec8ed70a44..bc384b51a7a 100644 --- a/searchlib/src/vespa/searchlib/features/queryfeature.cpp +++ b/searchlib/src/vespa/searchlib/features/queryfeature.cpp @@ -10,13 +10,13 @@ LOG_SETUP(".features.queryfeature"); #include <vespa/searchlib/fef/indexproperties.h> #include <vespa/searchlib/fef/properties.h> #include <vespa/vespalib/objects/nbostream.h> -#include <vespa/vespalib/tensor/default_tensor.h> -#include <vespa/vespalib/tensor/tensor_mapper.h> -#include <vespa/vespalib/tensor/serialization/typed_binary_format.h> +#include <vespa/eval/tensor/default_tensor.h> +#include <vespa/eval/tensor/tensor_mapper.h> +#include <vespa/eval/tensor/serialization/typed_binary_format.h> #include <memory> #include "utils.h" #include "valuefeature.h" -#include <vespa/vespalib/eval/value_type.h> +#include <vespa/eval/eval/value_type.h> #include <vespa/searchlib/fef/feature_type.h> using namespace search::fef; diff --git a/searchlib/src/vespa/searchlib/features/queryfeature.h b/searchlib/src/vespa/searchlib/features/queryfeature.h index df0c50c09c2..fd1c138fcc0 100644 --- a/searchlib/src/vespa/searchlib/features/queryfeature.h +++ b/searchlib/src/vespa/searchlib/features/queryfeature.h @@ -3,7 +3,7 @@ #pragma once #include <vespa/searchlib/fef/blueprint.h> -#include <vespa/vespalib/eval/value_type.h> +#include <vespa/eval/eval/value_type.h> namespace search { namespace features { diff --git a/searchlib/src/vespa/searchlib/features/rankingexpression/feature_name_extractor.h b/searchlib/src/vespa/searchlib/features/rankingexpression/feature_name_extractor.h index 34551cc8503..fd9f0643448 100644 --- a/searchlib/src/vespa/searchlib/features/rankingexpression/feature_name_extractor.h +++ b/searchlib/src/vespa/searchlib/features/rankingexpression/feature_name_extractor.h @@ -2,7 +2,7 @@ #pragma once -#include <vespa/vespalib/eval/function.h> +#include <vespa/eval/eval/function.h> namespace search { namespace features { diff --git a/searchlib/src/vespa/searchlib/features/rankingexpressionfeature.cpp b/searchlib/src/vespa/searchlib/features/rankingexpressionfeature.cpp index 730b807b971..e11bd4d264d 100644 --- a/searchlib/src/vespa/searchlib/features/rankingexpressionfeature.cpp +++ b/searchlib/src/vespa/searchlib/features/rankingexpressionfeature.cpp @@ -7,17 +7,17 @@ LOG_SETUP(".features.rankingexpression"); #include <vespa/searchlib/fef/indexproperties.h> #include <vespa/searchlib/features/rankingexpression/feature_name_extractor.h> #include <vespa/vespalib/util/stringfmt.h> -#include <vespa/vespalib/eval/function.h> -#include <vespa/vespalib/eval/interpreted_function.h> -#include <vespa/vespalib/eval/llvm/compiled_function.h> -#include <vespa/vespalib/eval/llvm/compile_cache.h> -#include <vespa/vespalib/eval/node_types.h> +#include <vespa/eval/eval/function.h> +#include <vespa/eval/eval/interpreted_function.h> +#include <vespa/eval/eval/llvm/compiled_function.h> +#include <vespa/eval/eval/llvm/compile_cache.h> +#include <vespa/eval/eval/node_types.h> #include "rankingexpressionfeature.h" #include "utils.h" #include <stdexcept> -#include <vespa/vespalib/eval/value_type.h> +#include <vespa/eval/eval/value_type.h> #include <vespa/searchlib/fef/feature_type.h> -#include <vespa/vespalib/tensor/default_tensor_engine.h> +#include <vespa/eval/tensor/default_tensor_engine.h> using vespalib::eval::Function; using vespalib::eval::PassParams; diff --git a/searchlib/src/vespa/searchlib/features/rankingexpressionfeature.h b/searchlib/src/vespa/searchlib/features/rankingexpressionfeature.h index a529b3337de..4a32ab9d78f 100644 --- a/searchlib/src/vespa/searchlib/features/rankingexpressionfeature.h +++ b/searchlib/src/vespa/searchlib/features/rankingexpressionfeature.h @@ -3,8 +3,8 @@ #include <vespa/searchlib/fef/blueprint.h> #include <vespa/searchlib/fef/featureexecutor.h> -#include <vespa/vespalib/eval/interpreted_function.h> -#include <vespa/vespalib/eval/llvm/compile_cache.h> +#include <vespa/eval/eval/interpreted_function.h> +#include <vespa/eval/eval/llvm/compile_cache.h> namespace search { namespace features { diff --git a/searchlib/src/vespa/searchlib/features/tensor_attribute_executor.h b/searchlib/src/vespa/searchlib/features/tensor_attribute_executor.h index b0846380e63..16cc740fc2b 100644 --- a/searchlib/src/vespa/searchlib/features/tensor_attribute_executor.h +++ b/searchlib/src/vespa/searchlib/features/tensor_attribute_executor.h @@ -4,9 +4,9 @@ #include <vespa/searchcommon/attribute/iattributevector.h> #include <vespa/searchlib/fef/featureexecutor.h> -#include <vespa/vespalib/eval/value.h> +#include <vespa/eval/eval/value.h> #include <vespa/vespalib/stllike/string.h> -#include <vespa/vespalib/tensor/default_tensor.h> +#include <vespa/eval/tensor/default_tensor.h> namespace search { namespace tensor { class TensorAttribute; } diff --git a/searchlib/src/vespa/searchlib/features/tensor_factory_blueprint.cpp b/searchlib/src/vespa/searchlib/features/tensor_factory_blueprint.cpp index addb90426d7..c53dbcc8288 100644 --- a/searchlib/src/vespa/searchlib/features/tensor_factory_blueprint.cpp +++ b/searchlib/src/vespa/searchlib/features/tensor_factory_blueprint.cpp @@ -6,7 +6,7 @@ LOG_SETUP(".features.tensor_factory_blueprint"); #include "tensor_factory_blueprint.h" -#include <vespa/vespalib/eval/function.h> +#include <vespa/eval/eval/function.h> using namespace search::fef; using vespalib::eval::Function; diff --git a/searchlib/src/vespa/searchlib/features/tensor_from_attribute_executor.h b/searchlib/src/vespa/searchlib/features/tensor_from_attribute_executor.h index 64601a7bf19..df575c246ea 100644 --- a/searchlib/src/vespa/searchlib/features/tensor_from_attribute_executor.h +++ b/searchlib/src/vespa/searchlib/features/tensor_from_attribute_executor.h @@ -4,9 +4,9 @@ #include <vespa/searchcommon/attribute/iattributevector.h> #include <vespa/searchlib/fef/featureexecutor.h> -#include <vespa/vespalib/eval/value.h> +#include <vespa/eval/eval/value.h> #include <vespa/vespalib/stllike/string.h> -#include <vespa/vespalib/tensor/default_tensor.h> +#include <vespa/eval/tensor/default_tensor.h> namespace search { namespace features { diff --git a/searchlib/src/vespa/searchlib/features/tensor_from_labels_feature.cpp b/searchlib/src/vespa/searchlib/features/tensor_from_labels_feature.cpp index e39607e4ae6..bd8b4122df6 100644 --- a/searchlib/src/vespa/searchlib/features/tensor_from_labels_feature.cpp +++ b/searchlib/src/vespa/searchlib/features/tensor_from_labels_feature.cpp @@ -11,8 +11,8 @@ LOG_SETUP(".features.tensor_from_labels_feature"); #include <vespa/searchcommon/attribute/attributecontent.h> #include <vespa/searchcommon/attribute/iattributevector.h> #include <vespa/searchlib/fef/properties.h> -#include <vespa/vespalib/tensor/default_tensor.h> -#include <vespa/vespalib/eval/value_type.h> +#include <vespa/eval/tensor/default_tensor.h> +#include <vespa/eval/eval/value_type.h> #include <vespa/searchlib/fef/feature_type.h> using namespace search::fef; diff --git a/searchlib/src/vespa/searchlib/features/tensor_from_weighted_set_feature.cpp b/searchlib/src/vespa/searchlib/features/tensor_from_weighted_set_feature.cpp index 16db93af7e0..7430fe69cab 100644 --- a/searchlib/src/vespa/searchlib/features/tensor_from_weighted_set_feature.cpp +++ b/searchlib/src/vespa/searchlib/features/tensor_from_weighted_set_feature.cpp @@ -14,11 +14,11 @@ LOG_SETUP(".features.tensor_from_weighted_set_feature"); #include <vespa/searchcommon/attribute/attributecontent.h> #include <vespa/searchcommon/attribute/iattributevector.h> #include <vespa/searchlib/fef/properties.h> -#include <vespa/vespalib/eval/function.h> -#include <vespa/vespalib/tensor/tensor.h> -#include <vespa/vespalib/tensor/default_tensor.h> +#include <vespa/eval/eval/function.h> +#include <vespa/eval/tensor/tensor.h> +#include <vespa/eval/tensor/default_tensor.h> #include <memory> -#include <vespa/vespalib/eval/value_type.h> +#include <vespa/eval/eval/value_type.h> #include <vespa/searchlib/fef/feature_type.h> using namespace search::fef; diff --git a/searchlib/src/vespa/searchlib/fef/feature_type.h b/searchlib/src/vespa/searchlib/fef/feature_type.h index 0251fe7ab25..74bdc4149eb 100644 --- a/searchlib/src/vespa/searchlib/fef/feature_type.h +++ b/searchlib/src/vespa/searchlib/fef/feature_type.h @@ -2,7 +2,7 @@ #pragma once -#include <vespa/vespalib/eval/value_type.h> +#include <vespa/eval/eval/value_type.h> namespace search { namespace fef { diff --git a/searchlib/src/vespa/searchlib/fef/number_or_object.h b/searchlib/src/vespa/searchlib/fef/number_or_object.h index b1c68d963bf..c5a4d93fe83 100644 --- a/searchlib/src/vespa/searchlib/fef/number_or_object.h +++ b/searchlib/src/vespa/searchlib/fef/number_or_object.h @@ -3,7 +3,7 @@ #pragma once #include <vespa/searchlib/common/feature.h> -#include <vespa/vespalib/eval/value.h> +#include <vespa/eval/eval/value.h> namespace search { namespace fef { diff --git a/searchlib/src/vespa/searchlib/fef/test/dummy_dependency_handler.h b/searchlib/src/vespa/searchlib/fef/test/dummy_dependency_handler.h index fa1a21d42ad..06dcf6083a0 100644 --- a/searchlib/src/vespa/searchlib/fef/test/dummy_dependency_handler.h +++ b/searchlib/src/vespa/searchlib/fef/test/dummy_dependency_handler.h @@ -6,7 +6,7 @@ #include <vespa/vespalib/stllike/string.h> #include <vector> #include <vespa/searchlib/fef/feature_type.h> -#include <vespa/vespalib/eval/value_type.h> +#include <vespa/eval/eval/value_type.h> #include <map> namespace search { diff --git a/searchlib/src/vespa/searchlib/fef/test/featuretest.h b/searchlib/src/vespa/searchlib/fef/test/featuretest.h index ead33f35f88..1f4605c0622 100644 --- a/searchlib/src/vespa/searchlib/fef/test/featuretest.h +++ b/searchlib/src/vespa/searchlib/fef/test/featuretest.h @@ -15,7 +15,7 @@ #include <vespa/searchlib/fef/test/queryenvironment.h> #include <vespa/searchlib/fef/test/queryenvironmentbuilder.h> #include <vespa/searchlib/fef/test/rankresult.h> -#include <vespa/vespalib/eval/value.h> +#include <vespa/eval/eval/value.h> namespace search { namespace fef { diff --git a/searchlib/src/vespa/searchlib/fef/test/indexenvironment.h b/searchlib/src/vespa/searchlib/fef/test/indexenvironment.h index 4edf07b9525..3f6686ddefa 100644 --- a/searchlib/src/vespa/searchlib/fef/test/indexenvironment.h +++ b/searchlib/src/vespa/searchlib/fef/test/indexenvironment.h @@ -6,7 +6,7 @@ #include <vespa/searchlib/fef/properties.h> #include <vespa/searchlib/fef/fieldinfo.h> #include <vespa/searchlib/fef/tablemanager.h> -#include <vespa/vespalib/eval/value_cache/constant_value.h> +#include <vespa/eval/eval/value_cache/constant_value.h> #include <string> #include <vector> diff --git a/searchlib/src/vespa/searchlib/fef/utils.h b/searchlib/src/vespa/searchlib/fef/utils.h index 20ec62e3bfe..96c8d51a46f 100644 --- a/searchlib/src/vespa/searchlib/fef/utils.h +++ b/searchlib/src/vespa/searchlib/fef/utils.h @@ -3,7 +3,7 @@ #pragma once #include "rank_program.h" -#include <vespa/vespalib/eval/value.h> +#include <vespa/eval/eval/value.h> #include <map> namespace search { diff --git a/searchlib/src/vespa/searchlib/index/docbuilder.cpp b/searchlib/src/vespa/searchlib/index/docbuilder.cpp index 8dd37530175..805dbba6c02 100644 --- a/searchlib/src/vespa/searchlib/index/docbuilder.cpp +++ b/searchlib/src/vespa/searchlib/index/docbuilder.cpp @@ -10,7 +10,7 @@ #include <vespa/fastlib/text/unicodeutil.h> #include <vespa/vespalib/geo/zcurve.h> #include <vespa/vespalib/text/utf8.h> -#include <vespa/vespalib/tensor/tensor.h> +#include <vespa/eval/tensor/tensor.h> #include <vespa/vespalib/data/slime/slime.h> using namespace document; diff --git a/searchlib/src/vespa/searchlib/tensor/dense_tensor_attribute.cpp b/searchlib/src/vespa/searchlib/tensor/dense_tensor_attribute.cpp index 493c8b758ea..31e0c547a7a 100644 --- a/searchlib/src/vespa/searchlib/tensor/dense_tensor_attribute.cpp +++ b/searchlib/src/vespa/searchlib/tensor/dense_tensor_attribute.cpp @@ -3,8 +3,8 @@ #include "dense_tensor_attribute.h" #include "dense_tensor_attribute_saver.h" #include "tensor_attribute.hpp" -#include <vespa/vespalib/tensor/tensor.h> -#include <vespa/vespalib/tensor/dense/mutable_dense_tensor_view.h> +#include <vespa/eval/tensor/tensor.h> +#include <vespa/eval/tensor/dense/mutable_dense_tensor_view.h> #include <vespa/fastlib/io/bufferedfile.h> #include <vespa/searchlib/attribute/readerbase.h> diff --git a/searchlib/src/vespa/searchlib/tensor/dense_tensor_store.cpp b/searchlib/src/vespa/searchlib/tensor/dense_tensor_store.cpp index d023559bfa2..5df077fc2ae 100644 --- a/searchlib/src/vespa/searchlib/tensor/dense_tensor_store.cpp +++ b/searchlib/src/vespa/searchlib/tensor/dense_tensor_store.cpp @@ -1,11 +1,11 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "dense_tensor_store.h" -#include <vespa/vespalib/tensor/tensor.h> -#include <vespa/vespalib/tensor/dense/dense_tensor_view.h> -#include <vespa/vespalib/tensor/dense/mutable_dense_tensor_view.h> -#include <vespa/vespalib/tensor/dense/dense_tensor.h> -#include <vespa/vespalib/tensor/serialization/typed_binary_format.h> +#include <vespa/eval/tensor/tensor.h> +#include <vespa/eval/tensor/dense/dense_tensor_view.h> +#include <vespa/eval/tensor/dense/mutable_dense_tensor_view.h> +#include <vespa/eval/tensor/dense/dense_tensor.h> +#include <vespa/eval/tensor/serialization/typed_binary_format.h> #include <vespa/searchlib/datastore/datastore.hpp> using search::datastore::Handle; diff --git a/searchlib/src/vespa/searchlib/tensor/dense_tensor_store.h b/searchlib/src/vespa/searchlib/tensor/dense_tensor_store.h index d0a5d0fe647..9332ca0b949 100644 --- a/searchlib/src/vespa/searchlib/tensor/dense_tensor_store.h +++ b/searchlib/src/vespa/searchlib/tensor/dense_tensor_store.h @@ -3,7 +3,7 @@ #pragma once #include "tensor_store.h" -#include <vespa/vespalib/eval/value_type.h> +#include <vespa/eval/eval/value_type.h> namespace vespalib { namespace tensor { class MutableDenseTensorView; }} diff --git a/searchlib/src/vespa/searchlib/tensor/generic_tensor_attribute.cpp b/searchlib/src/vespa/searchlib/tensor/generic_tensor_attribute.cpp index 81076ef71ed..4fe24608b1e 100644 --- a/searchlib/src/vespa/searchlib/tensor/generic_tensor_attribute.cpp +++ b/searchlib/src/vespa/searchlib/tensor/generic_tensor_attribute.cpp @@ -3,7 +3,7 @@ #include "generic_tensor_attribute.h" #include "generic_tensor_attribute_saver.h" #include "tensor_attribute.hpp" -#include <vespa/vespalib/tensor/tensor.h> +#include <vespa/eval/tensor/tensor.h> #include <vespa/searchlib/common/rcuvector.hpp> #include <vespa/fastlib/io/bufferedfile.h> #include <vespa/searchlib/attribute/readerbase.h> diff --git a/searchlib/src/vespa/searchlib/tensor/generic_tensor_store.cpp b/searchlib/src/vespa/searchlib/tensor/generic_tensor_store.cpp index 23d515ce4c8..be2ceb7846f 100644 --- a/searchlib/src/vespa/searchlib/tensor/generic_tensor_store.cpp +++ b/searchlib/src/vespa/searchlib/tensor/generic_tensor_store.cpp @@ -1,8 +1,8 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "generic_tensor_store.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/vespalib/util/stringfmt.h> #include <vespa/vespalib/util/macro.h> diff --git a/searchlib/src/vespa/searchlib/tensor/tensor_attribute.cpp b/searchlib/src/vespa/searchlib/tensor/tensor_attribute.cpp index 1a0a0026e3c..2b2d3893130 100644 --- a/searchlib/src/vespa/searchlib/tensor/tensor_attribute.cpp +++ b/searchlib/src/vespa/searchlib/tensor/tensor_attribute.cpp @@ -1,7 +1,7 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "tensor_attribute.h" -#include <vespa/vespalib/tensor/default_tensor.h> +#include <vespa/eval/tensor/default_tensor.h> #include <vespa/searchlib/common/rcuvector.hpp> using vespalib::eval::ValueType; diff --git a/searchlib/src/vespa/searchlib/tensor/tensor_attribute.h b/searchlib/src/vespa/searchlib/tensor/tensor_attribute.h index 7637f525aa9..2f75d14ea21 100644 --- a/searchlib/src/vespa/searchlib/tensor/tensor_attribute.h +++ b/searchlib/src/vespa/searchlib/tensor/tensor_attribute.h @@ -5,7 +5,7 @@ #include <vespa/searchlib/attribute/not_implemented_attribute.h> #include "tensor_store.h" #include <vespa/searchlib/common/rcuvector.h> -#include <vespa/vespalib/tensor/tensor_mapper.h> +#include <vespa/eval/tensor/tensor_mapper.h> namespace vespalib { namespace tensor { class Tensor; } } diff --git a/searchsummary/src/vespa/searchsummary/docsummary/attributedfw.cpp b/searchsummary/src/vespa/searchsummary/docsummary/attributedfw.cpp index cb8a3dc7680..6af943c516b 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/attributedfw.cpp +++ b/searchsummary/src/vespa/searchsummary/docsummary/attributedfw.cpp @@ -7,8 +7,8 @@ #include "docsumwriter.h" #include "attributedfw.h" #include "docsumstate.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/vespalib/data/slime/slime.h> diff --git a/streamingvisitors/src/vespa/searchvisitor/indexenvironment.h b/streamingvisitors/src/vespa/searchvisitor/indexenvironment.h index 469fe459cbe..61a0805e0c1 100644 --- a/streamingvisitors/src/vespa/searchvisitor/indexenvironment.h +++ b/streamingvisitors/src/vespa/searchvisitor/indexenvironment.h @@ -7,7 +7,7 @@ #include <vespa/searchlib/fef/properties.h> #include <vespa/searchlib/fef/fieldinfo.h> #include <vespa/searchlib/fef/fieldtype.h> -#include <vespa/vespalib/eval/value_cache/constant_value.h> +#include <vespa/eval/eval/value_cache/constant_value.h> #include <vespa/vespalib/stllike/string.h> #include <vespa/vespalib/stllike/hash_map.h> #include <set> |