handle both engine- and factory-based tensors

* use EngineOrFactory::get() instead of DefaultTensorEngine::ref()
* avoid direct use of DenseTensorView etc where possible
* use eval::Value instead of tensor::Tensor where possible

1 files changed, 10 insertions, 12 deletions

diff --git a/searchlib/src/tests/tensor/direct_tensor_store/direct_tensor_store_test.cpp b/searchlib/src/tests/tensor/direct_tensor_store/direct_tensor_store_test.cpp
index 5a815a96dfb..4eb2c935234 100644
--- a/searchlib/src/tests/tensor/direct_tensor_store/direct_tensor_store_test.cpp
+++ b/searchlib/src/tests/tensor/direct_tensor_store/direct_tensor_store_test.cpp
@@ -2,30 +2,28 @@
 
 #include <vespa/searchlib/tensor/direct_tensor_store.h>
 #include <vespa/vespalib/gtest/gtest.h>
-#include <vespa/eval/tensor/default_tensor_engine.h>
-#include <vespa/eval/tensor/tensor.h>
+#include <vespa/eval/eval/engine_or_factory.h>
+#include <vespa/eval/eval/value.h>
 #include <vespa/vespalib/datastore/datastore.hpp>
 
 using namespace search::tensor;
 
 using vespalib::datastore::EntryRef;
+using vespalib::eval::EngineOrFactory;
 using vespalib::eval::TensorSpec;
-using vespalib::tensor::DefaultTensorEngine;
-using vespalib::tensor::Tensor;
+using vespalib::eval::Value;
 
 vespalib::string tensor_spec("tensor(x{})");
 
-Tensor::UP
+Value::UP
 make_tensor(const TensorSpec& spec)
 {
-    auto value = DefaultTensorEngine::ref().from_spec(spec);
-    auto* tensor = dynamic_cast<Tensor*>(value.get());
-    assert(tensor != nullptr);
-    value.release();
-    return Tensor::UP(tensor);
+    auto value = EngineOrFactory::get().from_spec(spec);
+    assert(value->is_tensor());
+    return value;
 }
 
-Tensor::UP
+Value::UP
 make_tensor(double value)
 {
     return make_tensor(TensorSpec(tensor_spec).add({{"x", "a"}}, value));
@@ -41,7 +39,7 @@ public:
         store.clearHoldLists();
     }
 
-    void expect_tensor(const Tensor* exp, EntryRef ref) {
+    void expect_tensor(const Value* exp, EntryRef ref) {
         const auto* act = store.get_tensor(ref);
         ASSERT_TRUE(act);
         EXPECT_EQ(exp, act);