test via compatibility layer

4 files changed, 5 insertions, 26 deletions

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 4546ae42a5e..046306b467e 100644
--- a/eval/src/tests/tensor/partial_add/partial_add_test.cpp
+++ b/eval/src/tests/tensor/partial_add/partial_add_test.cpp
@@ -3,10 +3,8 @@
 #include <vespa/eval/eval/simple_value.h>
 #include <vespa/eval/eval/test/tensor_model.hpp>
 #include <vespa/eval/eval/value_codec.h>
-#include <vespa/eval/tensor/cell_values.h>
 #include <vespa/eval/tensor/default_tensor_engine.h>
 #include <vespa/eval/tensor/partial_update.h>
-#include <vespa/eval/tensor/sparse/sparse_tensor.h>
 #include <vespa/eval/tensor/tensor.h>
 #include <vespa/vespalib/util/stringfmt.h>
 #include <vespa/vespalib/gtest/gtest.h>
@@ -60,16 +58,11 @@ TensorSpec perform_old_add(const TensorSpec &a, const TensorSpec &b) {
     const auto &engine = tensor::DefaultTensorEngine::ref();
     auto lhs = engine.from_spec(a);
     auto rhs = engine.from_spec(b);
-    auto lhs_tensor = dynamic_cast<tensor::Tensor *>(lhs.get());
-    EXPECT_TRUE(lhs_tensor);
-    auto rhs_tensor = dynamic_cast<tensor::Tensor *>(rhs.get());
-    EXPECT_TRUE(rhs_tensor);
-    auto up = lhs_tensor->add(*rhs_tensor);
+    auto up = tensor::TensorPartialUpdate::add(*lhs, *rhs, engine);
     EXPECT_TRUE(up);
     return engine.to_spec(*up);
 }
 
-
 TEST(PartialAddTest, partial_add_works_for_simple_values) {
     ASSERT_TRUE((add_layouts.size() % 2) == 0);
     for (size_t i = 0; i < add_layouts.size(); i += 2) {
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 677d6d71ee1..3236a8ac127 100644
--- a/eval/src/tests/tensor/partial_modify/partial_modify_test.cpp
+++ b/eval/src/tests/tensor/partial_modify/partial_modify_test.cpp
@@ -3,10 +3,8 @@
 #include <vespa/eval/eval/simple_value.h>
 #include <vespa/eval/eval/test/tensor_model.hpp>
 #include <vespa/eval/eval/value_codec.h>
-#include <vespa/eval/tensor/cell_values.h>
 #include <vespa/eval/tensor/default_tensor_engine.h>
 #include <vespa/eval/tensor/partial_update.h>
-#include <vespa/eval/tensor/sparse/sparse_tensor.h>
 #include <vespa/eval/tensor/tensor.h>
 #include <vespa/vespalib/util/stringfmt.h>
 #include <vespa/vespalib/gtest/gtest.h>
@@ -75,12 +73,8 @@ TensorSpec perform_old_modify(const TensorSpec &a, const TensorSpec &b, join_fun
     const auto &engine = tensor::DefaultTensorEngine::ref();
     auto lhs = engine.from_spec(a);
     auto rhs = engine.from_spec(b);
-    auto lhs_tensor = dynamic_cast<tensor::Tensor *>(lhs.get());
-    EXPECT_TRUE(lhs_tensor);
-    auto rhs_sparse = dynamic_cast<tensor::SparseTensor *>(rhs.get());
-    EXPECT_TRUE(rhs_sparse);
-    tensor::CellValues cell_values(*rhs_sparse);
-    auto up = lhs_tensor->modify(fun, cell_values);
+    EXPECT_TRUE(tensor::TensorPartialUpdate::check_suitably_sparse(*rhs, engine));
+    auto up = tensor::TensorPartialUpdate::modify(*lhs, fun, *rhs, engine);
     EXPECT_TRUE(up);
     return engine.to_spec(*up);
 }
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 7d1611b7f64..220eee0ba8f 100644
--- a/eval/src/tests/tensor/partial_remove/partial_remove_test.cpp
+++ b/eval/src/tests/tensor/partial_remove/partial_remove_test.cpp
@@ -3,10 +3,8 @@
 #include <vespa/eval/eval/simple_value.h>
 #include <vespa/eval/eval/test/tensor_model.hpp>
 #include <vespa/eval/eval/value_codec.h>
-#include <vespa/eval/tensor/cell_values.h>
 #include <vespa/eval/tensor/default_tensor_engine.h>
 #include <vespa/eval/tensor/partial_update.h>
-#include <vespa/eval/tensor/sparse/sparse_tensor.h>
 #include <vespa/eval/tensor/tensor.h>
 #include <vespa/vespalib/util/stringfmt.h>
 #include <vespa/vespalib/gtest/gtest.h>
@@ -68,17 +66,12 @@ TensorSpec perform_old_remove(const TensorSpec &a, const TensorSpec &b) {
     const auto &engine = tensor::DefaultTensorEngine::ref();
     auto lhs = engine.from_spec(a);
     auto rhs = engine.from_spec(b);
-    auto lhs_tensor = dynamic_cast<tensor::Tensor *>(lhs.get());
-    EXPECT_TRUE(lhs_tensor);
-    auto rhs_sparse = dynamic_cast<tensor::SparseTensor *>(rhs.get());
-    EXPECT_TRUE(rhs_sparse);
-    tensor::CellValues cell_values(*rhs_sparse);
-    auto up = lhs_tensor->remove(cell_values);
+    EXPECT_TRUE(tensor::TensorPartialUpdate::check_suitably_sparse(*rhs, engine));
+    auto up = tensor::TensorPartialUpdate::remove(*lhs, *rhs, engine);
     EXPECT_TRUE(up);
     return engine.to_spec(*up);
 }
 
-
 TEST(PartialRemoveTest, partial_remove_works_for_simple_values) {
     ASSERT_TRUE((remove_layouts.size() % 2) == 0);
     for (size_t i = 0; i < remove_layouts.size(); i += 2) {
diff --git a/eval/src/vespa/eval/eval/value.cpp b/eval/src/vespa/eval/eval/value.cpp
index 1e9aca9e079..10a72057754 100644
--- a/eval/src/vespa/eval/eval/value.cpp
+++ b/eval/src/vespa/eval/eval/value.cpp
@@ -1,7 +1,6 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include "value.h"
-#include "tensor_engine.h"
 #include <vespa/vespalib/util/typify.h>
 
 namespace vespalib {