remove old dense vectors

15 files changed, 0 insertions, 344 deletions

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 4b2ca3ae4ae..0e8e50daae5 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
@@ -5,7 +5,6 @@
 #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/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_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 681b1987a6d..52afde0e92c 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
@@ -4,7 +4,6 @@
 #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/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_generic_join/CMakeLists.txt b/eval/src/tests/tensor/dense_generic_join/CMakeLists.txt
deleted file mode 100644
index 1fbb35cb2b8..00000000000
--- a/eval/src/tests/tensor/dense_generic_join/CMakeLists.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(eval_dense_generic_join_test_app TEST
-    SOURCES
-    dense_generic_join_test.cpp
-    DEPENDS
-    vespaeval
-)
-vespa_add_test(NAME eval_dense_generic_join_test_app COMMAND eval_dense_generic_join_test_app)
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
deleted file mode 100644
index faf6bed2786..00000000000
--- a/eval/src/tests/tensor/dense_generic_join/dense_generic_join_test.cpp
+++ /dev/null
@@ -1,124 +0,0 @@
-// Copyright 2018 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/tensor_function.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>
-#include <vespa/eval/eval/test/eval_fixture.h>
-
-#include <vespa/vespalib/util/stringfmt.h>
-#include <vespa/vespalib/util/stash.h>
-
-using namespace vespalib;
-using namespace vespalib::eval;
-using namespace vespalib::eval::test;
-using namespace vespalib::tensor;
-using namespace vespalib::eval::tensor_function;
-
-const ValueBuilderFactory &prod_factory = FastValueBuilderFactory::get();
-
-double seq_value = 0.0;
-
-struct GlobalSequence : public Sequence {
-    GlobalSequence() {}
-    double operator[](size_t) const override {
-        seq_value += 1.0;
-        return seq_value;
-    }
-    ~GlobalSequence() {}
-};
-GlobalSequence seq;
-
-EvalFixture::ParamRepo make_params() {
-    return EvalFixture::ParamRepo()
-        .add("con_x5_A",     spec({x(5)          }, seq))
-        .add("con_x5y3_B",   spec({x(5),y(3)     }, seq))
-        .add("con_x5z4_C",   spec({x(5),     z(4)}, seq))
-        .add("con_x5y3z4_D", spec({x(5),y(3),z(4)}, seq))
-        .add("con_y3_E",     spec({     y(3)     }, seq))
-        .add("con_y3z4_F",   spec({     y(3),z(4)}, seq))
-        .add("con_z4_G",     spec({          z(4)}, seq))
-        .add("con_x5f_H",    spec({x(5)          }, seq), "tensor<float>(x[5])")
-        .add("con_x5y3_I",   spec({x(5),y(3)     }, seq), "tensor<float>(x[5],y[3])")
-        .add("con_x5z4_J",   spec({x(5),     z(4)}, seq), "tensor<float>(x[5],z[4])")
-        .add("con_x5y3z4_K", spec({x(5),y(3),z(4)}, seq), "tensor<float>(x[5],y[3],z[4])")
-        .add("con_y3_L",     spec({     y(3)     }, seq), "tensor<float>(y[3])")
-        .add("con_y3z4_M",   spec({     y(3),z(4)}, seq), "tensor<float>(y[3],z[4])))")
-        .add("con_z4_N",     spec({          z(4)}, seq), "tensor<float>(z[4]))")
-        .add("con_y2",       spec({y(5)}, seq))
-        .add("con_y2f",      spec({y(5)}, seq), "tensor<float>(y[2]))");
-}
-EvalFixture::ParamRepo param_repo = make_params();
-
-void verify_equal(const vespalib::string &expr) {
-    EvalFixture fixture(prod_factory, expr, param_repo, true, true);
-    EXPECT_EQUAL(fixture.result(), EvalFixture::ref(expr, param_repo));
-}
-
-
-TEST("require that non-overlapping dense join works") {
-    TEST_DO(verify_equal("con_x5_A-con_y3_E"));
-    TEST_DO(verify_equal("con_x5_A+con_y3_E"));
-    TEST_DO(verify_equal("con_x5_A*con_y3_E"));
-
-    TEST_DO(verify_equal("con_x5_A-con_y3z4_F"));
-    TEST_DO(verify_equal("con_x5_A+con_y3z4_F"));
-    TEST_DO(verify_equal("con_x5_A*con_y3z4_F"));
-
-    TEST_DO(verify_equal("con_x5_A-con_z4_G"));
-    TEST_DO(verify_equal("con_x5_A+con_z4_G"));
-    TEST_DO(verify_equal("con_x5_A*con_z4_G"));
-
-    TEST_DO(verify_equal("con_x5y3_B-con_z4_G"));
-    TEST_DO(verify_equal("con_x5y3_B+con_z4_G"));
-    TEST_DO(verify_equal("con_x5y3_B*con_z4_G"));
-
-    TEST_DO(verify_equal("con_y3_E-con_z4_G"));
-    TEST_DO(verify_equal("con_y3_E+con_z4_G"));
-    TEST_DO(verify_equal("con_y3_E*con_z4_G"));
-}
-
-TEST("require that overlapping dense join works") {
-    TEST_DO(verify_equal("con_x5_A-con_x5y3_B"));
-    TEST_DO(verify_equal("con_x5_A+con_x5y3_B"));
-    TEST_DO(verify_equal("con_x5_A*con_x5y3_B"));
-
-    TEST_DO(verify_equal("con_x5_A-con_x5z4_C"));
-    TEST_DO(verify_equal("con_x5_A+con_x5z4_C"));
-    TEST_DO(verify_equal("con_x5_A*con_x5z4_C"));
-
-    TEST_DO(verify_equal("con_x5y3_B-con_y3_E"));
-    TEST_DO(verify_equal("con_x5y3_B+con_y3_E"));
-    TEST_DO(verify_equal("con_x5y3_B*con_y3_E"));
-
-    TEST_DO(verify_equal("con_x5y3_B-con_y3z4_F"));
-    TEST_DO(verify_equal("con_x5y3_B+con_y3z4_F"));
-    TEST_DO(verify_equal("con_x5y3_B*con_y3z4_F"));
-
-    TEST_DO(verify_equal("con_x5y3z4_D-con_x5y3_B"));
-    TEST_DO(verify_equal("con_x5y3z4_D+con_x5y3_B"));
-    TEST_DO(verify_equal("con_x5y3z4_D*con_x5y3_B"));
-
-    TEST_DO(verify_equal("con_x5y3z4_D-con_x5z4_C"));
-    TEST_DO(verify_equal("con_x5y3z4_D+con_x5z4_C"));
-    TEST_DO(verify_equal("con_x5y3z4_D*con_x5z4_C"));
-
-    TEST_DO(verify_equal("con_x5y3z4_D-con_y3z4_F"));
-    TEST_DO(verify_equal("con_x5y3z4_D+con_y3z4_F"));
-    TEST_DO(verify_equal("con_x5y3z4_D*con_y3z4_F"));
-
-    TEST_DO(verify_equal("con_x5y3z4_D-con_y3z4_F"));
-    TEST_DO(verify_equal("con_x5y3z4_D+con_y3z4_F"));
-    TEST_DO(verify_equal("con_x5y3z4_D*con_y3z4_F"));
-
-    TEST_DO(verify_equal("con_y3_E-con_y3z4_F"));
-    TEST_DO(verify_equal("con_y3_E+con_y3z4_F"));
-    TEST_DO(verify_equal("con_y3_E*con_y3z4_F"));
-
-    TEST_DO(verify_equal("con_y3z4_F-con_z4_G"));
-    TEST_DO(verify_equal("con_y3z4_F+con_z4_G"));
-    TEST_DO(verify_equal("con_y3z4_F*con_z4_G"));
-}
-
-TEST_MAIN() { TEST_RUN_ALL(); }
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 0f3a200bfdd..853607ae76d 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,7 +2,6 @@
 
 #include <vespa/vespalib/testkit/test_kit.h>
 #include <vespa/eval/eval/tensor_function.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_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 b655c52c9d3..69910e27b4b 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
