diff options
74 files changed, 199 insertions, 199 deletions
diff --git a/eval/src/apps/eval_expr/eval_expr.cpp b/eval/src/apps/eval_expr/eval_expr.cpp index dc5274cde47..06566f9ed80 100644 --- a/eval/src/apps/eval_expr/eval_expr.cpp +++ b/eval/src/apps/eval_expr/eval_expr.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 <vespa/fastos/fastos.h> -#include <vespa/vespalib/eval/function.h> -#include <vespa/vespalib/eval/interpreted_function.h> +#include <vespa/eval/eval/function.h> +#include <vespa/eval/eval/interpreted_function.h> using namespace vespalib::eval; diff --git a/eval/src/tests/eval/compile_cache/compile_cache_test.cpp b/eval/src/tests/eval/compile_cache/compile_cache_test.cpp index f80df8090d9..ffcb623c00e 100644 --- a/eval/src/tests/eval/compile_cache/compile_cache_test.cpp +++ b/eval/src/tests/eval/compile_cache/compile_cache_test.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 <vespa/vespalib/testkit/test_kit.h> -#include <vespa/vespalib/eval/llvm/compile_cache.h> -#include <vespa/vespalib/eval/key_gen.h> -#include <vespa/vespalib/eval/test/eval_spec.h> +#include <vespa/eval/eval/llvm/compile_cache.h> +#include <vespa/eval/eval/key_gen.h> +#include <vespa/eval/eval/test/eval_spec.h> #include <set> using namespace vespalib::eval; diff --git a/eval/src/tests/eval/compiled_function/compiled_function_test.cpp b/eval/src/tests/eval/compiled_function/compiled_function_test.cpp index 882dd1b330e..953fe74ae6b 100644 --- a/eval/src/tests/eval/compiled_function/compiled_function_test.cpp +++ b/eval/src/tests/eval/compiled_function/compiled_function_test.cpp @@ -1,9 +1,9 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include <vespa/vespalib/testkit/test_kit.h> -#include <vespa/vespalib/eval/function.h> -#include <vespa/vespalib/eval/llvm/compiled_function.h> -#include <vespa/vespalib/eval/test/eval_spec.h> -#include <vespa/vespalib/eval/basic_nodes.h> +#include <vespa/eval/eval/function.h> +#include <vespa/eval/eval/llvm/compiled_function.h> +#include <vespa/eval/eval/test/eval_spec.h> +#include <vespa/eval/eval/basic_nodes.h> #include <vespa/vespalib/util/stringfmt.h> #include <cmath> #include <vespa/vespalib/test/insertion_operators.h> diff --git a/eval/src/tests/eval/function/function_test.cpp b/eval/src/tests/eval/function/function_test.cpp index d3cb55a1cef..306fdb95386 100644 --- a/eval/src/tests/eval/function/function_test.cpp +++ b/eval/src/tests/eval/function/function_test.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 <vespa/vespalib/testkit/test_kit.h> -#include <vespa/vespalib/eval/function.h> -#include <vespa/vespalib/eval/operator_nodes.h> -#include <vespa/vespalib/eval/node_traverser.h> +#include <vespa/eval/eval/function.h> +#include <vespa/eval/eval/operator_nodes.h> +#include <vespa/eval/eval/node_traverser.h> #include <set> -#include <vespa/vespalib/eval/test/eval_spec.h> -#include <vespa/vespalib/eval/check_type.h> +#include <vespa/eval/eval/test/eval_spec.h> +#include <vespa/eval/eval/check_type.h> using namespace vespalib::eval; using namespace vespalib::eval::nodes; diff --git a/eval/src/tests/eval/function_speed/function_speed_test.cpp b/eval/src/tests/eval/function_speed/function_speed_test.cpp index 44e05f264dd..41463f0ef5b 100644 --- a/eval/src/tests/eval/function_speed/function_speed_test.cpp +++ b/eval/src/tests/eval/function_speed/function_speed_test.cpp @@ -1,9 +1,9 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include <vespa/vespalib/testkit/test_kit.h> -#include <vespa/vespalib/eval/function.h> -#include <vespa/vespalib/eval/llvm/compiled_function.h> +#include <vespa/eval/eval/function.h> +#include <vespa/eval/eval/llvm/compiled_function.h> #include <vespa/vespalib/util/benchmark_timer.h> -#include <vespa/vespalib/eval/interpreted_function.h> +#include <vespa/eval/eval/interpreted_function.h> using namespace vespalib::eval; diff --git a/eval/src/tests/eval/gbdt/gbdt_benchmark.cpp b/eval/src/tests/eval/gbdt/gbdt_benchmark.cpp index ee25b68eb96..1f8cde5b1bb 100644 --- a/eval/src/tests/eval/gbdt/gbdt_benchmark.cpp +++ b/eval/src/tests/eval/gbdt/gbdt_benchmark.cpp @@ -1,10 +1,10 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include <vespa/vespalib/testkit/test_kit.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/eval/llvm/compiled_function.h> -#include <vespa/vespalib/eval/function.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/eval/llvm/compiled_function.h> +#include <vespa/eval/eval/function.h> #include <vespa/vespalib/util/benchmark_timer.h> #include <vespa/vespalib/util/stringfmt.h> #include "model.cpp" diff --git a/eval/src/tests/eval/gbdt/gbdt_test.cpp b/eval/src/tests/eval/gbdt/gbdt_test.cpp index 195836d9827..58e4fca2d12 100644 --- a/eval/src/tests/eval/gbdt/gbdt_test.cpp +++ b/eval/src/tests/eval/gbdt/gbdt_test.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 <vespa/vespalib/testkit/test_kit.h> -#include <vespa/vespalib/eval/gbdt.h> -#include <vespa/vespalib/eval/vm_forest.h> -#include <vespa/vespalib/eval/function.h> -#include <vespa/vespalib/eval/llvm/deinline_forest.h> -#include <vespa/vespalib/eval/llvm/compiled_function.h> -#include <vespa/vespalib/eval/interpreted_function.h> +#include <vespa/eval/eval/gbdt.h> +#include <vespa/eval/eval/vm_forest.h> +#include <vespa/eval/eval/function.h> +#include <vespa/eval/eval/llvm/deinline_forest.h> +#include <vespa/eval/eval/llvm/compiled_function.h> +#include <vespa/eval/eval/interpreted_function.h> #include <vespa/vespalib/util/stringfmt.h> #include "model.cpp" diff --git a/eval/src/tests/eval/gbdt/model.cpp b/eval/src/tests/eval/gbdt/model.cpp index e125d9e77d2..245c111086e 100644 --- a/eval/src/tests/eval/gbdt/model.cpp +++ b/eval/src/tests/eval/gbdt/model.cpp @@ -2,7 +2,7 @@ #pragma once #include <random> -#include <vespa/vespalib/eval/function.h> +#include <vespa/eval/eval/function.h> using vespalib::make_string; using vespalib::eval::Function; diff --git a/eval/src/tests/eval/interpreted_function/interpreted_function_test.cpp b/eval/src/tests/eval/interpreted_function/interpreted_function_test.cpp index 71aaaf0ec42..d39427ac232 100644 --- a/eval/src/tests/eval/interpreted_function/interpreted_function_test.cpp +++ b/eval/src/tests/eval/interpreted_function/interpreted_function_test.cpp @@ -1,10 +1,10 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include <vespa/vespalib/testkit/test_kit.h> -#include <vespa/vespalib/eval/function.h> -#include <vespa/vespalib/eval/tensor_spec.h> -#include <vespa/vespalib/eval/interpreted_function.h> -#include <vespa/vespalib/eval/test/eval_spec.h> -#include <vespa/vespalib/eval/basic_nodes.h> +#include <vespa/eval/eval/function.h> +#include <vespa/eval/eval/tensor_spec.h> +#include <vespa/eval/eval/interpreted_function.h> +#include <vespa/eval/eval/test/eval_spec.h> +#include <vespa/eval/eval/basic_nodes.h> #include <vespa/vespalib/util/stringfmt.h> #include <vespa/vespalib/util/stash.h> #include <vespa/vespalib/test/insertion_operators.h> diff --git a/eval/src/tests/eval/node_types/node_types_test.cpp b/eval/src/tests/eval/node_types/node_types_test.cpp index 5dd74e638d2..f6ae0cc8fc3 100644 --- a/eval/src/tests/eval/node_types/node_types_test.cpp +++ b/eval/src/tests/eval/node_types/node_types_test.cpp @@ -1,9 +1,9 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include <vespa/vespalib/testkit/test_kit.h> -#include <vespa/vespalib/eval/function.h> -#include <vespa/vespalib/eval/value_type.h> -#include <vespa/vespalib/eval/value_type_spec.h> -#include <vespa/vespalib/eval/node_types.h> +#include <vespa/eval/eval/function.h> +#include <vespa/eval/eval/value_type.h> +#include <vespa/eval/eval/value_type_spec.h> +#include <vespa/eval/eval/node_types.h> using namespace vespalib::eval; diff --git a/eval/src/tests/eval/simple_tensor/simple_tensor_test.cpp b/eval/src/tests/eval/simple_tensor/simple_tensor_test.cpp index 36cb9f773c1..5f17259eec4 100644 --- a/eval/src/tests/eval/simple_tensor/simple_tensor_test.cpp +++ b/eval/src/tests/eval/simple_tensor/simple_tensor_test.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 <vespa/vespalib/testkit/test_kit.h> -#include <vespa/vespalib/eval/simple_tensor.h> -#include <vespa/vespalib/eval/simple_tensor_engine.h> -#include <vespa/vespalib/eval/operation.h> +#include <vespa/eval/eval/simple_tensor.h> +#include <vespa/eval/eval/simple_tensor_engine.h> +#include <vespa/eval/eval/operation.h> #include <vespa/vespalib/util/stash.h> #include <iostream> diff --git a/eval/src/tests/eval/tensor_function/tensor_function_test.cpp b/eval/src/tests/eval/tensor_function/tensor_function_test.cpp index 50aee92a17b..cfaef979ed0 100644 --- a/eval/src/tests/eval/tensor_function/tensor_function_test.cpp +++ b/eval/src/tests/eval/tensor_function/tensor_function_test.cpp @@ -1,10 +1,10 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include <vespa/vespalib/testkit/test_kit.h> -#include <vespa/vespalib/eval/operation.h> -#include <vespa/vespalib/eval/simple_tensor.h> -#include <vespa/vespalib/eval/simple_tensor_engine.h> -#include <vespa/vespalib/eval/tensor_function.h> -#include <vespa/vespalib/eval/value_type.h> +#include <vespa/eval/eval/operation.h> +#include <vespa/eval/eval/simple_tensor.h> +#include <vespa/eval/eval/simple_tensor_engine.h> +#include <vespa/eval/eval/tensor_function.h> +#include <vespa/eval/eval/value_type.h> #include <vespa/vespalib/util/stash.h> #include <map> diff --git a/eval/src/tests/eval/value_cache/tensor_loader_test.cpp b/eval/src/tests/eval/value_cache/tensor_loader_test.cpp index 8725eab597b..d3ec7aae546 100644 --- a/eval/src/tests/eval/value_cache/tensor_loader_test.cpp +++ b/eval/src/tests/eval/value_cache/tensor_loader_test.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 <vespa/vespalib/testkit/test_kit.h> -#include <vespa/vespalib/eval/value_cache/constant_tensor_loader.h> -#include <vespa/vespalib/eval/simple_tensor_engine.h> -#include <vespa/vespalib/eval/tensor_spec.h> +#include <vespa/eval/eval/value_cache/constant_tensor_loader.h> +#include <vespa/eval/eval/simple_tensor_engine.h> +#include <vespa/eval/eval/tensor_spec.h> using namespace vespalib::eval; diff --git a/eval/src/tests/eval/value_cache/value_cache_test.cpp b/eval/src/tests/eval/value_cache/value_cache_test.cpp index ff991382a3a..4a4b8e286e8 100644 --- a/eval/src/tests/eval/value_cache/value_cache_test.cpp +++ b/eval/src/tests/eval/value_cache/value_cache_test.cpp @@ -1,9 +1,9 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include <vespa/vespalib/testkit/test_kit.h> -#include <vespa/vespalib/eval/value_cache/constant_value_cache.h> -#include <vespa/vespalib/eval/value_cache/constant_value.h> -#include <vespa/vespalib/eval/value.h> -#include <vespa/vespalib/eval/value_type.h> +#include <vespa/eval/eval/value_cache/constant_value_cache.h> +#include <vespa/eval/eval/value_cache/constant_value.h> +#include <vespa/eval/eval/value.h> +#include <vespa/eval/eval/value_type.h> using namespace vespalib::eval; diff --git a/eval/src/tests/eval/value_type/value_type_test.cpp b/eval/src/tests/eval/value_type/value_type_test.cpp index 1a1f1ae6cca..529d45e616d 100644 --- a/eval/src/tests/eval/value_type/value_type_test.cpp +++ b/eval/src/tests/eval/value_type/value_type_test.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 <vespa/vespalib/testkit/test_kit.h> -#include <vespa/vespalib/eval/value_type.h> -#include <vespa/vespalib/eval/value_type_spec.h> +#include <vespa/eval/eval/value_type.h> +#include <vespa/eval/eval/value_type_spec.h> #include <vespa/vespalib/util/stringfmt.h> #include <vespa/vespalib/test/insertion_operators.h> #include <ostream> diff --git a/eval/src/tests/tensor/dense_dot_product_function/dense_dot_product_function_test.cpp b/eval/src/tests/tensor/dense_dot_product_function/dense_dot_product_function_test.cpp index 3ffcdd7a567..8b7ea1d03a9 100644 --- a/eval/src/tests/tensor/dense_dot_product_function/dense_dot_product_function_test.cpp +++ b/eval/src/tests/tensor/dense_dot_product_function/dense_dot_product_function_test.cpp @@ -4,11 +4,11 @@ LOG_SETUP("dense_dot_product_function_test"); #include <vespa/vespalib/testkit/test_kit.h> -#include <vespa/vespalib/eval/tensor_function.h> -#include <vespa/vespalib/tensor/dense/dense_dot_product_function.h> -#include <vespa/vespalib/tensor/dense/dense_tensor.h> -#include <vespa/vespalib/tensor/dense/dense_tensor_builder.h> -#include <vespa/vespalib/tensor/dense/dense_tensor_view.h> +#include <vespa/eval/eval/tensor_function.h> +#include <vespa/eval/tensor/dense/dense_dot_product_function.h> +#include <vespa/eval/tensor/dense/dense_tensor.h> +#include <vespa/eval/tensor/dense/dense_tensor_builder.h> +#include <vespa/eval/tensor/dense/dense_tensor_view.h> #include <vespa/vespalib/util/stringfmt.h> #include <vespa/vespalib/util/stash.h> diff --git a/eval/src/tests/tensor/dense_tensor_address_combiner/dense_tensor_address_combiner_test.cpp b/eval/src/tests/tensor/dense_tensor_address_combiner/dense_tensor_address_combiner_test.cpp index 37f95172251..cf2c3fdf0da 100644 --- a/eval/src/tests/tensor/dense_tensor_address_combiner/dense_tensor_address_combiner_test.cpp +++ b/eval/src/tests/tensor/dense_tensor_address_combiner/dense_tensor_address_combiner_test.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 <vespa/vespalib/testkit/test_kit.h> -#include <vespa/vespalib/tensor/dense/dense_tensor_address_combiner.h> +#include <vespa/eval/tensor/dense/dense_tensor_address_combiner.h> #include <vespa/vespalib/test/insertion_operators.h> using namespace vespalib::tensor; diff --git a/eval/src/tests/tensor/dense_tensor_builder/dense_tensor_builder_test.cpp b/eval/src/tests/tensor/dense_tensor_builder/dense_tensor_builder_test.cpp index 5036f247db3..0f34afa6079 100644 --- a/eval/src/tests/tensor/dense_tensor_builder/dense_tensor_builder_test.cpp +++ b/eval/src/tests/tensor/dense_tensor_builder/dense_tensor_builder_test.cpp @@ -2,7 +2,7 @@ #include <vespa/vespalib/test/insertion_operators.h> #include <vespa/vespalib/testkit/test_kit.h> -#include <vespa/vespalib/tensor/dense/dense_tensor_builder.h> +#include <vespa/eval/tensor/dense/dense_tensor_builder.h> #include <vespa/vespalib/util/exceptions.h> using namespace vespalib::tensor; diff --git a/eval/src/tests/tensor/dense_tensor_function_compiler/dense_tensor_function_compiler_test.cpp b/eval/src/tests/tensor/dense_tensor_function_compiler/dense_tensor_function_compiler_test.cpp index c1420f2b8d2..bdb91e55e15 100644 --- a/eval/src/tests/tensor/dense_tensor_function_compiler/dense_tensor_function_compiler_test.cpp +++ b/eval/src/tests/tensor/dense_tensor_function_compiler/dense_tensor_function_compiler_test.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 <vespa/vespalib/testkit/test_kit.h> -#include <vespa/vespalib/tensor/dense/dense_dot_product_function.h> -#include <vespa/vespalib/tensor/dense/dense_tensor_function_compiler.h> +#include <vespa/eval/tensor/dense/dense_dot_product_function.h> +#include <vespa/eval/tensor/dense/dense_tensor_function_compiler.h> using namespace vespalib::eval; using namespace vespalib::eval::operation; diff --git a/eval/src/tests/tensor/sparse_tensor_builder/sparse_tensor_builder_test.cpp b/eval/src/tests/tensor/sparse_tensor_builder/sparse_tensor_builder_test.cpp index d1ad41e8a7e..e802feac17e 100644 --- a/eval/src/tests/tensor/sparse_tensor_builder/sparse_tensor_builder_test.cpp +++ b/eval/src/tests/tensor/sparse_tensor_builder/sparse_tensor_builder_test.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 <vespa/vespalib/testkit/test_kit.h> -#include <vespa/vespalib/tensor/sparse/sparse_tensor_builder.h> +#include <vespa/eval/tensor/sparse/sparse_tensor_builder.h> #include <vespa/vespalib/test/insertion_operators.h> using namespace vespalib::tensor; diff --git a/eval/src/tests/tensor/tensor_address/tensor_address_test.cpp b/eval/src/tests/tensor/tensor_address/tensor_address_test.cpp index 70f33bdf0c4..a875859eebc 100644 --- a/eval/src/tests/tensor/tensor_address/tensor_address_test.cpp +++ b/eval/src/tests/tensor/tensor_address/tensor_address_test.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 <vespa/vespalib/testkit/test_kit.h> -#include <vespa/vespalib/tensor/tensor_address.h> +#include <vespa/eval/tensor/tensor_address.h> using namespace vespalib::tensor; diff --git a/eval/src/tests/tensor/tensor_conformance/tensor_conformance_test.cpp b/eval/src/tests/tensor/tensor_conformance/tensor_conformance_test.cpp index 238d0604ee7..1865f863e4d 100644 --- a/eval/src/tests/tensor/tensor_conformance/tensor_conformance_test.cpp +++ b/eval/src/tests/tensor/tensor_conformance/tensor_conformance_test.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 <vespa/vespalib/testkit/test_kit.h> -#include <vespa/vespalib/eval/test/tensor_conformance.h> -#include <vespa/vespalib/eval/simple_tensor_engine.h> -#include <vespa/vespalib/tensor/default_tensor_engine.h> +#include <vespa/eval/eval/test/tensor_conformance.h> +#include <vespa/eval/eval/simple_tensor_engine.h> +#include <vespa/eval/tensor/default_tensor_engine.h> using vespalib::eval::SimpleTensorEngine; using vespalib::eval::test::TensorConformance; diff --git a/eval/src/tests/tensor/tensor_mapper/tensor_mapper_test.cpp b/eval/src/tests/tensor/tensor_mapper/tensor_mapper_test.cpp index f4edd8901e4..8fede7e3d0b 100644 --- a/eval/src/tests/tensor/tensor_mapper/tensor_mapper_test.cpp +++ b/eval/src/tests/tensor/tensor_mapper/tensor_mapper_test.cpp @@ -2,14 +2,14 @@ #include <vespa/vespalib/testkit/test_kit.h> #include <vespa/vespalib/util/stringfmt.h> -#include <vespa/vespalib/tensor/sparse/sparse_tensor.h> -#include <vespa/vespalib/tensor/sparse/sparse_tensor_builder.h> -#include <vespa/vespalib/tensor/dense/dense_tensor.h> -#include <vespa/vespalib/tensor/dense/dense_tensor_builder.h> -#include <vespa/vespalib/tensor/types.h> -#include <vespa/vespalib/tensor/tensor_factory.h> -#include <vespa/vespalib/tensor/tensor_mapper.h> -#include <vespa/vespalib/tensor/default_tensor.h> +#include <vespa/eval/tensor/sparse/sparse_tensor.h> +#include <vespa/eval/tensor/sparse/sparse_tensor_builder.h> +#include <vespa/eval/tensor/dense/dense_tensor.h> +#include <vespa/eval/tensor/dense/dense_tensor_builder.h> +#include <vespa/eval/tensor/types.h> +#include <vespa/eval/tensor/tensor_factory.h> +#include <vespa/eval/tensor/tensor_mapper.h> +#include <vespa/eval/tensor/default_tensor.h> #include <ostream> using vespalib::eval::ValueType; diff --git a/eval/src/tests/tensor/tensor_performance/tensor_performance_test.cpp b/eval/src/tests/tensor/tensor_performance/tensor_performance_test.cpp index 8dc57bd0f71..105eb955413 100644 --- a/eval/src/tests/tensor/tensor_performance/tensor_performance_test.cpp +++ b/eval/src/tests/tensor/tensor_performance/tensor_performance_test.cpp @@ -1,16 +1,16 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include <vespa/vespalib/testkit/test_kit.h> -#include <vespa/vespalib/eval/function.h> -#include <vespa/vespalib/eval/interpreted_function.h> -#include <vespa/vespalib/eval/tensor_nodes.h> -#include <vespa/vespalib/eval/tensor_spec.h> -#include <vespa/vespalib/tensor/sparse/sparse_tensor.h> -#include <vespa/vespalib/tensor/sparse/sparse_tensor_builder.h> -#include <vespa/vespalib/tensor/dense/dense_tensor_builder.h> -#include <vespa/vespalib/tensor/tensor.h> -#include <vespa/vespalib/tensor/tensor_builder.h> +#include <vespa/eval/eval/function.h> +#include <vespa/eval/eval/interpreted_function.h> +#include <vespa/eval/eval/tensor_nodes.h> +#include <vespa/eval/eval/tensor_spec.h> +#include <vespa/eval/tensor/sparse/sparse_tensor.h> +#include <vespa/eval/tensor/sparse/sparse_tensor_builder.h> +#include <vespa/eval/tensor/dense/dense_tensor_builder.h> +#include <vespa/eval/tensor/tensor.h> +#include <vespa/eval/tensor/tensor_builder.h> #include <vespa/vespalib/util/benchmark_timer.h> -#include <vespa/vespalib/tensor/default_tensor_engine.h> +#include <vespa/eval/tensor/default_tensor_engine.h> using namespace vespalib; using namespace vespalib::eval; diff --git a/eval/src/tests/tensor/tensor_serialization/tensor_serialization_test.cpp b/eval/src/tests/tensor/tensor_serialization/tensor_serialization_test.cpp index 95d6a45f196..b072b8ec3f8 100644 --- a/eval/src/tests/tensor/tensor_serialization/tensor_serialization_test.cpp +++ b/eval/src/tests/tensor/tensor_serialization/tensor_serialization_test.cpp @@ -1,13 +1,13 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include <vespa/vespalib/testkit/test_kit.h> -#include <vespa/vespalib/tensor/sparse/sparse_tensor.h> -#include <vespa/vespalib/tensor/sparse/sparse_tensor_builder.h> -#include <vespa/vespalib/tensor/types.h> -#include <vespa/vespalib/tensor/default_tensor.h> -#include <vespa/vespalib/tensor/tensor_factory.h> -#include <vespa/vespalib/tensor/serialization/typed_binary_format.h> -#include <vespa/vespalib/tensor/serialization/sparse_binary_format.h> +#include <vespa/eval/tensor/sparse/sparse_tensor.h> +#include <vespa/eval/tensor/sparse/sparse_tensor_builder.h> +#include <vespa/eval/tensor/types.h> +#include <vespa/eval/tensor/default_tensor.h> +#include <vespa/eval/tensor/tensor_factory.h> +#include <vespa/eval/tensor/serialization/typed_binary_format.h> +#include <vespa/eval/tensor/serialization/sparse_binary_format.h> #include <vespa/vespalib/objects/nbostream.h> #include <vespa/vespalib/objects/hexdump.h> #include <ostream> diff --git a/eval/src/tests/tensor/tensor_slime_serialization/tensor_slime_serialization_test.cpp b/eval/src/tests/tensor/tensor_slime_serialization/tensor_slime_serialization_test.cpp index f3005a21730..0a916ad871a 100644 --- a/eval/src/tests/tensor/tensor_slime_serialization/tensor_slime_serialization_test.cpp +++ b/eval/src/tests/tensor/tensor_slime_serialization/tensor_slime_serialization_test.cpp @@ -1,13 +1,13 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include <vespa/vespalib/testkit/test_kit.h> -#include <vespa/vespalib/tensor/sparse/sparse_tensor.h> -#include <vespa/vespalib/tensor/sparse/sparse_tensor_builder.h> -#include <vespa/vespalib/tensor/types.h> -#include <vespa/vespalib/tensor/default_tensor.h> -#include <vespa/vespalib/tensor/tensor_factory.h> -#include <vespa/vespalib/tensor/serialization/typed_binary_format.h> -#include <vespa/vespalib/tensor/serialization/slime_binary_format.h> +#include <vespa/eval/tensor/sparse/sparse_tensor.h> +#include <vespa/eval/tensor/sparse/sparse_tensor_builder.h> +#include <vespa/eval/tensor/types.h> +#include <vespa/eval/tensor/default_tensor.h> +#include <vespa/eval/tensor/tensor_factory.h> +#include <vespa/eval/tensor/serialization/typed_binary_format.h> +#include <vespa/eval/tensor/serialization/slime_binary_format.h> #include <vespa/vespalib/data/slime/slime.h> #include <iostream> diff --git a/eval/src/vespa/eval/eval/gbdt.cpp b/eval/src/vespa/eval/eval/gbdt.cpp index 893692c6889..9e9e6d09e59 100644 --- a/eval/src/vespa/eval/eval/gbdt.cpp +++ b/eval/src/vespa/eval/eval/gbdt.cpp @@ -2,9 +2,9 @@ #include <vespa/fastos/fastos.h> #include "gbdt.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/basic_nodes.h> +#include <vespa/eval/eval/call_nodes.h> +#include <vespa/eval/eval/operator_nodes.h> #include "vm_forest.h" namespace vespalib { diff --git a/eval/src/vespa/eval/eval/llvm/compile_cache.cpp b/eval/src/vespa/eval/eval/llvm/compile_cache.cpp index 1f7731da403..6bd4484db68 100644 --- a/eval/src/vespa/eval/eval/llvm/compile_cache.cpp +++ b/eval/src/vespa/eval/eval/llvm/compile_cache.cpp @@ -2,7 +2,7 @@ #include <vespa/fastos/fastos.h> #include "compile_cache.h" -#include <vespa/vespalib/eval/key_gen.h> +#include <vespa/eval/eval/key_gen.h> #include <thread> namespace vespalib { diff --git a/eval/src/vespa/eval/eval/llvm/compiled_function.cpp b/eval/src/vespa/eval/eval/llvm/compiled_function.cpp index 5c6214c503a..694613ea354 100644 --- a/eval/src/vespa/eval/eval/llvm/compiled_function.cpp +++ b/eval/src/vespa/eval/eval/llvm/compiled_function.cpp @@ -3,9 +3,9 @@ #include <vespa/fastos/fastos.h> #include "compiled_function.h" #include <vespa/vespalib/util/benchmark_timer.h> -#include <vespa/vespalib/eval/node_traverser.h> -#include <vespa/vespalib/eval/check_type.h> -#include <vespa/vespalib/eval/tensor_nodes.h> +#include <vespa/eval/eval/node_traverser.h> +#include <vespa/eval/eval/check_type.h> +#include <vespa/eval/eval/tensor_nodes.h> #include <vespa/vespalib/util/classname.h> namespace vespalib { diff --git a/eval/src/vespa/eval/eval/llvm/compiled_function.h b/eval/src/vespa/eval/eval/llvm/compiled_function.h index 3b10d9a20c5..41754cfb413 100644 --- a/eval/src/vespa/eval/eval/llvm/compiled_function.h +++ b/eval/src/vespa/eval/eval/llvm/compiled_function.h @@ -2,8 +2,8 @@ #pragma once -#include <vespa/vespalib/eval/function.h> -#include <vespa/vespalib/eval/gbdt.h> +#include <vespa/eval/eval/function.h> +#include <vespa/eval/eval/gbdt.h> #include "llvm_wrapper.h" namespace vespalib { diff --git a/eval/src/vespa/eval/eval/llvm/deinline_forest.h b/eval/src/vespa/eval/eval/llvm/deinline_forest.h index f44d1b3fc8b..2ac3233cae4 100644 --- a/eval/src/vespa/eval/eval/llvm/deinline_forest.h +++ b/eval/src/vespa/eval/eval/llvm/deinline_forest.h @@ -2,7 +2,7 @@ #pragma once -#include <vespa/vespalib/eval/gbdt.h> +#include <vespa/eval/eval/gbdt.h> #include "llvm_wrapper.h" namespace vespalib { diff --git a/eval/src/vespa/eval/eval/llvm/llvm_wrapper.cpp b/eval/src/vespa/eval/eval/llvm/llvm_wrapper.cpp index 1222eeae837..e917261240f 100644 --- a/eval/src/vespa/eval/eval/llvm/llvm_wrapper.cpp +++ b/eval/src/vespa/eval/eval/llvm/llvm_wrapper.cpp @@ -2,8 +2,8 @@ #include <cmath> #include "llvm_wrapper.h" -#include <vespa/vespalib/eval/node_visitor.h> -#include <vespa/vespalib/eval/node_traverser.h> +#include <vespa/eval/eval/node_visitor.h> +#include <vespa/eval/eval/node_traverser.h> #include <llvm/Analysis/Verifier.h> #include <llvm/IR/IRBuilder.h> #include <llvm/IR/Intrinsics.h> @@ -13,7 +13,7 @@ #include <llvm/Transforms/Scalar.h> #include <llvm/LinkAllPasses.h> #include <llvm/Transforms/IPO/PassManagerBuilder.h> -#include <vespa/vespalib/eval/check_type.h> +#include <vespa/eval/eval/check_type.h> #include <vespa/vespalib/stllike/hash_set.h> #include <vespa/vespalib/util/approx.h> diff --git a/eval/src/vespa/eval/eval/llvm/llvm_wrapper.h b/eval/src/vespa/eval/eval/llvm/llvm_wrapper.h index ffb4fbd4986..6eb7ddf2f2b 100644 --- a/eval/src/vespa/eval/eval/llvm/llvm_wrapper.h +++ b/eval/src/vespa/eval/eval/llvm/llvm_wrapper.h @@ -2,8 +2,8 @@ #pragma once -#include <vespa/vespalib/eval/function.h> -#include <vespa/vespalib/eval/gbdt.h> +#include <vespa/eval/eval/function.h> +#include <vespa/eval/eval/gbdt.h> #include <llvm/IR/LLVMContext.h> #include <llvm/IR/Module.h> diff --git a/eval/src/vespa/eval/eval/test/tensor_conformance.cpp b/eval/src/vespa/eval/eval/test/tensor_conformance.cpp index d554de52865..ae9b3e98a15 100644 --- a/eval/src/vespa/eval/eval/test/tensor_conformance.cpp +++ b/eval/src/vespa/eval/eval/test/tensor_conformance.cpp @@ -4,11 +4,11 @@ #include <vespa/vespalib/testkit/test_kit.h> #include "tensor_conformance.h" #include <vespa/vespalib/util/stringfmt.h> -#include <vespa/vespalib/eval/simple_tensor_engine.h> -#include <vespa/vespalib/eval/tensor_spec.h> -#include <vespa/vespalib/eval/function.h> -#include <vespa/vespalib/eval/tensor_function.h> -#include <vespa/vespalib/eval/interpreted_function.h> +#include <vespa/eval/eval/simple_tensor_engine.h> +#include <vespa/eval/eval/tensor_spec.h> +#include <vespa/eval/eval/function.h> +#include <vespa/eval/eval/tensor_function.h> +#include <vespa/eval/eval/interpreted_function.h> namespace vespalib { namespace eval { diff --git a/eval/src/vespa/eval/eval/test/tensor_conformance.h b/eval/src/vespa/eval/eval/test/tensor_conformance.h index ed1ff618f49..054a1bb8faa 100644 --- a/eval/src/vespa/eval/eval/test/tensor_conformance.h +++ b/eval/src/vespa/eval/eval/test/tensor_conformance.h @@ -2,7 +2,7 @@ #pragma once -#include <vespa/vespalib/eval/tensor_engine.h> +#include <vespa/eval/eval/tensor_engine.h> namespace vespalib { namespace eval { diff --git a/eval/src/vespa/eval/eval/value_cache/constant_tensor_loader.cpp b/eval/src/vespa/eval/eval/value_cache/constant_tensor_loader.cpp index eedccd3a33e..d04b7ae3c2b 100644 --- a/eval/src/vespa/eval/eval/value_cache/constant_tensor_loader.cpp +++ b/eval/src/vespa/eval/eval/value_cache/constant_tensor_loader.cpp @@ -6,9 +6,9 @@ #include "constant_tensor_loader.h" #include <set> #include <vespa/vespalib/data/slime/slime.h> -#include <vespa/vespalib/eval/tensor.h> -#include <vespa/vespalib/eval/tensor_engine.h> -#include <vespa/vespalib/eval/tensor_spec.h> +#include <vespa/eval/eval/tensor.h> +#include <vespa/eval/eval/tensor_engine.h> +#include <vespa/eval/eval/tensor_spec.h> LOG_SETUP(".vespalib.eval.value_cache.constant_tensor_loader"); diff --git a/eval/src/vespa/eval/eval/value_cache/constant_tensor_loader.h b/eval/src/vespa/eval/eval/value_cache/constant_tensor_loader.h index 66fb3fad882..c3ef06300ea 100644 --- a/eval/src/vespa/eval/eval/value_cache/constant_tensor_loader.h +++ b/eval/src/vespa/eval/eval/value_cache/constant_tensor_loader.h @@ -3,7 +3,7 @@ #pragma once #include "constant_value.h" -#include <vespa/vespalib/eval/tensor_engine.h> +#include <vespa/eval/eval/tensor_engine.h> #include <vespa/vespalib/stllike/string.h> namespace vespalib { diff --git a/eval/src/vespa/eval/eval/value_cache/constant_value.h b/eval/src/vespa/eval/eval/value_cache/constant_value.h index 570276a50ab..88f01bbdfa9 100644 --- a/eval/src/vespa/eval/eval/value_cache/constant_value.h +++ b/eval/src/vespa/eval/eval/value_cache/constant_value.h @@ -3,8 +3,8 @@ #pragma once #include <memory> -#include <vespa/vespalib/eval/value.h> -#include <vespa/vespalib/eval/value_type.h> +#include <vespa/eval/eval/value.h> +#include <vespa/eval/eval/value_type.h> namespace vespalib { namespace eval { diff --git a/eval/src/vespa/eval/eval/vm_forest.cpp b/eval/src/vespa/eval/eval/vm_forest.cpp index 5c7164bab73..3cf5546f7eb 100644 --- a/eval/src/vespa/eval/eval/vm_forest.cpp +++ b/eval/src/vespa/eval/eval/vm_forest.cpp @@ -3,9 +3,9 @@ #include <vespa/fastos/fastos.h> #include "gbdt.h" #include "vm_forest.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/basic_nodes.h> +#include <vespa/eval/eval/call_nodes.h> +#include <vespa/eval/eval/operator_nodes.h> namespace vespalib { namespace eval { diff --git a/eval/src/vespa/eval/tensor/default_tensor_engine.cpp b/eval/src/vespa/eval/tensor/default_tensor_engine.cpp index 9b81bcf205b..dbd9615aa24 100644 --- a/eval/src/vespa/eval/tensor/default_tensor_engine.cpp +++ b/eval/src/vespa/eval/tensor/default_tensor_engine.cpp @@ -2,9 +2,9 @@ #include <vespa/fastos/fastos.h> #include "default_tensor_engine.h" -#include <vespa/vespalib/eval/value.h> -#include <vespa/vespalib/eval/tensor_spec.h> -#include <vespa/vespalib/eval/operation_visitor.h> +#include <vespa/eval/eval/value.h> +#include <vespa/eval/eval/tensor_spec.h> +#include <vespa/eval/eval/operation_visitor.h> #include "tensor.h" #include "dense/dense_tensor_builder.h" #include "dense/dense_tensor_function_compiler.h" diff --git a/eval/src/vespa/eval/tensor/default_tensor_engine.h b/eval/src/vespa/eval/tensor/default_tensor_engine.h index ac223721843..ad0003ff18d 100644 --- a/eval/src/vespa/eval/tensor/default_tensor_engine.h +++ b/eval/src/vespa/eval/tensor/default_tensor_engine.h @@ -2,7 +2,7 @@ #pragma once -#include <vespa/vespalib/eval/tensor_engine.h> +#include <vespa/eval/eval/tensor_engine.h> namespace vespalib { namespace tensor { diff --git a/eval/src/vespa/eval/tensor/dense/dense_dot_product_function.cpp b/eval/src/vespa/eval/tensor/dense/dense_dot_product_function.cpp index fbbcd949c29..ef400193427 100644 --- a/eval/src/vespa/eval/tensor/dense/dense_dot_product_function.cpp +++ b/eval/src/vespa/eval/tensor/dense/dense_dot_product_function.cpp @@ -4,8 +4,8 @@ #include "dense_dot_product_function.h" #include "dense_tensor.h" #include "dense_tensor_view.h" -#include <vespa/vespalib/eval/value.h> -#include <vespa/vespalib/tensor/tensor.h> +#include <vespa/eval/eval/value.h> +#include <vespa/eval/tensor/tensor.h> namespace vespalib { namespace tensor { diff --git a/eval/src/vespa/eval/tensor/dense/dense_dot_product_function.h b/eval/src/vespa/eval/tensor/dense/dense_dot_product_function.h index 9676003ef93..e20d28dd8b8 100644 --- a/eval/src/vespa/eval/tensor/dense/dense_dot_product_function.h +++ b/eval/src/vespa/eval/tensor/dense/dense_dot_product_function.h @@ -2,7 +2,7 @@ #pragma once -#include <vespa/vespalib/eval/tensor_function.h> +#include <vespa/eval/eval/tensor_function.h> #include <vespa/vespalib/hwaccelrated/iaccelrated.h> namespace vespalib { diff --git a/eval/src/vespa/eval/tensor/dense/dense_tensor.cpp b/eval/src/vespa/eval/tensor/dense/dense_tensor.cpp index 5967ea71820..1421aed887b 100644 --- a/eval/src/vespa/eval/tensor/dense/dense_tensor.cpp +++ b/eval/src/vespa/eval/tensor/dense/dense_tensor.cpp @@ -4,7 +4,7 @@ #include "dense_tensor.h" #include <vespa/vespalib/util/stringfmt.h> #include <vespa/vespalib/util/exceptions.h> -#include <vespa/vespalib/eval/operation.h> +#include <vespa/eval/eval/operation.h> #include <sstream> using vespalib::eval::TensorSpec; diff --git a/eval/src/vespa/eval/tensor/dense/dense_tensor.h b/eval/src/vespa/eval/tensor/dense/dense_tensor.h index bf59a639bdc..f4d6877bf61 100644 --- a/eval/src/vespa/eval/tensor/dense/dense_tensor.h +++ b/eval/src/vespa/eval/tensor/dense/dense_tensor.h @@ -2,9 +2,9 @@ #pragma once -#include <vespa/vespalib/tensor/tensor.h> -#include <vespa/vespalib/tensor/types.h> -#include <vespa/vespalib/eval/value_type.h> +#include <vespa/eval/tensor/tensor.h> +#include <vespa/eval/tensor/types.h> +#include <vespa/eval/eval/value_type.h> #include "dense_tensor_cells_iterator.h" #include "dense_tensor_view.h" diff --git a/eval/src/vespa/eval/tensor/dense/dense_tensor_address_combiner.h b/eval/src/vespa/eval/tensor/dense/dense_tensor_address_combiner.h index 75336da311b..482b7f86fc1 100644 --- a/eval/src/vespa/eval/tensor/dense/dense_tensor_address_combiner.h +++ b/eval/src/vespa/eval/tensor/dense/dense_tensor_address_combiner.h @@ -2,9 +2,9 @@ #pragma once -#include <vespa/vespalib/tensor/tensor.h> -#include <vespa/vespalib/tensor/types.h> -#include <vespa/vespalib/eval/value_type.h> +#include <vespa/eval/tensor/tensor.h> +#include <vespa/eval/tensor/types.h> +#include <vespa/eval/eval/value_type.h> #include "dense_tensor_cells_iterator.h" namespace vespalib { diff --git a/eval/src/vespa/eval/tensor/dense/dense_tensor_builder.h b/eval/src/vespa/eval/tensor/dense/dense_tensor_builder.h index 31e3b7cf451..722e7835d32 100644 --- a/eval/src/vespa/eval/tensor/dense/dense_tensor_builder.h +++ b/eval/src/vespa/eval/tensor/dense/dense_tensor_builder.h @@ -4,7 +4,7 @@ #include "dense_tensor.h" #include <vespa/vespalib/stllike/hash_map.h> -#include <vespa/vespalib/tensor/tensor_builder.h> +#include <vespa/eval/tensor/tensor_builder.h> namespace vespalib { namespace tensor { diff --git a/eval/src/vespa/eval/tensor/dense/dense_tensor_cells_iterator.h b/eval/src/vespa/eval/tensor/dense/dense_tensor_cells_iterator.h index c3d00fdb28d..043c04ecc76 100644 --- a/eval/src/vespa/eval/tensor/dense/dense_tensor_cells_iterator.h +++ b/eval/src/vespa/eval/tensor/dense/dense_tensor_cells_iterator.h @@ -2,10 +2,10 @@ #pragma once -#include <vespa/vespalib/tensor/tensor.h> -#include <vespa/vespalib/tensor/types.h> -#include <vespa/vespalib/eval/value_type.h> -#include <vespa/vespalib/tensor/tensor.h> +#include <vespa/eval/tensor/tensor.h> +#include <vespa/eval/tensor/types.h> +#include <vespa/eval/eval/value_type.h> +#include <vespa/eval/tensor/tensor.h> #include <vespa/vespalib/util/arrayref.h> namespace vespalib { diff --git a/eval/src/vespa/eval/tensor/dense/dense_tensor_function_compiler.cpp b/eval/src/vespa/eval/tensor/dense/dense_tensor_function_compiler.cpp index 8d981ece848..cac20a51c01 100644 --- a/eval/src/vespa/eval/tensor/dense/dense_tensor_function_compiler.cpp +++ b/eval/src/vespa/eval/tensor/dense/dense_tensor_function_compiler.cpp @@ -3,8 +3,8 @@ #include <vespa/fastos/fastos.h> #include "dense_dot_product_function.h" #include "dense_tensor_function_compiler.h" -#include <vespa/vespalib/eval/operation_visitor.h> -#include <vespa/vespalib/eval/operation_visitor.h> +#include <vespa/eval/eval/operation_visitor.h> +#include <vespa/eval/eval/operation_visitor.h> #include <vespa/vespalib/test/insertion_operators.h> #include <iostream> diff --git a/eval/src/vespa/eval/tensor/dense/dense_tensor_function_compiler.h b/eval/src/vespa/eval/tensor/dense/dense_tensor_function_compiler.h index 9d05d414bf1..5a1319b47ea 100644 --- a/eval/src/vespa/eval/tensor/dense/dense_tensor_function_compiler.h +++ b/eval/src/vespa/eval/tensor/dense/dense_tensor_function_compiler.h @@ -2,7 +2,7 @@ #pragma once -#include <vespa/vespalib/eval/tensor_function.h> +#include <vespa/eval/eval/tensor_function.h> namespace vespalib { namespace tensor { diff --git a/eval/src/vespa/eval/tensor/dense/dense_tensor_view.cpp b/eval/src/vespa/eval/tensor/dense/dense_tensor_view.cpp index 4bb9219059c..456cacc39bc 100644 --- a/eval/src/vespa/eval/tensor/dense/dense_tensor_view.cpp +++ b/eval/src/vespa/eval/tensor/dense/dense_tensor_view.cpp @@ -7,9 +7,9 @@ #include <vespa/vespalib/util/stringfmt.h> #include <vespa/vespalib/util/exceptions.h> #include <vespa/vespalib/stllike/asciistream.h> -#include <vespa/vespalib/tensor/tensor_address_builder.h> -#include <vespa/vespalib/tensor/tensor_visitor.h> -#include <vespa/vespalib/eval/operation.h> +#include <vespa/eval/tensor/tensor_address_builder.h> +#include <vespa/eval/tensor/tensor_visitor.h> +#include <vespa/eval/eval/operation.h> #include <sstream> using vespalib::eval::TensorSpec; diff --git a/eval/src/vespa/eval/tensor/dense/dense_tensor_view.h b/eval/src/vespa/eval/tensor/dense/dense_tensor_view.h index 218e1e4c4c6..4bf97267b7c 100644 --- a/eval/src/vespa/eval/tensor/dense/dense_tensor_view.h +++ b/eval/src/vespa/eval/tensor/dense/dense_tensor_view.h @@ -2,9 +2,9 @@ #pragma once -#include <vespa/vespalib/tensor/tensor.h> -#include <vespa/vespalib/tensor/types.h> -#include <vespa/vespalib/eval/value_type.h> +#include <vespa/eval/tensor/tensor.h> +#include <vespa/eval/tensor/types.h> +#include <vespa/eval/eval/value_type.h> #include "dense_tensor_cells_iterator.h" namespace vespalib { diff --git a/eval/src/vespa/eval/tensor/serialization/dense_binary_format.cpp b/eval/src/vespa/eval/tensor/serialization/dense_binary_format.cpp index a3fddafe8f5..484db417dc9 100644 --- a/eval/src/vespa/eval/tensor/serialization/dense_binary_format.cpp +++ b/eval/src/vespa/eval/tensor/serialization/dense_binary_format.cpp @@ -2,7 +2,7 @@ #include <vespa/fastos/fastos.h> #include "dense_binary_format.h" -#include <vespa/vespalib/tensor/dense/dense_tensor.h> +#include <vespa/eval/tensor/dense/dense_tensor.h> #include <vespa/vespalib/objects/nbostream.h> diff --git a/eval/src/vespa/eval/tensor/serialization/slime_binary_format.cpp b/eval/src/vespa/eval/tensor/serialization/slime_binary_format.cpp index 0bdcbe2c124..16726038cf8 100644 --- a/eval/src/vespa/eval/tensor/serialization/slime_binary_format.cpp +++ b/eval/src/vespa/eval/tensor/serialization/slime_binary_format.cpp @@ -2,10 +2,10 @@ #include <vespa/fastos/fastos.h> #include "slime_binary_format.h" -#include <vespa/vespalib/tensor/types.h> -#include <vespa/vespalib/tensor/tensor.h> -#include <vespa/vespalib/tensor/tensor_builder.h> -#include <vespa/vespalib/tensor/tensor_visitor.h> +#include <vespa/eval/tensor/types.h> +#include <vespa/eval/tensor/tensor.h> +#include <vespa/eval/tensor/tensor_builder.h> +#include <vespa/eval/tensor/tensor_visitor.h> #include <vespa/vespalib/data/slime/inserter.h> #include <vespa/vespalib/data/slime/cursor.h> #include <vespa/vespalib/data/slime/slime.h> diff --git a/eval/src/vespa/eval/tensor/serialization/sparse_binary_format.cpp b/eval/src/vespa/eval/tensor/serialization/sparse_binary_format.cpp index af7a92d2c68..50d4a91965e 100644 --- a/eval/src/vespa/eval/tensor/serialization/sparse_binary_format.cpp +++ b/eval/src/vespa/eval/tensor/serialization/sparse_binary_format.cpp @@ -2,10 +2,10 @@ #include <vespa/fastos/fastos.h> #include "sparse_binary_format.h" -#include <vespa/vespalib/tensor/types.h> -#include <vespa/vespalib/tensor/tensor.h> -#include <vespa/vespalib/tensor/tensor_builder.h> -#include <vespa/vespalib/tensor/tensor_visitor.h> +#include <vespa/eval/tensor/types.h> +#include <vespa/eval/tensor/tensor.h> +#include <vespa/eval/tensor/tensor_builder.h> +#include <vespa/eval/tensor/tensor_visitor.h> #include <vespa/vespalib/objects/nbostream.h> #include <sstream> diff --git a/eval/src/vespa/eval/tensor/serialization/typed_binary_format.cpp b/eval/src/vespa/eval/tensor/serialization/typed_binary_format.cpp index 80d0252dfe1..e3800b3d7ad 100644 --- a/eval/src/vespa/eval/tensor/serialization/typed_binary_format.cpp +++ b/eval/src/vespa/eval/tensor/serialization/typed_binary_format.cpp @@ -5,9 +5,9 @@ #include "sparse_binary_format.h" #include "dense_binary_format.h" #include <vespa/vespalib/objects/nbostream.h> -#include <vespa/vespalib/tensor/default_tensor.h> -#include <vespa/vespalib/tensor/tensor.h> -#include <vespa/vespalib/tensor/dense/dense_tensor.h> +#include <vespa/eval/tensor/default_tensor.h> +#include <vespa/eval/tensor/tensor.h> +#include <vespa/eval/tensor/dense/dense_tensor.h> using vespalib::nbostream; diff --git a/eval/src/vespa/eval/tensor/sparse/direct_sparse_tensor_builder.h b/eval/src/vespa/eval/tensor/sparse/direct_sparse_tensor_builder.h index ad0257d8ec5..aeee5b63d42 100644 --- a/eval/src/vespa/eval/tensor/sparse/direct_sparse_tensor_builder.h +++ b/eval/src/vespa/eval/tensor/sparse/direct_sparse_tensor_builder.h @@ -2,7 +2,7 @@ #pragma once -#include <vespa/vespalib/tensor/direct_tensor_builder.h> +#include <vespa/eval/tensor/direct_tensor_builder.h> #include "sparse_tensor.h" #include "sparse_tensor_address_builder.h" #include "sparse_tensor_address_padder.h" diff --git a/eval/src/vespa/eval/tensor/sparse/sparse_tensor.cpp b/eval/src/vespa/eval/tensor/sparse/sparse_tensor.cpp index 4387b4b1fad..e635c34887c 100644 --- a/eval/src/vespa/eval/tensor/sparse/sparse_tensor.cpp +++ b/eval/src/vespa/eval/tensor/sparse/sparse_tensor.cpp @@ -5,10 +5,10 @@ #include "sparse_tensor_match.h" #include "sparse_tensor_apply.hpp" #include "sparse_tensor_reduce.hpp" -#include <vespa/vespalib/tensor/tensor_address_builder.h> -#include <vespa/vespalib/tensor/tensor_apply.h> -#include <vespa/vespalib/tensor/tensor_visitor.h> -#include <vespa/vespalib/eval/operation.h> +#include <vespa/eval/tensor/tensor_address_builder.h> +#include <vespa/eval/tensor/tensor_apply.h> +#include <vespa/eval/tensor/tensor_visitor.h> +#include <vespa/eval/eval/operation.h> #include <vespa/vespalib/stllike/hash_map.hpp> #include <vespa/vespalib/stllike/hash_map_equal.hpp> #include <vespa/vespalib/util/array_equal.hpp> diff --git a/eval/src/vespa/eval/tensor/sparse/sparse_tensor.h b/eval/src/vespa/eval/tensor/sparse/sparse_tensor.h index e6682011ba2..f62b4a7b933 100644 --- a/eval/src/vespa/eval/tensor/sparse/sparse_tensor.h +++ b/eval/src/vespa/eval/tensor/sparse/sparse_tensor.h @@ -2,11 +2,11 @@ #pragma once -#include <vespa/vespalib/tensor/cell_function.h> -#include <vespa/vespalib/tensor/tensor.h> -#include <vespa/vespalib/tensor/tensor_address.h> +#include <vespa/eval/tensor/cell_function.h> +#include <vespa/eval/tensor/tensor.h> +#include <vespa/eval/tensor/tensor_address.h> #include "sparse_tensor_address_ref.h" -#include <vespa/vespalib/tensor/types.h> +#include <vespa/eval/tensor/types.h> #include <vespa/vespalib/stllike/hash_map.h> #include <vespa/vespalib/stllike/string.h> #include <vespa/vespalib/util/stash.h> diff --git a/eval/src/vespa/eval/tensor/sparse/sparse_tensor_address_combiner.cpp b/eval/src/vespa/eval/tensor/sparse/sparse_tensor_address_combiner.cpp index 1fa765aacfa..82ec52e0108 100644 --- a/eval/src/vespa/eval/tensor/sparse/sparse_tensor_address_combiner.cpp +++ b/eval/src/vespa/eval/tensor/sparse/sparse_tensor_address_combiner.cpp @@ -3,7 +3,7 @@ #include <vespa/fastos/fastos.h> #include "sparse_tensor_address_combiner.h" #include "sparse_tensor_address_decoder.h" -#include <vespa/vespalib/eval/value_type.h> +#include <vespa/eval/eval/value_type.h> namespace vespalib { namespace tensor { diff --git a/eval/src/vespa/eval/tensor/sparse/sparse_tensor_address_combiner.h b/eval/src/vespa/eval/tensor/sparse/sparse_tensor_address_combiner.h index 4340db30297..2ac43443c2c 100644 --- a/eval/src/vespa/eval/tensor/sparse/sparse_tensor_address_combiner.h +++ b/eval/src/vespa/eval/tensor/sparse/sparse_tensor_address_combiner.h @@ -3,7 +3,7 @@ #pragma once #include "sparse_tensor_address_builder.h" -#include <vespa/vespalib/tensor/types.h> +#include <vespa/eval/tensor/types.h> namespace vespalib { namespace eval { class ValueType; } diff --git a/eval/src/vespa/eval/tensor/sparse/sparse_tensor_address_reducer.cpp b/eval/src/vespa/eval/tensor/sparse/sparse_tensor_address_reducer.cpp index 277bf7963e0..184d8593cbd 100644 --- a/eval/src/vespa/eval/tensor/sparse/sparse_tensor_address_reducer.cpp +++ b/eval/src/vespa/eval/tensor/sparse/sparse_tensor_address_reducer.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 "sparse_tensor_address_reducer.h" -#include <vespa/vespalib/eval/value_type.h> +#include <vespa/eval/eval/value_type.h> #include <vespa/vespalib/stllike/hash_set.hpp> namespace vespalib { diff --git a/eval/src/vespa/eval/tensor/sparse/sparse_tensor_address_reducer.h b/eval/src/vespa/eval/tensor/sparse/sparse_tensor_address_reducer.h index d1698681a55..824fdb07d31 100644 --- a/eval/src/vespa/eval/tensor/sparse/sparse_tensor_address_reducer.h +++ b/eval/src/vespa/eval/tensor/sparse/sparse_tensor_address_reducer.h @@ -3,7 +3,7 @@ #pragma once #include "sparse_tensor_address_builder.h" -#include <vespa/vespalib/tensor/types.h> +#include <vespa/eval/tensor/types.h> #include "sparse_tensor_address_decoder.h" #include <cassert> diff --git a/eval/src/vespa/eval/tensor/sparse/sparse_tensor_apply.hpp b/eval/src/vespa/eval/tensor/sparse/sparse_tensor_apply.hpp index b32b09a01ac..825cefb93be 100644 --- a/eval/src/vespa/eval/tensor/sparse/sparse_tensor_apply.hpp +++ b/eval/src/vespa/eval/tensor/sparse/sparse_tensor_apply.hpp @@ -4,7 +4,7 @@ #include "sparse_tensor_apply.h" #include "sparse_tensor_address_combiner.h" -#include <vespa/vespalib/tensor/direct_tensor_builder.h> +#include <vespa/eval/tensor/direct_tensor_builder.h> #include "direct_sparse_tensor_builder.h" namespace vespalib { diff --git a/eval/src/vespa/eval/tensor/sparse/sparse_tensor_builder.h b/eval/src/vespa/eval/tensor/sparse/sparse_tensor_builder.h index c6808614dd4..fc54a652f6c 100644 --- a/eval/src/vespa/eval/tensor/sparse/sparse_tensor_builder.h +++ b/eval/src/vespa/eval/tensor/sparse/sparse_tensor_builder.h @@ -5,8 +5,8 @@ #include "sparse_tensor.h" #include "sparse_tensor_address_builder.h" #include "sparse_tensor_unsorted_address_builder.h" -#include <vespa/vespalib/tensor/tensor_builder.h> -#include <vespa/vespalib/tensor/tensor_address.h> +#include <vespa/eval/tensor/tensor_builder.h> +#include <vespa/eval/tensor/tensor_address.h> #include <vespa/vespalib/stllike/hash_map.h> #include <vespa/vespalib/util/stash.h> diff --git a/eval/src/vespa/eval/tensor/sparse/sparse_tensor_match.h b/eval/src/vespa/eval/tensor/sparse/sparse_tensor_match.h index f12fddc51f4..9c6cedab521 100644 --- a/eval/src/vespa/eval/tensor/sparse/sparse_tensor_match.h +++ b/eval/src/vespa/eval/tensor/sparse/sparse_tensor_match.h @@ -2,7 +2,7 @@ #pragma once -#include <vespa/vespalib/tensor/tensor_operation.h> +#include <vespa/eval/tensor/tensor_operation.h> namespace vespalib { namespace tensor { diff --git a/eval/src/vespa/eval/tensor/sparse/sparse_tensor_reduce.hpp b/eval/src/vespa/eval/tensor/sparse/sparse_tensor_reduce.hpp index 4c9b7043ac4..a6c5513a78f 100644 --- a/eval/src/vespa/eval/tensor/sparse/sparse_tensor_reduce.hpp +++ b/eval/src/vespa/eval/tensor/sparse/sparse_tensor_reduce.hpp @@ -3,7 +3,7 @@ #pragma once #include "sparse_tensor_address_reducer.h" -#include <vespa/vespalib/tensor/direct_tensor_builder.h> +#include <vespa/eval/tensor/direct_tensor_builder.h> #include "direct_sparse_tensor_builder.h" namespace vespalib { diff --git a/eval/src/vespa/eval/tensor/sparse/sparse_tensor_unsorted_address_builder.cpp b/eval/src/vespa/eval/tensor/sparse/sparse_tensor_unsorted_address_builder.cpp index 9361cbcf7f8..ed396c4cc94 100644 --- a/eval/src/vespa/eval/tensor/sparse/sparse_tensor_unsorted_address_builder.cpp +++ b/eval/src/vespa/eval/tensor/sparse/sparse_tensor_unsorted_address_builder.cpp @@ -3,7 +3,7 @@ #include <vespa/fastos/fastos.h> #include "sparse_tensor_unsorted_address_builder.h" #include "sparse_tensor_address_builder.h" -#include <vespa/vespalib/eval/value_type.h> +#include <vespa/eval/eval/value_type.h> #include <algorithm> namespace vespalib { diff --git a/eval/src/vespa/eval/tensor/sparse/sparse_tensor_unsorted_address_builder.h b/eval/src/vespa/eval/tensor/sparse/sparse_tensor_unsorted_address_builder.h index 5fcf9590a89..b5892796bb4 100644 --- a/eval/src/vespa/eval/tensor/sparse/sparse_tensor_unsorted_address_builder.h +++ b/eval/src/vespa/eval/tensor/sparse/sparse_tensor_unsorted_address_builder.h @@ -4,7 +4,7 @@ #include <vespa/vespalib/stllike/string.h> #include <vector> -#include <vespa/vespalib/tensor/types.h> +#include <vespa/eval/tensor/types.h> namespace vespalib { namespace eval { class ValueType; } diff --git a/eval/src/vespa/eval/tensor/tensor.h b/eval/src/vespa/eval/tensor/tensor.h index 9e4f4a9bff0..168a6fa4d98 100644 --- a/eval/src/vespa/eval/tensor/tensor.h +++ b/eval/src/vespa/eval/tensor/tensor.h @@ -5,9 +5,9 @@ #include "cell_function.h" #include "tensor_address.h" #include <vespa/vespalib/stllike/string.h> -#include <vespa/vespalib/eval/tensor.h> -#include <vespa/vespalib/eval/tensor_spec.h> -#include <vespa/vespalib/eval/value_type.h> +#include <vespa/eval/eval/tensor.h> +#include <vespa/eval/eval/tensor_spec.h> +#include <vespa/eval/eval/value_type.h> namespace vespalib { namespace eval { class BinaryOperation; } diff --git a/eval/src/vespa/eval/tensor/tensor_factory.cpp b/eval/src/vespa/eval/tensor/tensor_factory.cpp index f8496180f7f..84f7c0cc705 100644 --- a/eval/src/vespa/eval/tensor/tensor_factory.cpp +++ b/eval/src/vespa/eval/tensor/tensor_factory.cpp @@ -4,7 +4,7 @@ #include "tensor.h" #include "tensor_factory.h" #include "tensor_builder.h" -#include <vespa/vespalib/tensor/dense/dense_tensor_builder.h> +#include <vespa/eval/tensor/dense/dense_tensor_builder.h> namespace vespalib { namespace tensor { diff --git a/eval/src/vespa/eval/tensor/tensor_mapper.cpp b/eval/src/vespa/eval/tensor/tensor_mapper.cpp index f8a1f99cb5b..939e6fdfa26 100644 --- a/eval/src/vespa/eval/tensor/tensor_mapper.cpp +++ b/eval/src/vespa/eval/tensor/tensor_mapper.cpp @@ -3,8 +3,8 @@ #include "tensor_mapper.h" #include "tensor.h" #include "tensor_visitor.h" -#include <vespa/vespalib/tensor/sparse/direct_sparse_tensor_builder.h> -#include <vespa/vespalib/tensor/dense/dense_tensor.h> +#include <vespa/eval/tensor/sparse/direct_sparse_tensor_builder.h> +#include <vespa/eval/tensor/dense/dense_tensor.h> #include "tensor_address_element_iterator.h" #include "default_tensor.h" diff --git a/eval/src/vespa/eval/tensor/tensor_mapper.h b/eval/src/vespa/eval/tensor/tensor_mapper.h index e0394fbd3f7..09d8a6208a3 100644 --- a/eval/src/vespa/eval/tensor/tensor_mapper.h +++ b/eval/src/vespa/eval/tensor/tensor_mapper.h @@ -2,7 +2,7 @@ #pragma once -#include <vespa/vespalib/eval/value_type.h> +#include <vespa/eval/eval/value_type.h> namespace vespalib { namespace tensor { diff --git a/eval/src/vespa/eval/tensor/tensor_operation.h b/eval/src/vespa/eval/tensor/tensor_operation.h index c4fc88f3b5e..7cb2f17e2ee 100644 --- a/eval/src/vespa/eval/tensor/tensor_operation.h +++ b/eval/src/vespa/eval/tensor/tensor_operation.h @@ -3,7 +3,7 @@ #pragma once #include "direct_tensor_builder.h" -#include <vespa/vespalib/tensor/sparse/direct_sparse_tensor_builder.h> +#include <vespa/eval/tensor/sparse/direct_sparse_tensor_builder.h> namespace vespalib { namespace tensor { |