diff options
author | Arne Juul <arnej@verizonmedia.com> | 2020-12-09 14:42:50 +0000 |
---|---|---|
committer | Arne Juul <arnej@verizonmedia.com> | 2020-12-09 14:42:50 +0000 |
commit | 71a5577eedae43597dbb5db11933fa86249c54bd (patch) | |
tree | 7a76eb4e471dbb36b90f3e7549f10a28a9f9f64a /eval | |
parent | 7224be54ed47e44f285bb1d5cafdf12d78d45933 (diff) |
move optimizers to eval/instruction directory
Diffstat (limited to 'eval')
35 files changed, 35 insertions, 35 deletions
diff --git a/eval/src/tests/eval/tensor_lambda/tensor_lambda_test.cpp b/eval/src/tests/eval/tensor_lambda/tensor_lambda_test.cpp index 73a3648a34c..bb71cf090ae 100644 --- a/eval/src/tests/eval/tensor_lambda/tensor_lambda_test.cpp +++ b/eval/src/tests/eval/tensor_lambda/tensor_lambda_test.cpp @@ -4,10 +4,10 @@ #include <vespa/eval/eval/tensor_function.h> #include <vespa/eval/eval/simple_value.h> #include <vespa/eval/eval/fast_value.h> -#include <vespa/eval/tensor/dense/dense_replace_type_function.h> +#include <vespa/eval/instruction/dense_replace_type_function.h> #include <vespa/eval/instruction/dense_cell_range_function.h> #include <vespa/eval/instruction/dense_lambda_peek_function.h> -#include <vespa/eval/tensor/dense/dense_fast_rename_optimizer.h> +#include <vespa/eval/instruction/dense_fast_rename_optimizer.h> #include <vespa/eval/eval/test/tensor_model.hpp> #include <vespa/eval/eval/test/eval_fixture.h> #include <vespa/eval/eval/tensor_nodes.h> diff --git a/eval/src/tests/tensor/dense_add_dimension_optimizer/dense_add_dimension_optimizer_test.cpp b/eval/src/tests/tensor/dense_add_dimension_optimizer/dense_add_dimension_optimizer_test.cpp index 0e8e50daae5..1812cc8c1db 100644 --- a/eval/src/tests/tensor/dense_add_dimension_optimizer/dense_add_dimension_optimizer_test.cpp +++ b/eval/src/tests/tensor/dense_add_dimension_optimizer/dense_add_dimension_optimizer_test.cpp @@ -3,8 +3,8 @@ #include <vespa/vespalib/testkit/test_kit.h> #include <vespa/eval/eval/fast_value.h> #include <vespa/eval/eval/tensor_function.h> -#include <vespa/eval/tensor/dense/dense_replace_type_function.h> -#include <vespa/eval/tensor/dense/dense_fast_rename_optimizer.h> +#include <vespa/eval/instruction/dense_replace_type_function.h> +#include <vespa/eval/instruction/dense_fast_rename_optimizer.h> #include <vespa/eval/eval/test/tensor_model.hpp> #include <vespa/eval/eval/test/eval_fixture.h> diff --git a/eval/src/tests/tensor/dense_fast_rename_optimizer/dense_fast_rename_optimizer_test.cpp b/eval/src/tests/tensor/dense_fast_rename_optimizer/dense_fast_rename_optimizer_test.cpp index 52afde0e92c..7339a057fa3 100644 --- a/eval/src/tests/tensor/dense_fast_rename_optimizer/dense_fast_rename_optimizer_test.cpp +++ b/eval/src/tests/tensor/dense_fast_rename_optimizer/dense_fast_rename_optimizer_test.cpp @@ -2,8 +2,8 @@ #include <vespa/vespalib/testkit/test_kit.h> #include <vespa/eval/eval/tensor_function.h> -#include <vespa/eval/tensor/dense/dense_replace_type_function.h> -#include <vespa/eval/tensor/dense/dense_fast_rename_optimizer.h> +#include <vespa/eval/instruction/dense_replace_type_function.h> +#include <vespa/eval/instruction/dense_fast_rename_optimizer.h> #include <vespa/eval/eval/test/tensor_model.hpp> #include <vespa/eval/eval/test/eval_fixture.h> diff --git a/eval/src/tests/tensor/dense_pow_as_map_optimizer/dense_pow_as_map_optimizer_test.cpp b/eval/src/tests/tensor/dense_pow_as_map_optimizer/dense_pow_as_map_optimizer_test.cpp index d00744bcfaf..0e73a40b81a 100644 --- a/eval/src/tests/tensor/dense_pow_as_map_optimizer/dense_pow_as_map_optimizer_test.cpp +++ b/eval/src/tests/tensor/dense_pow_as_map_optimizer/dense_pow_as_map_optimizer_test.cpp @@ -2,7 +2,7 @@ #include <vespa/eval/eval/fast_value.h> #include <vespa/eval/eval/tensor_function.h> -#include <vespa/eval/tensor/dense/dense_simple_map_function.h> +#include <vespa/eval/instruction/dense_simple_map_function.h> #include <vespa/eval/eval/test/eval_fixture.h> #include <vespa/eval/eval/test/tensor_model.hpp> #include <vespa/vespalib/gtest/gtest.h> diff --git a/eval/src/tests/tensor/dense_remove_dimension_optimizer/dense_remove_dimension_optimizer_test.cpp b/eval/src/tests/tensor/dense_remove_dimension_optimizer/dense_remove_dimension_optimizer_test.cpp index 69910e27b4b..32f2fb20c10 100644 --- a/eval/src/tests/tensor/dense_remove_dimension_optimizer/dense_remove_dimension_optimizer_test.cpp +++ b/eval/src/tests/tensor/dense_remove_dimension_optimizer/dense_remove_dimension_optimizer_test.cpp @@ -2,8 +2,8 @@ #include <vespa/vespalib/testkit/test_kit.h> #include <vespa/eval/eval/tensor_function.h> -#include <vespa/eval/tensor/dense/dense_replace_type_function.h> -#include <vespa/eval/tensor/dense/dense_fast_rename_optimizer.h> +#include <vespa/eval/instruction/dense_replace_type_function.h> +#include <vespa/eval/instruction/dense_fast_rename_optimizer.h> #include <vespa/eval/eval/test/tensor_model.hpp> #include <vespa/eval/eval/test/eval_fixture.h> diff --git a/eval/src/tests/tensor/dense_replace_type_function/dense_replace_type_function_test.cpp b/eval/src/tests/tensor/dense_replace_type_function/dense_replace_type_function_test.cpp index 2612869e72f..46fd674e15c 100644 --- a/eval/src/tests/tensor/dense_replace_type_function/dense_replace_type_function_test.cpp +++ b/eval/src/tests/tensor/dense_replace_type_function/dense_replace_type_function_test.cpp @@ -4,7 +4,7 @@ #include <vespa/eval/eval/fast_value.h> #include <vespa/eval/eval/value_codec.h> #include <vespa/eval/eval/interpreted_function.h> -#include <vespa/eval/tensor/dense/dense_replace_type_function.h> +#include <vespa/eval/instruction/dense_replace_type_function.h> #include <vespa/eval/eval/test/tensor_model.hpp> using namespace vespalib::eval::tensor_function; diff --git a/eval/src/tests/tensor/dense_simple_join_function/dense_simple_join_function_test.cpp b/eval/src/tests/tensor/dense_simple_join_function/dense_simple_join_function_test.cpp index 6ad60d2e3f5..e367f94d7d9 100644 --- a/eval/src/tests/tensor/dense_simple_join_function/dense_simple_join_function_test.cpp +++ b/eval/src/tests/tensor/dense_simple_join_function/dense_simple_join_function_test.cpp @@ -2,7 +2,7 @@ #include <vespa/vespalib/testkit/test_kit.h> #include <vespa/eval/eval/tensor_function.h> -#include <vespa/eval/tensor/dense/dense_simple_join_function.h> +#include <vespa/eval/instruction/dense_simple_join_function.h> #include <vespa/eval/eval/test/eval_fixture.h> #include <vespa/eval/eval/test/tensor_model.hpp> diff --git a/eval/src/tests/tensor/dense_simple_map_function/dense_simple_map_function_test.cpp b/eval/src/tests/tensor/dense_simple_map_function/dense_simple_map_function_test.cpp index 53164ad59c8..dc2a5ac77c1 100644 --- a/eval/src/tests/tensor/dense_simple_map_function/dense_simple_map_function_test.cpp +++ b/eval/src/tests/tensor/dense_simple_map_function/dense_simple_map_function_test.cpp @@ -1,7 +1,7 @@ // Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include <vespa/eval/eval/tensor_function.h> -#include <vespa/eval/tensor/dense/dense_simple_map_function.h> +#include <vespa/eval/instruction/dense_simple_map_function.h> #include <vespa/eval/eval/test/eval_fixture.h> #include <vespa/eval/eval/test/tensor_model.hpp> #include <vespa/vespalib/gtest/gtest.h> diff --git a/eval/src/tests/tensor/dense_single_reduce_function/dense_single_reduce_function_test.cpp b/eval/src/tests/tensor/dense_single_reduce_function/dense_single_reduce_function_test.cpp index 347228269cf..d9a6a14108f 100644 --- a/eval/src/tests/tensor/dense_single_reduce_function/dense_single_reduce_function_test.cpp +++ b/eval/src/tests/tensor/dense_single_reduce_function/dense_single_reduce_function_test.cpp @@ -3,7 +3,7 @@ #include <vespa/vespalib/testkit/test_kit.h> #include <vespa/eval/eval/tensor_function.h> #include <vespa/eval/eval/operation.h> -#include <vespa/eval/tensor/dense/dense_single_reduce_function.h> +#include <vespa/eval/instruction/dense_single_reduce_function.h> #include <vespa/eval/eval/test/tensor_model.hpp> #include <vespa/eval/eval/test/eval_fixture.h> diff --git a/eval/src/tests/tensor/dense_tensor_create_function/dense_tensor_create_function_test.cpp b/eval/src/tests/tensor/dense_tensor_create_function/dense_tensor_create_function_test.cpp index edf999e97b3..c063415957a 100644 --- a/eval/src/tests/tensor/dense_tensor_create_function/dense_tensor_create_function_test.cpp +++ b/eval/src/tests/tensor/dense_tensor_create_function/dense_tensor_create_function_test.cpp @@ -2,7 +2,7 @@ #include <vespa/vespalib/testkit/test_kit.h> #include <vespa/eval/eval/tensor_function.h> -#include <vespa/eval/tensor/dense/dense_tensor_create_function.h> +#include <vespa/eval/instruction/dense_tensor_create_function.h> #include <vespa/eval/eval/test/tensor_model.hpp> #include <vespa/eval/eval/test/eval_fixture.h> diff --git a/eval/src/tests/tensor/vector_from_doubles_function/vector_from_doubles_function_test.cpp b/eval/src/tests/tensor/vector_from_doubles_function/vector_from_doubles_function_test.cpp index c3e1f2f248e..1cbfade6c45 100644 --- a/eval/src/tests/tensor/vector_from_doubles_function/vector_from_doubles_function_test.cpp +++ b/eval/src/tests/tensor/vector_from_doubles_function/vector_from_doubles_function_test.cpp @@ -2,7 +2,7 @@ #include <vespa/vespalib/testkit/test_kit.h> #include <vespa/eval/eval/tensor_function.h> -#include <vespa/eval/tensor/dense/vector_from_doubles_function.h> +#include <vespa/eval/instruction/vector_from_doubles_function.h> #include <vespa/eval/eval/test/tensor_model.hpp> #include <vespa/eval/eval/test/eval_fixture.h> diff --git a/eval/src/vespa/eval/eval/optimize_tensor_function.cpp b/eval/src/vespa/eval/eval/optimize_tensor_function.cpp index ed0b122196d..97c565f1106 100644 --- a/eval/src/vespa/eval/eval/optimize_tensor_function.cpp +++ b/eval/src/vespa/eval/eval/optimize_tensor_function.cpp @@ -8,18 +8,18 @@ #include <vespa/eval/instruction/dense_xw_product_function.h> #include <vespa/eval/instruction/dense_matmul_function.h> #include <vespa/eval/instruction/dense_multi_matmul_function.h> -#include <vespa/eval/tensor/dense/dense_fast_rename_optimizer.h> -#include <vespa/eval/tensor/dense/dense_add_dimension_optimizer.h> -#include <vespa/eval/tensor/dense/dense_single_reduce_function.h> -#include <vespa/eval/tensor/dense/dense_remove_dimension_optimizer.h> +#include <vespa/eval/instruction/dense_fast_rename_optimizer.h> +#include <vespa/eval/instruction/dense_add_dimension_optimizer.h> +#include <vespa/eval/instruction/dense_single_reduce_function.h> +#include <vespa/eval/instruction/dense_remove_dimension_optimizer.h> #include <vespa/eval/instruction/dense_lambda_peek_optimizer.h> #include <vespa/eval/instruction/dense_simple_expand_function.h> -#include <vespa/eval/tensor/dense/dense_simple_join_function.h> +#include <vespa/eval/instruction/dense_simple_join_function.h> #include <vespa/eval/instruction/join_with_number_function.h> -#include <vespa/eval/tensor/dense/dense_pow_as_map_optimizer.h> -#include <vespa/eval/tensor/dense/dense_simple_map_function.h> -#include <vespa/eval/tensor/dense/vector_from_doubles_function.h> -#include <vespa/eval/tensor/dense/dense_tensor_create_function.h> +#include <vespa/eval/instruction/dense_pow_as_map_optimizer.h> +#include <vespa/eval/instruction/dense_simple_map_function.h> +#include <vespa/eval/instruction/vector_from_doubles_function.h> +#include <vespa/eval/instruction/dense_tensor_create_function.h> #include <vespa/eval/instruction/dense_tensor_peek_function.h> #include <vespa/log/log.h> diff --git a/eval/src/vespa/eval/instruction/CMakeLists.txt b/eval/src/vespa/eval/instruction/CMakeLists.txt index 4f2c59e34e1..42f88c0ee52 100644 --- a/eval/src/vespa/eval/instruction/CMakeLists.txt +++ b/eval/src/vespa/eval/instruction/CMakeLists.txt @@ -22,4 +22,14 @@ vespa_add_library(eval_instruction OBJECT generic_rename.cpp index_lookup_table.cpp join_with_number_function.cpp + dense_add_dimension_optimizer.cpp + dense_fast_rename_optimizer.cpp + dense_pow_as_map_optimizer.cpp + dense_remove_dimension_optimizer.cpp + dense_replace_type_function.cpp + dense_simple_join_function.cpp + dense_simple_map_function.cpp + dense_single_reduce_function.cpp + dense_tensor_create_function.cpp + vector_from_doubles_function.cpp ) diff --git a/eval/src/vespa/eval/tensor/dense/dense_add_dimension_optimizer.cpp b/eval/src/vespa/eval/instruction/dense_add_dimension_optimizer.cpp index 9cd7cc88907..9cd7cc88907 100644 --- a/eval/src/vespa/eval/tensor/dense/dense_add_dimension_optimizer.cpp +++ b/eval/src/vespa/eval/instruction/dense_add_dimension_optimizer.cpp diff --git a/eval/src/vespa/eval/tensor/dense/dense_add_dimension_optimizer.h b/eval/src/vespa/eval/instruction/dense_add_dimension_optimizer.h index 8d52c835261..8d52c835261 100644 --- a/eval/src/vespa/eval/tensor/dense/dense_add_dimension_optimizer.h +++ b/eval/src/vespa/eval/instruction/dense_add_dimension_optimizer.h diff --git a/eval/src/vespa/eval/tensor/dense/dense_fast_rename_optimizer.cpp b/eval/src/vespa/eval/instruction/dense_fast_rename_optimizer.cpp index bd84fc4c51a..bd84fc4c51a 100644 --- a/eval/src/vespa/eval/tensor/dense/dense_fast_rename_optimizer.cpp +++ b/eval/src/vespa/eval/instruction/dense_fast_rename_optimizer.cpp diff --git a/eval/src/vespa/eval/tensor/dense/dense_fast_rename_optimizer.h b/eval/src/vespa/eval/instruction/dense_fast_rename_optimizer.h index 0543c7117b9..0543c7117b9 100644 --- a/eval/src/vespa/eval/tensor/dense/dense_fast_rename_optimizer.h +++ b/eval/src/vespa/eval/instruction/dense_fast_rename_optimizer.h diff --git a/eval/src/vespa/eval/instruction/dense_lambda_peek_optimizer.cpp b/eval/src/vespa/eval/instruction/dense_lambda_peek_optimizer.cpp index 6853b1a078f..cdf1629bf2b 100644 --- a/eval/src/vespa/eval/instruction/dense_lambda_peek_optimizer.cpp +++ b/eval/src/vespa/eval/instruction/dense_lambda_peek_optimizer.cpp @@ -3,7 +3,7 @@ #include "dense_lambda_peek_optimizer.h" #include "dense_lambda_peek_function.h" #include "dense_cell_range_function.h" -#include <vespa/eval/tensor/dense/dense_replace_type_function.h> +#include <vespa/eval/instruction/dense_replace_type_function.h> #include <vespa/eval/eval/value.h> #include <vespa/eval/eval/node_tools.h> #include <vespa/eval/eval/basic_nodes.h> diff --git a/eval/src/vespa/eval/tensor/dense/dense_pow_as_map_optimizer.cpp b/eval/src/vespa/eval/instruction/dense_pow_as_map_optimizer.cpp index f78c23c80ac..f78c23c80ac 100644 --- a/eval/src/vespa/eval/tensor/dense/dense_pow_as_map_optimizer.cpp +++ b/eval/src/vespa/eval/instruction/dense_pow_as_map_optimizer.cpp diff --git a/eval/src/vespa/eval/tensor/dense/dense_pow_as_map_optimizer.h b/eval/src/vespa/eval/instruction/dense_pow_as_map_optimizer.h index 6231db0e4bd..6231db0e4bd 100644 --- a/eval/src/vespa/eval/tensor/dense/dense_pow_as_map_optimizer.h +++ b/eval/src/vespa/eval/instruction/dense_pow_as_map_optimizer.h diff --git a/eval/src/vespa/eval/tensor/dense/dense_remove_dimension_optimizer.cpp b/eval/src/vespa/eval/instruction/dense_remove_dimension_optimizer.cpp index a48527e83f5..a48527e83f5 100644 --- a/eval/src/vespa/eval/tensor/dense/dense_remove_dimension_optimizer.cpp +++ b/eval/src/vespa/eval/instruction/dense_remove_dimension_optimizer.cpp diff --git a/eval/src/vespa/eval/tensor/dense/dense_remove_dimension_optimizer.h b/eval/src/vespa/eval/instruction/dense_remove_dimension_optimizer.h index 2551bf4f072..2551bf4f072 100644 --- a/eval/src/vespa/eval/tensor/dense/dense_remove_dimension_optimizer.h +++ b/eval/src/vespa/eval/instruction/dense_remove_dimension_optimizer.h diff --git a/eval/src/vespa/eval/tensor/dense/dense_replace_type_function.cpp b/eval/src/vespa/eval/instruction/dense_replace_type_function.cpp index ed75d6fff98..ed75d6fff98 100644 --- a/eval/src/vespa/eval/tensor/dense/dense_replace_type_function.cpp +++ b/eval/src/vespa/eval/instruction/dense_replace_type_function.cpp diff --git a/eval/src/vespa/eval/tensor/dense/dense_replace_type_function.h b/eval/src/vespa/eval/instruction/dense_replace_type_function.h index f72dcb6bd23..f72dcb6bd23 100644 --- a/eval/src/vespa/eval/tensor/dense/dense_replace_type_function.h +++ b/eval/src/vespa/eval/instruction/dense_replace_type_function.h diff --git a/eval/src/vespa/eval/tensor/dense/dense_simple_join_function.cpp b/eval/src/vespa/eval/instruction/dense_simple_join_function.cpp index 21b47b67291..21b47b67291 100644 --- a/eval/src/vespa/eval/tensor/dense/dense_simple_join_function.cpp +++ b/eval/src/vespa/eval/instruction/dense_simple_join_function.cpp diff --git a/eval/src/vespa/eval/tensor/dense/dense_simple_join_function.h b/eval/src/vespa/eval/instruction/dense_simple_join_function.h index 48eb73fe09a..48eb73fe09a 100644 --- a/eval/src/vespa/eval/tensor/dense/dense_simple_join_function.h +++ b/eval/src/vespa/eval/instruction/dense_simple_join_function.h diff --git a/eval/src/vespa/eval/tensor/dense/dense_simple_map_function.cpp b/eval/src/vespa/eval/instruction/dense_simple_map_function.cpp index 5227b67dd92..5227b67dd92 100644 --- a/eval/src/vespa/eval/tensor/dense/dense_simple_map_function.cpp +++ b/eval/src/vespa/eval/instruction/dense_simple_map_function.cpp diff --git a/eval/src/vespa/eval/tensor/dense/dense_simple_map_function.h b/eval/src/vespa/eval/instruction/dense_simple_map_function.h index f179b36ebc6..f179b36ebc6 100644 --- a/eval/src/vespa/eval/tensor/dense/dense_simple_map_function.h +++ b/eval/src/vespa/eval/instruction/dense_simple_map_function.h diff --git a/eval/src/vespa/eval/tensor/dense/dense_single_reduce_function.cpp b/eval/src/vespa/eval/instruction/dense_single_reduce_function.cpp index c10fd6c0fe7..c10fd6c0fe7 100644 --- a/eval/src/vespa/eval/tensor/dense/dense_single_reduce_function.cpp +++ b/eval/src/vespa/eval/instruction/dense_single_reduce_function.cpp diff --git a/eval/src/vespa/eval/tensor/dense/dense_single_reduce_function.h b/eval/src/vespa/eval/instruction/dense_single_reduce_function.h index 33027ebc930..33027ebc930 100644 --- a/eval/src/vespa/eval/tensor/dense/dense_single_reduce_function.h +++ b/eval/src/vespa/eval/instruction/dense_single_reduce_function.h diff --git a/eval/src/vespa/eval/tensor/dense/dense_tensor_create_function.cpp b/eval/src/vespa/eval/instruction/dense_tensor_create_function.cpp index c233a51a473..c233a51a473 100644 --- a/eval/src/vespa/eval/tensor/dense/dense_tensor_create_function.cpp +++ b/eval/src/vespa/eval/instruction/dense_tensor_create_function.cpp diff --git a/eval/src/vespa/eval/tensor/dense/dense_tensor_create_function.h b/eval/src/vespa/eval/instruction/dense_tensor_create_function.h index 7ca906ae38b..7ca906ae38b 100644 --- a/eval/src/vespa/eval/tensor/dense/dense_tensor_create_function.h +++ b/eval/src/vespa/eval/instruction/dense_tensor_create_function.h diff --git a/eval/src/vespa/eval/tensor/dense/vector_from_doubles_function.cpp b/eval/src/vespa/eval/instruction/vector_from_doubles_function.cpp index 19c95c9418d..19c95c9418d 100644 --- a/eval/src/vespa/eval/tensor/dense/vector_from_doubles_function.cpp +++ b/eval/src/vespa/eval/instruction/vector_from_doubles_function.cpp diff --git a/eval/src/vespa/eval/tensor/dense/vector_from_doubles_function.h b/eval/src/vespa/eval/instruction/vector_from_doubles_function.h index 739c8721a47..739c8721a47 100644 --- a/eval/src/vespa/eval/tensor/dense/vector_from_doubles_function.h +++ b/eval/src/vespa/eval/instruction/vector_from_doubles_function.h diff --git a/eval/src/vespa/eval/tensor/dense/CMakeLists.txt b/eval/src/vespa/eval/tensor/dense/CMakeLists.txt index 8e506890b20..d561df80d14 100644 --- a/eval/src/vespa/eval/tensor/dense/CMakeLists.txt +++ b/eval/src/vespa/eval/tensor/dense/CMakeLists.txt @@ -1,15 +1,5 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. vespa_add_library(eval_tensor_dense OBJECT SOURCES - dense_add_dimension_optimizer.cpp - dense_fast_rename_optimizer.cpp - dense_pow_as_map_optimizer.cpp - dense_remove_dimension_optimizer.cpp - dense_replace_type_function.cpp - dense_simple_join_function.cpp - dense_simple_map_function.cpp - dense_single_reduce_function.cpp - dense_tensor_create_function.cpp mutable_dense_tensor_view.cpp - vector_from_doubles_function.cpp ) |