@@ -4,7 +4,6 @@
 #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/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_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 dd4ddb9044a..2612869e72f 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,6 @@
 #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_tensor_view.h>
 #include <vespa/eval/tensor/dense/dense_replace_type_function.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 1948d8d010a..347228269cf 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
@@ -4,8 +4,6 @@
 #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/tensor/dense/dense_tensor.h>
-#include <vespa/eval/tensor/dense/dense_tensor_view.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 2bc937a26bf..edf999e97b3 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
@@ -3,7 +3,6 @@
 #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/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/direct_dense_tensor_builder/CMakeLists.txt b/eval/src/tests/tensor/direct_dense_tensor_builder/CMakeLists.txt
deleted file mode 100644
index 70ccbddd617..00000000000
--- a/eval/src/tests/tensor/direct_dense_tensor_builder/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_direct_dense_tensor_builder_test_app TEST
-    SOURCES
-    direct_dense_tensor_builder_test.cpp
-    DEPENDS
-    vespaeval
-)
-vespa_add_test(NAME eval_direct_dense_tensor_builder_test_app COMMAND eval_direct_dense_tensor_builder_test_app)
diff --git a/eval/src/tests/tensor/direct_dense_tensor_builder/direct_dense_tensor_builder_test.cpp b/eval/src/tests/tensor/direct_dense_tensor_builder/direct_dense_tensor_builder_test.cpp
deleted file mode 100644
index 52768663647..00000000000
--- a/eval/src/tests/tensor/direct_dense_tensor_builder/direct_dense_tensor_builder_test.cpp
+++ /dev/null
@@ -1,192 +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/test/insertion_operators.h>
-#include <vespa/vespalib/testkit/test_kit.h>
-#include <vespa/eval/tensor/dense/typed_dense_tensor_builder.h>
-#include <vespa/vespalib/util/exceptions.h>
-
-using namespace vespalib::tensor;
-using vespalib::IllegalArgumentException;
-using BuilderDbl = TypedDenseTensorBuilder<double>;
-using BuilderFlt = TypedDenseTensorBuilder<float>;
-using vespalib::eval::TensorSpec;
-using vespalib::eval::ValueType;
-using vespalib::ConstArrayRef;
-
-struct CallMakeVector {
-    template <typename T>
-    static std::vector<double> call(const ConstArrayRef<T> &ref) {
-        std::vector<double> result;
-        result.reserve(ref.size());
-        for (T v : ref) {
-            result.push_back(v);
-        }
-        return result;
-    }
-};
-
-void assertTensor(const vespalib::string &type_spec,
-                  const std::vector<double> &expCells,
-                  const Tensor &tensor)
-{
-    EXPECT_EQUAL(ValueType::from_spec(type_spec), tensor.type());
-    EXPECT_EQUAL(expCells, dispatch_1<CallMakeVector>(tensor.cells()));
-}
-
-void assertTensorSpec(const TensorSpec &expSpec, const Tensor &tensor) {
-    TensorSpec actSpec = tensor.toSpec();
-    EXPECT_EQUAL(expSpec, actSpec);
-}
-
-Tensor::UP build1DTensor() {
-    BuilderDbl builder(ValueType::from_spec("tensor(x[3])"));
-    builder.insertCell(0, 10);
-    builder.insertCell(1, 11);
-    builder.insertCell(2, 12);
-    return builder.build();
-}
-
-TEST("require that 1d tensor can be constructed") {
-    assertTensor("tensor(x[3])", {10,11,12}, *build1DTensor());
-}
-
-TEST("require that 1d tensor can be converted to tensor spec") {
-    assertTensorSpec(TensorSpec("tensor(x[3])").
-                     add({{"x", 0}}, 10).
-                     add({{"x", 1}}, 11).
-                     add({{"x", 2}}, 12),
-                     *build1DTensor());
-}
-
-Tensor::UP build2DTensor() {
-    BuilderDbl builder(ValueType::from_spec("tensor(x[3],y[2])"));
-    builder.insertCell({0, 0}, 10);
-    builder.insertCell({0, 1}, 11);
-    builder.insertCell({1, 0}, 12);
-    builder.insertCell({1, 1}, 13);
-    builder.insertCell({2, 0}, 14);
-    builder.insertCell({2, 1}, 15);
-    return builder.build();
-}
-
-TEST("require that 2d tensor can be constructed") {
-    assertTensor("tensor(x[3],y[2])", {10,11,12,13,14,15}, *build2DTensor());
-}
-
-TEST("require that 2d tensor can be converted to tensor spec") {
-    assertTensorSpec(TensorSpec("tensor(x[3],y[2])").
-                     add({{"x", 0},{"y", 0}}, 10).
-                     add({{"x", 0},{"y", 1}}, 11).
-                     add({{"x", 1},{"y", 0}}, 12).
-                     add({{"x", 1},{"y", 1}}, 13).
-                     add({{"x", 2},{"y", 0}}, 14).
-                     add({{"x", 2},{"y", 1}}, 15),
-                     *build2DTensor());
-}
-
-TEST("require that 3d tensor can be constructed") {
-    BuilderDbl builder(ValueType::from_spec("tensor(x[3],y[2],z[2])"));
-    builder.insertCell({0, 0, 0}, 10);
-    builder.insertCell({0, 0, 1}, 11);
-    builder.insertCell({0, 1, 0}, 12);
-    builder.insertCell({0, 1, 1}, 13);
-    builder.insertCell({1, 0, 0}, 14);
-    builder.insertCell({1, 0, 1}, 15);
-    builder.insertCell({1, 1, 0}, 16);
-    builder.insertCell({1, 1, 1}, 17);
-    builder.insertCell({2, 0, 0}, 18);
-    builder.insertCell({2, 0, 1}, 19);
-    builder.insertCell({2, 1, 0}, 20);
-    builder.insertCell({2, 1, 1}, 21);
-    assertTensor("tensor(x[3],y[2],z[2])",
-                 {10,11,12,13,14,15,16,17,18,19,20,21},
-                 *builder.build());
-}
-
-TEST("require that 2d tensor with float cells can be constructed") {
-    BuilderFlt builder(ValueType::from_spec("tensor<float>(x[3],y[2])"));
-    builder.insertCell({0, 1}, 2.5);
-    builder.insertCell({1, 0}, 1.5);
-    builder.insertCell({2, 0}, -0.25);
-    builder.insertCell({2, 1}, 0.75);
-    assertTensor("tensor<float>(x[3],y[2])", {0,2.5,1.5,0,-0.25,0.75},
-                 *builder.build());
-}
-
-TEST("require that cells get default value 0 if not specified") {
-    BuilderDbl builder(ValueType::from_spec("tensor(x[3])"));
-    builder.insertCell(1, 11);
-    assertTensor("tensor(x[3])", {0,11,0},
-                 *builder.build());
-}
-
-void assertTensorCell(const DenseTensorView::Address &expAddress,
-                      double expCell,
-                      const DenseTensorView::CellsIterator &itr)
-{
-    EXPECT_TRUE(itr.valid());
-    EXPECT_EQUAL(expAddress, itr.address());
-    EXPECT_EQUAL(expCell, itr.cell());
-}
-
-TEST("require that dense tensor cells iterator works for 1d tensor") {
-    Tensor::UP tensor;
-    {
-        BuilderDbl builder(ValueType::from_spec("tensor(x[2])"));
-        builder.insertCell(0, 2);
-        builder.insertCell(1, 3);
-        tensor = builder.build();
-    }
-
-    const DenseTensorView &denseTensor = dynamic_cast<const DenseTensorView &>(*tensor);
-    DenseTensorView::CellsIterator itr = denseTensor.cellsIterator();
-
-    assertTensorCell({0}, 2, itr);
-    itr.next();
-    assertTensorCell({1}, 3, itr);
-    itr.next();
-    EXPECT_FALSE(itr.valid());
-}
-
-TEST("require that dense tensor cells iterator works for 2d tensor") {
-    Tensor::UP tensor;
-    {
-        BuilderDbl builder(ValueType::from_spec("tensor(x[2],y[2])"));
-        builder.insertCell({0, 0}, 2);
-        builder.insertCell({0, 1}, 3);
-        builder.insertCell({1, 0}, 5);
-        builder.insertCell({1, 1}, 7);
-        tensor = builder.build();
-    }
-
-    const DenseTensorView &denseTensor = dynamic_cast<const DenseTensorView &>(*tensor);
-    DenseTensorView::CellsIterator itr = denseTensor.cellsIterator();
-
-    assertTensorCell({0,0}, 2, itr);
-    itr.next();
-    assertTensorCell({0,1}, 3, itr);
-    itr.next();
-    assertTensorCell({1,0}, 5, itr);
-    itr.next();
-    assertTensorCell({1,1}, 7, itr);
-    itr.next();
-    EXPECT_FALSE(itr.valid());
-}
-
-TEST("require that memory used count is reasonable") {
-    Tensor::UP full = build2DTensor();
-    const DenseTensorView &full_view = dynamic_cast<const DenseTensorView &>(*full);
-    DenseTensorView ref_view(full_view.fast_type(), full_view.cells());
-
-    size_t full_sz = full->get_memory_usage().usedBytes();
-    size_t view_sz = full_view.get_memory_usage().usedBytes();
-    size_t ref_sz = ref_view.get_memory_usage().usedBytes();
-
-    EXPECT_EQUAL(ref_sz, sizeof(DenseTensorView));
-    EXPECT_LESS(ref_sz, full_sz);
-    EXPECT_EQUAL(full_sz, view_sz);
-    EXPECT_LESS(full_sz, 10000u);
-    EXPECT_GREATER(full_sz, sizeof(DenseTensor<double>));
-}
-
-TEST_MAIN() { TEST_RUN_ALL(); }
diff --git a/eval/src/tests/tensor/partial_add/partial_add_test.cpp b/eval/src/tests/tensor/partial_add/partial_add_test.cpp
index 42db77a311f..893acf07adb 100644
--- a/eval/src/tests/tensor/partial_add/partial_add_test.cpp
+++ b/eval/src/tests/tensor/partial_add/partial_add_test.cpp
@@ -4,7 +4,6 @@
 #include <vespa/eval/eval/test/tensor_model.hpp>
 #include <vespa/eval/eval/value_codec.h>
 #include <vespa/eval/tensor/partial_update.h>
