remove DefaultTensor type wrapper

also remove TensorBuilder interface and use SparseTensorBuilder
directly

5 files changed, 13 insertions, 18 deletions

diff --git a/searchlib/src/tests/features/tensor/tensor_test.cpp b/searchlib/src/tests/features/tensor/tensor_test.cpp
index 3aa2671fd25..d4915ed29f4 100644
--- a/searchlib/src/tests/features/tensor/tensor_test.cpp
+++ b/searchlib/src/tests/features/tensor/tensor_test.cpp
@@ -12,7 +12,7 @@
 #include <vespa/searchlib/tensor/tensor_attribute.h>
 #include <vespa/eval/eval/function.h>
 #include <vespa/eval/eval/tensor_spec.h>
-#include <vespa/eval/tensor/default_tensor.h>
+#include <vespa/eval/tensor/tensor.h>
 #include <vespa/eval/tensor/default_tensor_engine.h>
 #include <vespa/eval/tensor/serialization/typed_binary_format.h>
 #include <vespa/eval/tensor/test/test_utils.h>
@@ -31,10 +31,7 @@ using vespalib::eval::Value;
 using vespalib::eval::ValueType;
 using vespalib::eval::TensorSpec;
 using vespalib::tensor::DefaultTensorEngine;
-using vespalib::tensor::DenseTensorCells;
 using vespalib::tensor::Tensor;
-using vespalib::tensor::TensorCells;
-using vespalib::tensor::TensorDimensions;
 using vespalib::tensor::test::makeTensor;
 
 using AVC = search::attribute::Config;
diff --git a/searchlib/src/vespa/searchlib/features/tensor_attribute_executor.h b/searchlib/src/vespa/searchlib/features/tensor_attribute_executor.h
index 2b2e1e6e4f1..deba5c05a5d 100644
--- a/searchlib/src/vespa/searchlib/features/tensor_attribute_executor.h
+++ b/searchlib/src/vespa/searchlib/features/tensor_attribute_executor.h
@@ -5,8 +5,9 @@
 #include <vespa/searchcommon/attribute/iattributevector.h>
 #include <vespa/searchlib/fef/featureexecutor.h>
 #include <vespa/eval/eval/value.h>
+#include <vespa/eval/eval/tensor.h>
+#include <vespa/eval/tensor/tensor.h>
 #include <vespa/vespalib/stllike/string.h>
