1 files changed, 3 insertions, 13 deletions
diff --git a/eval/src/tests/tensor/tensor_performance/tensor_performance_test.cpp b/eval/src/tests/tensor/tensor_performance/tensor_performance_test.cpp
index 3daaa3f79b3..2ed0021b5c7 100644
--- a/eval/src/tests/tensor/tensor_performance/tensor_performance_test.cpp
+++ b/eval/src/tests/tensor/tensor_performance/tensor_performance_test.cpp
@@ -25,21 +25,12 @@ const vespalib::string matrix_product_expr       = "reduce(reduce((query+documen
 
 //-----------------------------------------------------------------------------
 
-Value::UP wrap(std::unique_ptr<eval::Tensor> tensor) {
-    return Value::UP(new TensorValue(std::move(tensor)));
-}
-
-//-----------------------------------------------------------------------------
-
 struct Params {
     std::map<vespalib::string, Value::UP> map;
     Params &add(const vespalib::string &name, Value::UP value) {
         map.emplace(name, std::move(value));
         return *this;
     }
-    Params &add(const vespalib::string &name, std::unique_ptr<eval::Tensor> value) {
-        return add(name, wrap(std::move(value)));
-    }
 };
 
 InterpretedFunction::SimpleObjectParams make_params(const Function &function, const Params &params)
@@ -49,7 +40,7 @@ InterpretedFunction::SimpleObjectParams make_params(const Function &function, co
     for (size_t i = 0; i < function.num_params(); ++i) {
         auto param = params.map.find(function.param_name(i));
         ASSERT_TRUE(param != params.map.end());
-        fun_params.params.push_back(*(param->second));
+        fun_params.params.push_back(*param->second);
     }
     return fun_params;
 }
@@ -92,9 +83,8 @@ double benchmark_expression_us(const vespalib::string &expression, const Params
 
 //-----------------------------------------------------------------------------
 
-tensor::Tensor::UP make_tensor(const TensorSpec &spec) {
-    auto tensor = DefaultTensorEngine::ref().create(spec);
-    return tensor::Tensor::UP(dynamic_cast<tensor::Tensor*>(tensor.release()));
+Value::UP make_tensor(TensorSpec spec) {
+    return DefaultTensorEngine::ref().from_spec(spec);
 }
 
 //-----------------------------------------------------------------------------