-#include <vespa/eval/tensor/tensor.h>
 #include <vespa/vespalib/util/stringfmt.h>
 #include <vespa/vespalib/gtest/gtest.h>
 #include <optional>
diff --git a/eval/src/tests/tensor/partial_modify/partial_modify_test.cpp b/eval/src/tests/tensor/partial_modify/partial_modify_test.cpp
index a39bcc87ab3..a1802540fa5 100644
--- a/eval/src/tests/tensor/partial_modify/partial_modify_test.cpp
+++ b/eval/src/tests/tensor/partial_modify/partial_modify_test.cpp
@@ -4,7 +4,6 @@
 #include <vespa/eval/eval/test/tensor_model.hpp>
 #include <vespa/eval/eval/value_codec.h>
 #include <vespa/eval/tensor/partial_update.h>
-#include <vespa/eval/tensor/tensor.h>
 #include <vespa/vespalib/util/stringfmt.h>
 #include <vespa/vespalib/gtest/gtest.h>
 #include <optional>
diff --git a/eval/src/tests/tensor/partial_remove/partial_remove_test.cpp b/eval/src/tests/tensor/partial_remove/partial_remove_test.cpp
index 410331c5eb7..fef6d99519f 100644
--- a/eval/src/tests/tensor/partial_remove/partial_remove_test.cpp
+++ b/eval/src/tests/tensor/partial_remove/partial_remove_test.cpp
@@ -4,7 +4,6 @@
 #include <vespa/eval/eval/test/tensor_model.hpp>
 #include <vespa/eval/eval/value_codec.h>
 #include <vespa/eval/tensor/partial_update.h>
-#include <vespa/eval/tensor/tensor.h>
 #include <vespa/vespalib/util/stringfmt.h>
 #include <vespa/vespalib/gtest/gtest.h>
 #include <optional>
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 9881d120a74..c3e1f2f248e 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
@@ -3,7 +3,6 @@
 #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/tensor/dense/dense_tensor.h>
 #include <vespa/eval/eval/test/tensor_model.hpp>
 #include <vespa/eval/eval/test/eval_fixture.h>