-#include <vespa/eval/tensor/default_tensor.h>
 
 namespace search::tensor { class ITensorAttribute; }
 namespace search::features {
diff --git a/searchlib/src/vespa/searchlib/features/tensor_from_attribute_executor.h b/searchlib/src/vespa/searchlib/features/tensor_from_attribute_executor.h
index 4c5f64611c1..d936a2fc83e 100644
--- a/searchlib/src/vespa/searchlib/features/tensor_from_attribute_executor.h
+++ b/searchlib/src/vespa/searchlib/features/tensor_from_attribute_executor.h
@@ -5,7 +5,8 @@
 #include <vespa/searchcommon/attribute/iattributevector.h>
 #include <vespa/eval/eval/value.h>
 #include <vespa/vespalib/stllike/string.h>
-#include <vespa/eval/tensor/default_tensor.h>
+#include <vespa/eval/tensor/tensor.h>
+#include <vespa/eval/tensor/sparse/sparse_tensor_builder.h>
 
 namespace search::features {
 
@@ -40,8 +41,8 @@ void
 TensorFromAttributeExecutor<WeightedBufferType>::execute(uint32_t docId)
 {
     _attrBuffer.fill(*_attribute, docId);
-    vespalib::tensor::DefaultTensor::builder builder;
-    vespalib::tensor::TensorBuilder::Dimension dimensionEnum = builder.define_dimension(_dimension);
+    vespalib::tensor::SparseTensorBuilder builder;
+    vespalib::tensor::SparseTensorBuilder::Dimension dimensionEnum = builder.define_dimension(_dimension);
     for (size_t i = 0; i < _attrBuffer.size(); ++i) {
         builder.add_label(dimensionEnum, vespalib::string(_attrBuffer[i].value()));
         builder.add_cell(_attrBuffer[i].weight());
diff --git a/searchlib/src/vespa/searchlib/features/tensor_from_labels_feature.cpp b/searchlib/src/vespa/searchlib/features/tensor_from_labels_feature.cpp
index 7287a9f98dc..e5b27acf610 100644
--- a/searchlib/src/vespa/searchlib/features/tensor_from_labels_feature.cpp
+++ b/searchlib/src/vespa/searchlib/features/tensor_from_labels_feature.cpp
@@ -8,7 +8,6 @@
 #include <vespa/searchlib/fef/feature_type.h>
 #include <vespa/searchcommon/attribute/attributecontent.h>
 #include <vespa/searchcommon/attribute/iattributevector.h>
-#include <vespa/eval/tensor/default_tensor.h>
 #include <vespa/eval/eval/value_type.h>
 
 #include <vespa/log/log.h>
@@ -18,8 +17,7 @@ using namespace search::fef;
 using search::attribute::IAttributeVector;
 using search::attribute::WeightedConstCharContent;
 using search::attribute::WeightedStringContent;
-using vespalib::tensor::DefaultTensor;
-using vespalib::tensor::TensorBuilder;
+using vespalib::tensor::SparseTensorBuilder;
 using vespalib::eval::ValueType;
 using search::fef::FeatureType;
 
@@ -91,8 +89,8 @@ createQueryExecutor(const search::fef::IQueryEnvironment &env,
     if (prop.found() && !prop.get().empty()) {
         std::vector<vespalib::string> vector;
         ArrayParser::parse(prop.get(), vector);
-        DefaultTensor::builder tensorBuilder;
-        TensorBuilder::Dimension dimensionEnum = tensorBuilder.define_dimension(dimension);
+        SparseTensorBuilder tensorBuilder;
+        SparseTensorBuilder::Dimension dimensionEnum = tensorBuilder.define_dimension(dimension);
         for (const auto &elem : vector) {
             tensorBuilder.add_label(dimensionEnum, elem);
             tensorBuilder.add_cell(1.0);
diff --git a/searchlib/src/vespa/searchlib/features/tensor_from_weighted_set_feature.cpp b/searchlib/src/vespa/searchlib/features/tensor_from_weighted_set_feature.cpp
index 3b0bde8f76f..a61da2cf751 100644
--- a/searchlib/src/vespa/searchlib/features/tensor_from_weighted_set_feature.cpp
+++ b/searchlib/src/vespa/searchlib/features/tensor_from_weighted_set_feature.cpp
@@ -13,7 +13,6 @@
 #include <vespa/searchcommon/attribute/iattributevector.h>
 #include <vespa/eval/eval/function.h>
 #include <vespa/eval/tensor/tensor.h>
-#include <vespa/eval/tensor/default_tensor.h>
 #include <vespa/eval/eval/value_type.h>
 
 #include <vespa/log/log.h>
@@ -23,8 +22,7 @@ using namespace search::fef;
 using search::attribute::IAttributeVector;
 using search::attribute::WeightedConstCharContent;
 using search::attribute::WeightedStringContent;
-using vespalib::tensor::DefaultTensor;
-using vespalib::tensor::TensorBuilder;
+using vespalib::tensor::SparseTensorBuilder;
 using vespalib::eval::ValueType;
 using search::fef::FeatureType;
 
@@ -106,8 +104,8 @@ createQueryExecutor(const search::fef::IQueryEnvironment &env,
     if (prop.found() && !prop.get().empty()) {
         WeightedStringVector vector;
         WeightedSetParser::parse(prop.get(), vector);
-        DefaultTensor::builder tensorBuilder;
-        TensorBuilder::Dimension dimensionEnum = tensorBuilder.define_dimension(dimension);
+        SparseTensorBuilder tensorBuilder;
+        SparseTensorBuilder::Dimension dimensionEnum = tensorBuilder.define_dimension(dimension);
         for (const auto &elem : vector._data) {
             tensorBuilder.add_label(dimensionEnum, elem.value());
             tensorBuilder.add_cell(elem.weight());