diff options
Diffstat (limited to 'eval/src/tests')
17 files changed, 0 insertions, 406 deletions
diff --git a/eval/src/tests/eval/simple_tensor/.gitignore b/eval/src/tests/eval/simple_tensor/.gitignore deleted file mode 100644 index f371f5c6c6d..00000000000 --- a/eval/src/tests/eval/simple_tensor/.gitignore +++ /dev/null @@ -1 +0,0 @@ -vespalib_simple_tensor_test_app diff --git a/eval/src/tests/eval/simple_tensor/CMakeLists.txt b/eval/src/tests/eval/simple_tensor/CMakeLists.txt deleted file mode 100644 index 08fb1c17572..00000000000 --- a/eval/src/tests/eval/simple_tensor/CMakeLists.txt +++ /dev/null @@ -1,8 +0,0 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -vespa_add_executable(eval_simple_tensor_test_app TEST - SOURCES - simple_tensor_test.cpp - DEPENDS - vespaeval -) -vespa_add_test(NAME eval_simple_tensor_test_app COMMAND eval_simple_tensor_test_app) diff --git a/eval/src/tests/eval/simple_tensor/simple_tensor_test.cpp b/eval/src/tests/eval/simple_tensor/simple_tensor_test.cpp deleted file mode 100644 index f3bea3820c8..00000000000 --- a/eval/src/tests/eval/simple_tensor/simple_tensor_test.cpp +++ /dev/null @@ -1,370 +0,0 @@ -// Copyright 2017 Yahoo Holdings. 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/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 <vespa/vespalib/data/memory.h> -#include <vespa/vespalib/objects/nbostream.h> -#include <iostream> - -using namespace vespalib::eval; - -using Cell = SimpleTensor::Cell; -using Cells = SimpleTensor::Cells; -using Address = SimpleTensor::Address; -using Stash = vespalib::Stash; -using vespalib::nbostream; -using vespalib::Memory; - -TensorSpec to_spec(const Value &a) { return SimpleTensorEngine::ref().to_spec(a); } - -const Tensor &unwrap(const Value &value) { - ASSERT_TRUE(value.is_tensor()); - return *value.as_tensor(); -} - -struct CellBuilder { - Cells cells; - CellBuilder &add(const Address &addr, double value) { - cells.emplace_back(addr, value); - return *this; - } - Cells build() { return cells; } -}; - -TEST("require that simple tensors can be built using tensor spec") { - TensorSpec spec("tensor(w{},x[2],y{},z[2])"); - spec.add({{"w", "xxx"}, {"x", 0}, {"y", "xxx"}, {"z", 0}}, 1.0) - .add({{"w", "xxx"}, {"x", 0}, {"y", "yyy"}, {"z", 1}}, 2.0) - .add({{"w", "yyy"}, {"x", 1}, {"y", "xxx"}, {"z", 0}}, 3.0) - .add({{"w", "yyy"}, {"x", 1}, {"y", "yyy"}, {"z", 1}}, 4.0); - Value::UP tensor = SimpleTensorEngine::ref().from_spec(spec); - TensorSpec full_spec("tensor(w{},x[2],y{},z[2])"); - full_spec - .add({{"w", "xxx"}, {"x", 0}, {"y", "xxx"}, {"z", 0}}, 1.0) - .add({{"w", "xxx"}, {"x", 0}, {"y", "xxx"}, {"z", 1}}, 0.0) - .add({{"w", "xxx"}, {"x", 0}, {"y", "yyy"}, {"z", 0}}, 0.0) - .add({{"w", "xxx"}, {"x", 0}, {"y", "yyy"}, {"z", 1}}, 2.0) - .add({{"w", "xxx"}, {"x", 1}, {"y", "xxx"}, {"z", 0}}, 0.0) - .add({{"w", "xxx"}, {"x", 1}, {"y", "xxx"}, {"z", 1}}, 0.0) - .add({{"w", "xxx"}, {"x", 1}, {"y", "yyy"}, {"z", 0}}, 0.0) - .add({{"w", "xxx"}, {"x", 1}, {"y", "yyy"}, {"z", 1}}, 0.0) - .add({{"w", "yyy"}, {"x", 0}, {"y", "xxx"}, {"z", 0}}, 0.0) - .add({{"w", "yyy"}, {"x", 0}, {"y", "xxx"}, {"z", 1}}, 0.0) - .add({{"w", "yyy"}, {"x", 0}, {"y", "yyy"}, {"z", 0}}, 0.0) - .add({{"w", "yyy"}, {"x", 0}, {"y", "yyy"}, {"z", 1}}, 0.0) - .add({{"w", "yyy"}, {"x", 1}, {"y", "xxx"}, {"z", 0}}, 3.0) - .add({{"w", "yyy"}, {"x", 1}, {"y", "xxx"}, {"z", 1}}, 0.0) - .add({{"w", "yyy"}, {"x", 1}, {"y", "yyy"}, {"z", 0}}, 0.0) - .add({{"w", "yyy"}, {"x", 1}, {"y", "yyy"}, {"z", 1}}, 4.0); - Value::UP full_tensor = SimpleTensorEngine::ref().from_spec(full_spec); - EXPECT_EQUAL(full_spec, to_spec(*tensor)); - EXPECT_EQUAL(full_spec, to_spec(*full_tensor)); -}; - -TEST("require that simple tensors can have their values negated") { - auto tensor = SimpleTensor::create( - TensorSpec("tensor(x{},y{})") - .add({{"x","1"},{"y","1"}}, 1) - .add({{"x","2"},{"y","1"}}, -3) - .add({{"x","1"},{"y","2"}}, 5)); - auto expect = SimpleTensor::create( - TensorSpec("tensor(x{},y{})") - .add({{"x","1"},{"y","1"}}, -1) - .add({{"x","2"},{"y","1"}}, 3) - .add({{"x","1"},{"y","2"}}, -5)); - auto result = tensor->map([](double a){ return -a; }); - EXPECT_EQUAL(to_spec(*expect), to_spec(*result)); - Stash stash; - const Value &result2 = SimpleTensorEngine::ref().map(*tensor, operation::Neg::f, stash); - EXPECT_EQUAL(to_spec(*expect), to_spec(unwrap(result2))); -} - -TEST("require that simple tensors can be multiplied with each other") { - auto lhs = SimpleTensor::create( - TensorSpec("tensor(x{},y{})") - .add({{"x","1"},{"y","1"}}, 1) - .add({{"x","2"},{"y","1"}}, 3) - .add({{"x","1"},{"y","2"}}, 5)); - auto rhs = SimpleTensor::create( - TensorSpec("tensor(y{},z{})") - .add({{"y","1"},{"z","1"}}, 7) - .add({{"y","2"},{"z","1"}}, 11) - .add({{"y","1"},{"z","2"}}, 13)); - auto expect = SimpleTensor::create( - TensorSpec("tensor(x{},y{},z{})") - .add({{"x","1"},{"y","1"},{"z","1"}}, 7) - .add({{"x","1"},{"y","1"},{"z","2"}}, 13) - .add({{"x","2"},{"y","1"},{"z","1"}}, 21) - .add({{"x","2"},{"y","1"},{"z","2"}}, 39) - .add({{"x","1"},{"y","2"},{"z","1"}}, 55)); - auto result = SimpleTensor::join(*lhs, *rhs, [](double a, double b){ return (a * b); }); - EXPECT_EQUAL(to_spec(*expect), to_spec(*result)); - Stash stash; - const Value &result2 = SimpleTensorEngine::ref().join(*lhs, *rhs, operation::Mul::f, stash); - EXPECT_EQUAL(to_spec(*expect), to_spec(unwrap(result2))); -} - -TEST("require that simple tensors can be merged") { - auto lhs = SimpleTensor::create( - TensorSpec("tensor(x{},y{})") - .add({{"x","1"},{"y","1"}}, 1) - .add({{"x","2"},{"y","1"}}, 3) - .add({{"x","1"},{"y","2"}}, 5)); - auto rhs = SimpleTensor::create( - TensorSpec("tensor(x{},y{})") - .add({{"x","1"},{"y","2"}}, 7) - .add({{"x","2"},{"y","2"}}, 11) - .add({{"x","1"},{"y","1"}}, 13)); - auto expect = SimpleTensor::create( - TensorSpec("tensor(x{},y{})") - .add({{"x","2"},{"y","1"}}, 3) - .add({{"x","1"},{"y","2"}}, 7) - .add({{"x","2"},{"y","2"}}, 11) - .add({{"x","1"},{"y","1"}}, 13)); - auto result = SimpleTensor::merge(*lhs, *rhs, [](double, double b){ return b; }); - EXPECT_EQUAL(to_spec(*expect), to_spec(*result)); - Stash stash; - const Value &result2 = SimpleTensorEngine::ref().merge(*lhs, *rhs, [](double, double b){ return b; }, stash); - EXPECT_EQUAL(to_spec(*expect), to_spec(unwrap(result2))); -} - -TEST("require that simple tensors support dimension reduction") { - auto tensor = SimpleTensor::create( - TensorSpec("tensor(x[3],y[2])") - .add({{"x",0},{"y",0}}, 1) - .add({{"x",1},{"y",0}}, 2) - .add({{"x",2},{"y",0}}, 3) - .add({{"x",0},{"y",1}}, 4) - .add({{"x",1},{"y",1}}, 5) - .add({{"x",2},{"y",1}}, 6)); - auto expect_sum_y = SimpleTensor::create( - TensorSpec("tensor(x[3])") - .add({{"x",0}}, 5) - .add({{"x",1}}, 7) - .add({{"x",2}}, 9)); - auto expect_sum_x = SimpleTensor::create( - TensorSpec("tensor(y[2])") - .add({{"y",0}}, 6) - .add({{"y",1}}, 15)); - auto expect_sum_all = SimpleTensor::create(TensorSpec("double").add({}, 21)); - Stash stash; - Aggregator &aggr_sum = Aggregator::create(Aggr::SUM, stash); - auto result_sum_y = tensor->reduce(aggr_sum, {"y"}); - auto result_sum_x = tensor->reduce(aggr_sum, {"x"}); - auto result_sum_all = tensor->reduce(aggr_sum, {"x", "y"}); - EXPECT_EQUAL(to_spec(*expect_sum_y), to_spec(*result_sum_y)); - EXPECT_EQUAL(to_spec(*expect_sum_x), to_spec(*result_sum_x)); - EXPECT_EQUAL(to_spec(*expect_sum_all), to_spec(*result_sum_all)); - const Value &result_sum_y_2 = SimpleTensorEngine::ref().reduce(*tensor, Aggr::SUM, {"y"}, stash); - const Value &result_sum_x_2 = SimpleTensorEngine::ref().reduce(*tensor, Aggr::SUM, {"x"}, stash); - const Value &result_sum_all_2 = SimpleTensorEngine::ref().reduce(*tensor, Aggr::SUM, {"x", "y"}, stash); - const Value &result_sum_all_3 = SimpleTensorEngine::ref().reduce(*tensor, Aggr::SUM, {}, stash); - EXPECT_EQUAL(to_spec(*expect_sum_y), to_spec(unwrap(result_sum_y_2))); - EXPECT_EQUAL(to_spec(*expect_sum_x), to_spec(unwrap(result_sum_x_2))); - EXPECT_TRUE(result_sum_all_2.is_double()); - EXPECT_TRUE(result_sum_all_3.is_double()); - EXPECT_EQUAL(21, result_sum_all_2.as_double()); - EXPECT_EQUAL(21, result_sum_all_3.as_double()); - EXPECT_EQUAL(to_spec(*result_sum_y), to_spec(*result_sum_y)); - EXPECT_NOT_EQUAL(to_spec(*result_sum_y), to_spec(*result_sum_x)); -} - -//----------------------------------------------------------------------------- - -vespalib::string make_type_spec(bool use_float, const vespalib::string &dims) { - vespalib::string type_spec = "tensor"; - if (use_float) { - type_spec.append("<float>"); - } - type_spec.append(dims); - return type_spec; -} - -struct TensorExample { - virtual ~TensorExample(); - virtual TensorSpec make_spec(bool use_float) const = 0; - virtual std::unique_ptr<SimpleTensor> make_tensor(bool use_float) const = 0; - virtual void encode_default(nbostream &dst) const = 0; - virtual void encode_with_double(nbostream &dst) const = 0; - virtual void encode_with_float(nbostream &dst) const = 0; - void verify_encode_decode() const { - nbostream expect_default; - nbostream expect_double; - nbostream expect_float; - encode_default(expect_default); - encode_with_double(expect_double); - encode_with_float(expect_float); - nbostream data_double; - nbostream data_float; - SimpleTensor::encode(*make_tensor(false), data_double); - SimpleTensor::encode(*make_tensor(true), data_float); - EXPECT_EQUAL(Memory(data_double.peek(), data_double.size()), - Memory(expect_default.peek(), expect_default.size())); - EXPECT_EQUAL(Memory(data_float.peek(), data_float.size()), - Memory(expect_float.peek(), expect_float.size())); - EXPECT_EQUAL(to_spec(*SimpleTensor::decode(expect_default)), make_spec(false)); - EXPECT_EQUAL(to_spec(*SimpleTensor::decode(expect_double)), make_spec(false)); - EXPECT_EQUAL(to_spec(*SimpleTensor::decode(expect_float)), make_spec(true)); - } -}; -TensorExample::~TensorExample() = default; - -//----------------------------------------------------------------------------- - -struct SparseTensorExample : TensorExample { - TensorSpec make_spec(bool use_float) const override { - return TensorSpec(make_type_spec(use_float, "(x{},y{})")) - .add({{"x","a"},{"y","a"}}, 1) - .add({{"x","a"},{"y","b"}}, 2) - .add({{"x","b"},{"y","a"}}, 3); - } - std::unique_ptr<SimpleTensor> make_tensor(bool use_float) const override { - return SimpleTensor::create(make_spec(use_float)); - } - template <typename T> - void encode_inner(nbostream &dst) const { - dst.putInt1_4Bytes(2); - dst.writeSmallString("x"); - dst.writeSmallString("y"); - dst.putInt1_4Bytes(3); - dst.writeSmallString("a"); - dst.writeSmallString("a"); - dst << (T) 1; - dst.writeSmallString("a"); - dst.writeSmallString("b"); - dst << (T) 2; - dst.writeSmallString("b"); - dst.writeSmallString("a"); - dst << (T) 3; - } - void encode_default(nbostream &dst) const override { - dst.putInt1_4Bytes(1); - encode_inner<double>(dst); - } - void encode_with_double(nbostream &dst) const override { - dst.putInt1_4Bytes(5); - dst.putInt1_4Bytes(0); - encode_inner<double>(dst); - } - void encode_with_float(nbostream &dst) const override { - dst.putInt1_4Bytes(5); - dst.putInt1_4Bytes(1); - encode_inner<float>(dst); - } -}; - -TEST_F("require that sparse tensors can be encoded and decoded", SparseTensorExample()) { - TEST_DO(f1.verify_encode_decode()); -} - -//----------------------------------------------------------------------------- - -struct DenseTensorExample : TensorExample { - TensorSpec make_spec(bool use_float) const override { - return TensorSpec(make_type_spec(use_float, "(x[3],y[2])")) - .add({{"x",0},{"y",0}}, 1) - .add({{"x",0},{"y",1}}, 2) - .add({{"x",1},{"y",0}}, 3) - .add({{"x",1},{"y",1}}, 4) - .add({{"x",2},{"y",0}}, 5) - .add({{"x",2},{"y",1}}, 6); - } - std::unique_ptr<SimpleTensor> make_tensor(bool use_float) const override { - return SimpleTensor::create(make_spec(use_float)); - } - template <typename T> - void encode_inner(nbostream &dst) const { - dst.putInt1_4Bytes(2); - dst.writeSmallString("x"); - dst.putInt1_4Bytes(3); - dst.writeSmallString("y"); - dst.putInt1_4Bytes(2); - dst << (T) 1; - dst << (T) 2; - dst << (T) 3; - dst << (T) 4; - dst << (T) 5; - dst << (T) 6; - } - void encode_default(nbostream &dst) const override { - dst.putInt1_4Bytes(2); - encode_inner<double>(dst); - } - void encode_with_double(nbostream &dst) const override { - dst.putInt1_4Bytes(6); - dst.putInt1_4Bytes(0); - encode_inner<double>(dst); - } - void encode_with_float(nbostream &dst) const override { - dst.putInt1_4Bytes(6); - dst.putInt1_4Bytes(1); - encode_inner<float>(dst); - } -}; - -TEST_F("require that dense tensors can be encoded and decoded", DenseTensorExample()) { - TEST_DO(f1.verify_encode_decode()); -} - -//----------------------------------------------------------------------------- - -struct MixedTensorExample : TensorExample { - TensorSpec make_spec(bool use_float) const override { - return TensorSpec(make_type_spec(use_float, "(x{},y{},z[2])")) - .add({{"x","a"},{"y","a"},{"z",0}}, 1) - .add({{"x","a"},{"y","a"},{"z",1}}, 2) - .add({{"x","a"},{"y","b"},{"z",0}}, 3) - .add({{"x","a"},{"y","b"},{"z",1}}, 4) - .add({{"x","b"},{"y","a"},{"z",0}}, 5) - .add({{"x","b"},{"y","a"},{"z",1}}, 6); - } - std::unique_ptr<SimpleTensor> make_tensor(bool use_float) const override { - return SimpleTensor::create(make_spec(use_float)); - } - template <typename T> - void encode_inner(nbostream &dst) const { - dst.putInt1_4Bytes(2); - dst.writeSmallString("x"); - dst.writeSmallString("y"); - dst.putInt1_4Bytes(1); - dst.writeSmallString("z"); - dst.putInt1_4Bytes(2); - dst.putInt1_4Bytes(3); - dst.writeSmallString("a"); - dst.writeSmallString("a"); - dst << (T) 1; - dst << (T) 2; - dst.writeSmallString("a"); - dst.writeSmallString("b"); - dst << (T) 3; - dst << (T) 4; - dst.writeSmallString("b"); - dst.writeSmallString("a"); - dst << (T) 5; - dst << (T) 6; - } - void encode_default(nbostream &dst) const override { - dst.putInt1_4Bytes(3); - encode_inner<double>(dst); - } - void encode_with_double(nbostream &dst) const override { - dst.putInt1_4Bytes(7); - dst.putInt1_4Bytes(0); - encode_inner<double>(dst); - } - void encode_with_float(nbostream &dst) const override { - dst.putInt1_4Bytes(7); - dst.putInt1_4Bytes(1); - encode_inner<float>(dst); - } -}; - -TEST_F("require that mixed tensors can be encoded and decoded", MixedTensorExample()) { - TEST_DO(f1.verify_encode_decode()); -} - -//----------------------------------------------------------------------------- - -TEST_MAIN() { TEST_RUN_ALL(); } 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 fc6a7e46576..2bffc376dbf 100644 --- a/eval/src/tests/eval/tensor_lambda/tensor_lambda_test.cpp +++ b/eval/src/tests/eval/tensor_lambda/tensor_lambda_test.cpp @@ -2,8 +2,6 @@ #include <vespa/vespalib/testkit/test_kit.h> #include <vespa/eval/eval/tensor_function.h> -#include <vespa/eval/eval/simple_tensor.h> -#include <vespa/eval/eval/simple_tensor_engine.h> #include <vespa/eval/eval/simple_value.h> #include <vespa/eval/eval/fast_value.h> #include <vespa/eval/tensor/default_tensor_engine.h> diff --git a/eval/src/tests/instruction/dense_simple_expand_function/dense_simple_expand_function_test.cpp b/eval/src/tests/instruction/dense_simple_expand_function/dense_simple_expand_function_test.cpp index 975088f2bff..2c5566e045a 100644 --- a/eval/src/tests/instruction/dense_simple_expand_function/dense_simple_expand_function_test.cpp +++ b/eval/src/tests/instruction/dense_simple_expand_function/dense_simple_expand_function_test.cpp @@ -2,8 +2,6 @@ #include <vespa/eval/eval/fast_value.h> #include <vespa/eval/eval/tensor_function.h> -#include <vespa/eval/eval/simple_tensor.h> -#include <vespa/eval/eval/simple_tensor_engine.h> #include <vespa/eval/instruction/dense_simple_expand_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_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 1045e4159bf..4b2ca3ae4ae 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,6 @@ #include <vespa/vespalib/testkit/test_kit.h> #include <vespa/eval/eval/fast_value.h> #include <vespa/eval/eval/tensor_function.h> -#include <vespa/eval/eval/simple_tensor.h> -#include <vespa/eval/eval/simple_tensor_engine.h> #include <vespa/eval/tensor/dense/dense_replace_type_function.h> #include <vespa/eval/tensor/dense/dense_fast_rename_optimizer.h> #include <vespa/eval/tensor/dense/dense_tensor.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 8c67dc50df3..681b1987a6d 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,6 @@ #include <vespa/vespalib/testkit/test_kit.h> #include <vespa/eval/eval/tensor_function.h> -#include <vespa/eval/eval/simple_tensor.h> -#include <vespa/eval/eval/simple_tensor_engine.h> #include <vespa/eval/tensor/dense/dense_replace_type_function.h> #include <vespa/eval/tensor/dense/dense_fast_rename_optimizer.h> #include <vespa/eval/tensor/dense/dense_tensor.h> diff --git a/eval/src/tests/tensor/dense_generic_join/dense_generic_join_test.cpp b/eval/src/tests/tensor/dense_generic_join/dense_generic_join_test.cpp index 90ed28caa3c..faf6bed2786 100644 --- a/eval/src/tests/tensor/dense_generic_join/dense_generic_join_test.cpp +++ b/eval/src/tests/tensor/dense_generic_join/dense_generic_join_test.cpp @@ -2,8 +2,6 @@ #include <vespa/vespalib/testkit/test_kit.h> #include <vespa/eval/eval/tensor_function.h> -#include <vespa/eval/eval/simple_tensor.h> -#include <vespa/eval/eval/simple_tensor_engine.h> #include <vespa/eval/tensor/dense/typed_dense_tensor_builder.h> #include <vespa/eval/tensor/dense/dense_tensor.h> #include <vespa/eval/eval/test/tensor_model.hpp> diff --git a/eval/src/tests/tensor/dense_inplace_join_function/dense_inplace_join_function_test.cpp b/eval/src/tests/tensor/dense_inplace_join_function/dense_inplace_join_function_test.cpp index 27bfa1ff8f3..0f3a200bfdd 100644 --- a/eval/src/tests/tensor/dense_inplace_join_function/dense_inplace_join_function_test.cpp +++ b/eval/src/tests/tensor/dense_inplace_join_function/dense_inplace_join_function_test.cpp @@ -2,8 +2,6 @@ #include <vespa/vespalib/testkit/test_kit.h> #include <vespa/eval/eval/tensor_function.h> -#include <vespa/eval/eval/simple_tensor.h> -#include <vespa/eval/eval/simple_tensor_engine.h> #include <vespa/eval/tensor/dense/dense_tensor.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_number_join_function/dense_number_join_function_test.cpp b/eval/src/tests/tensor/dense_number_join_function/dense_number_join_function_test.cpp index 0255c33b295..2e428bb501e 100644 --- a/eval/src/tests/tensor/dense_number_join_function/dense_number_join_function_test.cpp +++ b/eval/src/tests/tensor/dense_number_join_function/dense_number_join_function_test.cpp @@ -2,8 +2,6 @@ #include <vespa/vespalib/testkit/test_kit.h> #include <vespa/eval/eval/tensor_function.h> -#include <vespa/eval/eval/simple_tensor.h> -#include <vespa/eval/eval/simple_tensor_engine.h> #include <vespa/eval/tensor/default_tensor_engine.h> #include <vespa/eval/tensor/dense/dense_number_join_function.h> #include <vespa/eval/eval/test/eval_fixture.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 1db815df8a5..b655c52c9d3 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,6 @@ #include <vespa/vespalib/testkit/test_kit.h> #include <vespa/eval/eval/tensor_function.h> -#include <vespa/eval/eval/simple_tensor.h> -#include <vespa/eval/eval/simple_tensor_engine.h> #include <vespa/eval/tensor/dense/dense_replace_type_function.h> #include <vespa/eval/tensor/dense/dense_fast_rename_optimizer.h> #include <vespa/eval/tensor/dense/dense_tensor.h> 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 45a60b2d30a..6ad60d2e3f5 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,8 +2,6 @@ #include <vespa/vespalib/testkit/test_kit.h> #include <vespa/eval/eval/tensor_function.h> -#include <vespa/eval/eval/simple_tensor.h> -#include <vespa/eval/eval/simple_tensor_engine.h> #include <vespa/eval/tensor/dense/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 e03a8dced6a..53164ad59c8 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,8 +1,6 @@ // 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/eval/simple_tensor.h> -#include <vespa/eval/eval/simple_tensor_engine.h> #include <vespa/eval/tensor/dense/dense_simple_map_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_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 a5659b1c1f4..1948d8d010a 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,8 +3,6 @@ #include <vespa/vespalib/testkit/test_kit.h> #include <vespa/eval/eval/tensor_function.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/tensor/dense/dense_single_reduce_function.h> #include <vespa/eval/tensor/dense/dense_tensor.h> #include <vespa/eval/tensor/dense/dense_tensor_view.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 9a4e55745d2..2bc937a26bf 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,8 +2,6 @@ #include <vespa/vespalib/testkit/test_kit.h> #include <vespa/eval/eval/tensor_function.h> -#include <vespa/eval/eval/simple_tensor.h> -#include <vespa/eval/eval/simple_tensor_engine.h> #include <vespa/eval/tensor/dense/dense_tensor_create_function.h> #include <vespa/eval/tensor/dense/dense_tensor.h> #include <vespa/eval/eval/test/tensor_model.hpp> diff --git a/eval/src/tests/tensor/instruction_benchmark/instruction_benchmark.cpp b/eval/src/tests/tensor/instruction_benchmark/instruction_benchmark.cpp index f11678d3ee7..2f9d531309b 100644 --- a/eval/src/tests/tensor/instruction_benchmark/instruction_benchmark.cpp +++ b/eval/src/tests/tensor/instruction_benchmark/instruction_benchmark.cpp @@ -29,7 +29,6 @@ #include <vespa/eval/instruction/generic_rename.h> #include <vespa/eval/instruction/generic_map.h> #include <vespa/eval/instruction/generic_merge.h> -#include <vespa/eval/eval/simple_tensor_engine.h> #include <vespa/eval/eval/tensor_spec.h> #include <vespa/eval/eval/value_codec.h> #include <vespa/eval/eval/operation.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 bb727f8bb6a..9881d120a74 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,8 +2,6 @@ #include <vespa/vespalib/testkit/test_kit.h> #include <vespa/eval/eval/tensor_function.h> -#include <vespa/eval/eval/simple_tensor.h> -#include <vespa/eval/eval/simple_tensor_engine.h> #include <vespa/eval/tensor/dense/vector_from_doubles_function.h> #include <vespa/eval/tensor/dense/dense_tensor.h> #include <vespa/eval/eval/test/tensor_model.hpp> |