track CellType move

32 files changed, 55 insertions, 62 deletions

diff --git a/eval/src/tests/eval/value_type/value_type_test.cpp b/eval/src/tests/eval/value_type/value_type_test.cpp
index 77801f44bb8..d58adbbcef0 100644
--- a/eval/src/tests/eval/value_type/value_type_test.cpp
+++ b/eval/src/tests/eval/value_type/value_type_test.cpp
@@ -8,8 +8,6 @@
 
 using namespace vespalib::eval;
 
-using CellType = ValueType::CellType;
-
 const size_t npos = ValueType::Dimension::npos;
 
 ValueType type(const vespalib::string &type_str) {
diff --git a/eval/src/tests/tensor/direct_sparse_tensor_builder/direct_sparse_tensor_builder_test.cpp b/eval/src/tests/tensor/direct_sparse_tensor_builder/direct_sparse_tensor_builder_test.cpp
index d9d4c221164..bcee6471f76 100644
--- a/eval/src/tests/tensor/direct_sparse_tensor_builder/direct_sparse_tensor_builder_test.cpp
+++ b/eval/src/tests/tensor/direct_sparse_tensor_builder/direct_sparse_tensor_builder_test.cpp
@@ -8,6 +8,7 @@
 using namespace vespalib::tensor;
 using namespace vespalib::tensor::sparse;
 using vespalib::eval::TensorSpec;
+using vespalib::eval::CellType;
 using vespalib::eval::ValueType;
 
 void
@@ -36,7 +37,7 @@ assertCellValue(double expValue, const TensorAddress &address,
     bool found = tensor.index().lookup_address(addressRef, idx);
     EXPECT_TRUE(found);
     auto cells = tensor.cells();
-    if (EXPECT_TRUE(cells.type == ValueType::CellType::DOUBLE)) {
+    if (EXPECT_TRUE(cells.type == CellType::DOUBLE)) {
         auto arr = cells.typify<double>();
         EXPECT_EQUAL(expValue, arr[idx]);
     }
diff --git a/eval/src/tests/tensor/instruction_benchmark/instruction_benchmark.cpp b/eval/src/tests/tensor/instruction_benchmark/instruction_benchmark.cpp
index 816923bb87c..1a796aac88f 100644
--- a/eval/src/tests/tensor/instruction_benchmark/instruction_benchmark.cpp
+++ b/eval/src/tests/tensor/instruction_benchmark/instruction_benchmark.cpp
@@ -95,7 +95,7 @@ template <typename ...Ds> void add_cells(TensorSpec &spec, double &seq, TensorSp
 }
 
 template <typename ...Ds> TensorSpec make_spec(double seq, const Ds &...ds) {
-    TensorSpec spec(ValueType::tensor_type({ds...}, ValueType::CellType::FLOAT).to_spec());
+    TensorSpec spec(ValueType::tensor_type({ds...}, CellType::FLOAT).to_spec());
     add_cells(spec, seq, TensorSpec::Address(), ds...);
     return spec;
 }
diff --git a/eval/src/tests/tensor/onnx_wrapper/onnx_wrapper_test.cpp b/eval/src/tests/tensor/onnx_wrapper/onnx_wrapper_test.cpp
index fce7ccc6411..efab0571e62 100644
--- a/eval/src/tests/tensor/onnx_wrapper/onnx_wrapper_test.cpp
+++ b/eval/src/tests/tensor/onnx_wrapper/onnx_wrapper_test.cpp
@@ -163,7 +163,7 @@ TEST(OnnxTest, simple_onnx_model_can_be_evaluated)
     ctx.bind_param(2, bias);
     ctx.eval();
     auto cells = output.cells();
-    EXPECT_EQ(cells.type, ValueType::CellType::FLOAT);
+    EXPECT_EQ(cells.type, CellType::FLOAT);
     EXPECT_EQ(cells.size, 1);
     EXPECT_EQ(GetCell::from(cells, 0), 79.0);
     //-------------------------------------------------------------------------
@@ -209,7 +209,7 @@ TEST(OnnxTest, dynamic_onnx_model_can_be_evaluated)
     ctx.bind_param(2, bias);
     ctx.eval();
     auto cells = output.cells();
-    EXPECT_EQ(cells.type, ValueType::CellType::FLOAT);
+    EXPECT_EQ(cells.type, CellType::FLOAT);
     EXPECT_EQ(cells.size, 1);
     EXPECT_EQ(GetCell::from(cells, 0), 79.0);
     //-------------------------------------------------------------------------
@@ -255,7 +255,7 @@ TEST(OnnxTest, int_types_onnx_model_can_be_evaluated)
     ctx.bind_param(2, bias);
     ctx.eval();
     auto cells = output.cells();
-    EXPECT_EQ(cells.type, ValueType::CellType::DOUBLE);
+    EXPECT_EQ(cells.type, CellType::DOUBLE);
     EXPECT_EQ(cells.size, 1);
     EXPECT_EQ(GetCell::from(cells, 0), 79.0);
     //-------------------------------------------------------------------------
diff --git a/eval/src/vespa/eval/eval/simple_tensor.cpp b/eval/src/vespa/eval/eval/simple_tensor.cpp
index 64b2b6f8865..98e3bc325cb 100644
--- a/eval/src/vespa/eval/eval/simple_tensor.cpp
+++ b/eval/src/vespa/eval/eval/simple_tensor.cpp
@@ -18,7 +18,6 @@ using Cells = SimpleTensor::Cells;
 using IndexList = std::vector<size_t>;
 using Label = SimpleTensor::Label;
 using CellRef = std::reference_wrapper<const Cell>;
-using CellType = ValueType::CellType;
 
 namespace {
 
diff --git a/eval/src/vespa/eval/eval/test/tensor_model.hpp b/eval/src/vespa/eval/eval/test/tensor_model.hpp
index 59653954c9e..78d6798ac4c 100644
--- a/eval/src/vespa/eval/eval/test/tensor_model.hpp
+++ b/eval/src/vespa/eval/eval/test/tensor_model.hpp
@@ -16,7 +16,6 @@ namespace vespalib {
 namespace eval {
 namespace test {
 
-using CellType = ValueType::CellType;
 using map_fun_t = vespalib::eval::operation::op1_t;
 using join_fun_t = vespalib::eval::operation::op2_t;
 
diff --git a/eval/src/vespa/eval/eval/typed_cells.h b/eval/src/vespa/eval/eval/typed_cells.h
index 09d5c080cf7..a478a419f95 100644
--- a/eval/src/vespa/eval/eval/typed_cells.h
+++ b/eval/src/vespa/eval/eval/typed_cells.h
@@ -11,8 +11,6 @@ namespace vespalib::eval {
 // Low-level typed cells reference
 
 struct TypedCells {
-    using CellType = vespalib::eval::ValueType::CellType;
-
     const void *data;
     CellType type;
     size_t size:56;
diff --git a/eval/src/vespa/eval/eval/value_codec.cpp b/eval/src/vespa/eval/eval/value_codec.cpp
index 2de95657f72..923d3f29cd3 100644
--- a/eval/src/vespa/eval/eval/value_codec.cpp
+++ b/eval/src/vespa/eval/eval/value_codec.cpp
@@ -14,8 +14,6 @@ namespace vespalib::eval {
 
 namespace {
 
-using CellType = ValueType::CellType;
-
 constexpr uint32_t DOUBLE_CELL_TYPE = 0;
 constexpr uint32_t FLOAT_CELL_TYPE = 1;
 
@@ -118,7 +116,7 @@ ValueType decode_type(nbostream &input, const Format &format) {
         }
     }
     if (dim_list.empty()) {
-        assert(cell_type == ValueType::CellType::DOUBLE);
+        assert(cell_type == CellType::DOUBLE);
     }
     return ValueType::tensor_type(std::move(dim_list), cell_type);
 }
diff --git a/eval/src/vespa/eval/eval/value_type.cpp b/eval/src/vespa/eval/eval/value_type.cpp
index c7d77c766bc..05ec65bf292 100644
--- a/eval/src/vespa/eval/eval/value_type.cpp
+++ b/eval/src/vespa/eval/eval/value_type.cpp
@@ -8,7 +8,6 @@ namespace vespalib::eval {
 
 namespace {
 
-using CellType = ValueType::CellType;
 using Dimension = ValueType::Dimension;
 using DimensionList = std::vector<Dimension>;
 
diff --git a/eval/src/vespa/eval/eval/value_type_spec.cpp b/eval/src/vespa/eval/eval/value_type_spec.cpp
index 847203db3b1..a4575e33c2f 100644
--- a/eval/src/vespa/eval/eval/value_type_spec.cpp
+++ b/eval/src/vespa/eval/eval/value_type_spec.cpp
@@ -8,8 +8,6 @@
 
 namespace vespalib::eval::value_type {
 
-using CellType = ValueType::CellType;
-
 namespace {
 
 const char *to_name(CellType cell_type) {
@@ -188,7 +186,7 @@ parse_spec(const char *pos_in, const char *end_in, const char *&pos_out,
     } else if (type_name == "float") {
         return ValueType::make_type(CellType::FLOAT, {});
     } else if (type_name == "tensor") {
-        ValueType::CellType cell_type = parse_cell_type(ctx);
+        CellType cell_type = parse_cell_type(ctx);
         std::vector<ValueType::Dimension> list = parse_dimension_list(ctx);
         if (!ctx.failed()) {
             if (unsorted != nullptr) {
diff --git a/eval/src/vespa/eval/instruction/dense_dot_product_function.cpp b/eval/src/vespa/eval/instruction/dense_dot_product_function.cpp
index cc746c4db83..5dcfcba025d 100644
--- a/eval/src/vespa/eval/instruction/dense_dot_product_function.cpp
+++ b/eval/src/vespa/eval/instruction/dense_dot_product_function.cpp
@@ -45,12 +45,12 @@ struct MyDotProductOp {
     static auto invoke() { return my_dot_product_op<LCT,RCT>; }
 };
 
-InterpretedFunction::op_function my_select(ValueType::CellType lct, ValueType::CellType rct) {
+InterpretedFunction::op_function my_select(CellType lct, CellType rct) {
     if (lct == rct) {
-        if (lct == ValueType::CellType::DOUBLE) {
+        if (lct == CellType::DOUBLE) {
             return my_cblas_double_dot_product_op;
         }
-        if (lct == ValueType::CellType::FLOAT) {
+        if (lct == CellType::FLOAT) {
             return my_cblas_float_dot_product_op;
         }
     }
diff --git a/eval/src/vespa/eval/instruction/dense_multi_matmul_function.cpp b/eval/src/vespa/eval/instruction/dense_multi_matmul_function.cpp
index cbca2ff14f2..42e7deb9523 100644
--- a/eval/src/vespa/eval/instruction/dense_multi_matmul_function.cpp
+++ b/eval/src/vespa/eval/instruction/dense_multi_matmul_function.cpp
@@ -60,11 +60,11 @@ void my_cblas_float_multi_matmul_op(InterpretedFunction::State &state, uint64_t
     state.pop_pop_push(state.stash.create<tensor::DenseTensorView>(self.result_type(), TypedCells(dst_cells)));
 }
 
-InterpretedFunction::op_function my_select(ValueType::CellType cell_type) {
-    if (cell_type == ValueType::CellType::DOUBLE) {
+InterpretedFunction::op_function my_select(CellType cell_type) {
+    if (cell_type == CellType::DOUBLE) {
         return my_cblas_double_multi_matmul_op;
     }
-    if (cell_type == ValueType::CellType::FLOAT) {
+    if (cell_type == CellType::FLOAT) {
         return my_cblas_float_multi_matmul_op;
     }
     abort();
@@ -117,7 +117,7 @@ struct DimPrefix {
 bool check_input_type(const ValueType &type, const DimList &relevant) {
     return (type.is_dense() &&
             (relevant.size() >= 2) &&
-            ((type.cell_type() == ValueType::CellType::FLOAT) || (type.cell_type() == ValueType::CellType::DOUBLE)));
+            ((type.cell_type() == CellType::FLOAT) || (type.cell_type() == CellType::DOUBLE)));
 }
 
 bool is_multi_matmul(const ValueType &a, const ValueType &b, const vespalib::string &reduce_dim) {
diff --git a/eval/src/vespa/eval/tensor/default_tensor_engine.cpp b/eval/src/vespa/eval/tensor/default_tensor_engine.cpp
index 04aad776e43..69177e690e4 100644
--- a/eval/src/vespa/eval/tensor/default_tensor_engine.cpp
+++ b/eval/src/vespa/eval/tensor/default_tensor_engine.cpp
@@ -46,7 +46,6 @@ using eval::TensorFunction;
 using eval::TensorSpec;
 using eval::Value;
 using eval::ValueType;
-using CellType = eval::ValueType::CellType;
 using vespalib::IllegalArgumentException;
 using vespalib::make_string;
 
diff --git a/eval/src/vespa/eval/tensor/dense/dense_number_join_function.cpp b/eval/src/vespa/eval/tensor/dense/dense_number_join_function.cpp
index d6995256411..4869270532f 100644
--- a/eval/src/vespa/eval/tensor/dense/dense_number_join_function.cpp
+++ b/eval/src/vespa/eval/tensor/dense/dense_number_join_function.cpp
@@ -11,6 +11,7 @@ namespace vespalib::tensor {
 
 using vespalib::ArrayRef;
 
+using eval::CellType;
 using eval::Value;
 using eval::ValueType;
 using eval::TensorFunction;
@@ -66,7 +67,7 @@ using MyTypify = TypifyValue<TypifyCellType,TypifyOp2,TypifyBool>;
 
 bool is_dense(const TensorFunction &tf) { return tf.result_type().is_dense(); }
 bool is_double(const TensorFunction &tf) { return tf.result_type().is_double(); }
-ValueType::CellType cell_type(const TensorFunction &tf) { return tf.result_type().cell_type(); }
+CellType cell_type(const TensorFunction &tf) { return tf.result_type().cell_type(); }
 
 } // namespace vespalib::tensor::<unnamed>
 
diff --git a/eval/src/vespa/eval/tensor/dense/dense_simple_join_function.cpp b/eval/src/vespa/eval/tensor/dense/dense_simple_join_function.cpp
index 5aca3799258..add26e4e52f 100644
--- a/eval/src/vespa/eval/tensor/dense/dense_simple_join_function.cpp
+++ b/eval/src/vespa/eval/tensor/dense/dense_simple_join_function.cpp
@@ -14,6 +14,7 @@ namespace vespalib::tensor {
 
 using vespalib::ArrayRef;
 
+using eval::CellType;
 using eval::Value;
 using eval::ValueType;
 using eval::TensorFunction;
@@ -106,11 +107,11 @@ using MyTypify = TypifyValue<TypifyCellType,TypifyOp2,TypifyBool,TypifyOverlap>;
 
 //-----------------------------------------------------------------------------
 
-bool can_use_as_output(const TensorFunction &fun, ValueType::CellType result_cell_type) {
+bool can_use_as_output(const TensorFunction &fun, CellType result_cell_type) {
     return (fun.result_is_mutable() && (fun.result_type().cell_type() == result_cell_type));
 }
 
-Primary select_primary(const TensorFunction &lhs, const TensorFunction &rhs, ValueType::CellType result_cell_type) {
+Primary select_primary(const TensorFunction &lhs, const TensorFunction &rhs, CellType result_cell_type) {
     size_t lhs_size = lhs.result_type().dense_subspace_size();
     size_t rhs_size = rhs.result_type().dense_subspace_size();
     if (lhs_size > rhs_size) {
diff --git a/eval/src/vespa/eval/tensor/dense/onnx_wrapper.cpp b/eval/src/vespa/eval/tensor/dense/onnx_wrapper.cpp
index 5db533a4655..c49809f265f 100644
--- a/eval/src/vespa/eval/tensor/dense/onnx_wrapper.cpp
+++ b/eval/src/vespa/eval/tensor/dense/onnx_wrapper.cpp
@@ -19,6 +19,7 @@ LOG_SETUP(".eval.onnx_wrapper");
 
 using vespalib::ArrayRef;
 using vespalib::ConstArrayRef;
+using vespalib::eval::CellType;
 using vespalib::eval::ValueType;
 using vespalib::eval::TypifyCellType;
 
@@ -110,18 +111,18 @@ auto convert_optimize(Onnx::Optimize optimize) {
     abort();
 }
 
-ValueType::CellType to_cell_type(Onnx::ElementType type) {
+CellType to_cell_type(Onnx::ElementType type) {
     switch (type) {
     case Onnx::ElementType::INT8:   [[fallthrough]];
     case Onnx::ElementType::INT16:  [[fallthrough]];
     case Onnx::ElementType::UINT8:  [[fallthrough]];
     case Onnx::ElementType::UINT16: [[fallthrough]];
-    case Onnx::ElementType::FLOAT:  return ValueType::CellType::FLOAT;
+    case Onnx::ElementType::FLOAT:  return CellType::FLOAT;
     case Onnx::ElementType::INT32:  [[fallthrough]];
     case Onnx::ElementType::INT64:  [[fallthrough]];
     case Onnx::ElementType::UINT32: [[fallthrough]];
     case Onnx::ElementType::UINT64: [[fallthrough]];
-    case Onnx::ElementType::DOUBLE: return ValueType::CellType::DOUBLE;
+    case Onnx::ElementType::DOUBLE: return CellType::DOUBLE;
     }
     abort();
 }
@@ -381,21 +382,21 @@ Onnx::EvalContext::convert_result(EvalContext &self, size_t idx)
 
 struct Onnx::EvalContext::SelectAdaptParam {
     template <typename ...Ts> static auto invoke() { return adapt_param<Ts...>; }
-    auto operator()(eval::ValueType::CellType ct) {
+    auto operator()(eval::CellType ct) {
         return typify_invoke<1,MyTypify,SelectAdaptParam>(ct);
     }
 };
 
 struct Onnx::EvalContext::SelectConvertParam {
     template <typename ...Ts> static auto invoke() { return convert_param<Ts...>; }
-    auto operator()(eval::ValueType::CellType ct, Onnx::ElementType et) {
+    auto operator()(eval::CellType ct, Onnx::ElementType et) {
         return typify_invoke<2,MyTypify,SelectConvertParam>(ct, et);
     }
 };
 
 struct Onnx::EvalContext::SelectConvertResult {
     template <typename ...Ts> static auto invoke() { return convert_result<Ts...>; }
-    auto operator()(Onnx::ElementType et, eval::ValueType::CellType ct) {
+    auto operator()(Onnx::ElementType et, eval::CellType ct) {
         return typify_invoke<2,MyTypify,SelectConvertResult>(et, ct);
     }
 };
diff --git a/eval/src/vespa/eval/tensor/dense/typed_cells_dispatch.h b/eval/src/vespa/eval/tensor/dense/typed_cells_dispatch.h
index 87b1a5b47ed..84ce8749eb4 100644
--- a/eval/src/vespa/eval/tensor/dense/typed_cells_dispatch.h
+++ b/eval/src/vespa/eval/tensor/dense/typed_cells_dispatch.h
@@ -6,7 +6,7 @@
 
 namespace vespalib::tensor {
 
-using CellType = vespalib::eval::ValueType::CellType;
+using vespalib::eval::CellType;
 using TypedCells = vespalib::eval::TypedCells;
 
 template <typename TGT, typename... Args>
diff --git a/eval/src/vespa/eval/tensor/serialization/dense_binary_format.cpp b/eval/src/vespa/eval/tensor/serialization/dense_binary_format.cpp
index 13c4711668b..837b135c0aa 100644
--- a/eval/src/vespa/eval/tensor/serialization/dense_binary_format.cpp
+++ b/eval/src/vespa/eval/tensor/serialization/dense_binary_format.cpp
@@ -8,7 +8,7 @@
 
 using vespalib::nbostream;
 using vespalib::eval::ValueType;
-using CellType = vespalib::eval::ValueType::CellType;
+using vespalib::eval::CellType;
 
 namespace vespalib::tensor {
 
diff --git a/eval/src/vespa/eval/tensor/serialization/dense_binary_format.h b/eval/src/vespa/eval/tensor/serialization/dense_binary_format.h
index 21618dcb6ce..f0516e9fcc9 100644
--- a/eval/src/vespa/eval/tensor/serialization/dense_binary_format.h
+++ b/eval/src/vespa/eval/tensor/serialization/dense_binary_format.h
@@ -18,7 +18,7 @@ class DenseTensorView;
 class DenseBinaryFormat
 {
 public:
-    using CellType = eval::ValueType::CellType;
+    using CellType = vespalib::eval::CellType;
 
     static void serialize(nbostream &stream, const DenseTensorView &tensor);
     static std::unique_ptr<DenseTensorView> deserialize(nbostream &stream, CellType cell_type);
diff --git a/eval/src/vespa/eval/tensor/serialization/sparse_binary_format.cpp b/eval/src/vespa/eval/tensor/serialization/sparse_binary_format.cpp
index eda8f7eecc7..a4022c4f60a 100644
--- a/eval/src/vespa/eval/tensor/serialization/sparse_binary_format.cpp
+++ b/eval/src/vespa/eval/tensor/serialization/sparse_binary_format.cpp
@@ -12,8 +12,8 @@
 #include <cassert>
 
 using vespalib::nbostream;
+using vespalib::eval::CellType;
 using vespalib::eval::ValueType;
-using CellType = vespalib::eval::ValueType::CellType;
 
 namespace vespalib::tensor {
 
diff --git a/eval/src/vespa/eval/tensor/serialization/sparse_binary_format.h b/eval/src/vespa/eval/tensor/serialization/sparse_binary_format.h
index 0611d7d5a23..d4c7fa4bf6f 100644
--- a/eval/src/vespa/eval/tensor/serialization/sparse_binary_format.h
+++ b/eval/src/vespa/eval/tensor/serialization/sparse_binary_format.h
@@ -17,7 +17,7 @@ class Tensor;
 class SparseBinaryFormat
 {
 public:
-    using CellType = eval::ValueType::CellType;
+    using CellType = eval::CellType;
 
     static void serialize(nbostream &stream, const Tensor &tensor);
     static std::unique_ptr<Tensor> deserialize(nbostream &stream, CellType cell_type);
diff --git a/eval/src/vespa/eval/tensor/serialization/typed_binary_format.cpp b/eval/src/vespa/eval/tensor/serialization/typed_binary_format.cpp
index 758ceb43ab4..2d3d1f4a0ea 100644
--- a/eval/src/vespa/eval/tensor/serialization/typed_binary_format.cpp
+++ b/eval/src/vespa/eval/tensor/serialization/typed_binary_format.cpp
@@ -19,7 +19,7 @@ LOG_SETUP(".eval.tensor.serialization.typed_binary_format");
 
 using vespalib::nbostream;
 using vespalib::eval::ValueType;
-using CellType = vespalib::eval::ValueType::CellType;
+using vespalib::eval::CellType;
 
 namespace vespalib::tensor {
 
diff --git a/searchlib/src/tests/attribute/tensorattribute/tensorattribute_test.cpp b/searchlib/src/tests/attribute/tensorattribute/tensorattribute_test.cpp
index da77e29dbb0..daa85c91b2c 100644
--- a/searchlib/src/tests/attribute/tensorattribute/tensorattribute_test.cpp
+++ b/searchlib/src/tests/attribute/tensorattribute/tensorattribute_test.cpp
@@ -49,6 +49,7 @@ using search::tensor::NearestNeighborIndexSaver;
 using search::tensor::PrepareResult;
 using search::tensor::TensorAttribute;
 using vespalib::eval::TensorSpec;
+using vespalib::eval::CellType;
 using vespalib::eval::ValueType;
 using vespalib::eval::Value;
 using vespalib::eval::EngineOrFactory;
@@ -228,11 +229,11 @@ class MockNearestNeighborIndexFactory : public NearestNeighborIndexFactory {
 
     std::unique_ptr<NearestNeighborIndex> make(const DocVectorAccess& vectors,
                                                size_t vector_size,
-                                               ValueType::CellType cell_type,
+                                               CellType cell_type,
                                                const search::attribute::HnswIndexParams& params) const override {
         (void) vector_size;
         (void) params;
-        assert(cell_type == ValueType::CellType::DOUBLE);
+        assert(cell_type == CellType::DOUBLE);
         return std::make_unique<MockNearestNeighborIndex>(vectors);
     }
 };
diff --git a/searchlib/src/tests/queryeval/nearest_neighbor/nearest_neighbor_test.cpp b/searchlib/src/tests/queryeval/nearest_neighbor/nearest_neighbor_test.cpp
index f6ca0bd1427..23cb3831b6d 100644
--- a/searchlib/src/tests/queryeval/nearest_neighbor/nearest_neighbor_test.cpp
+++ b/searchlib/src/tests/queryeval/nearest_neighbor/nearest_neighbor_test.cpp
@@ -25,7 +25,7 @@ using search::AttributeVector;
 using search::BitVector;
 using vespalib::eval::Value;
 using vespalib::eval::ValueType;
-using CellType = vespalib::eval::ValueType::CellType;
+using vespalib::eval::CellType;
 using vespalib::eval::TensorSpec;
 using vespalib::eval::EngineOrFactory;
 using search::tensor::DistanceFunction;
diff --git a/searchlib/src/tests/tensor/distance_functions/distance_functions_test.cpp b/searchlib/src/tests/tensor/distance_functions/distance_functions_test.cpp
index a9e24e056f2..06fb95089fd 100644
--- a/searchlib/src/tests/tensor/distance_functions/distance_functions_test.cpp
+++ b/searchlib/src/tests/tensor/distance_functions/distance_functions_test.cpp
@@ -33,7 +33,7 @@ void verify_geo_miles(const DistanceFunction *dist_fun,
 
 TEST(DistanceFunctionsTest, euclidean_gives_expected_score)
 {
-    auto ct = vespalib::eval::ValueType::CellType::DOUBLE;
+    auto ct = vespalib::eval::CellType::DOUBLE;
 
     auto euclid = make_distance_function(DistanceMetric::Euclidean, ct);
 
@@ -54,7 +54,7 @@ TEST(DistanceFunctionsTest, euclidean_gives_expected_score)
 
 TEST(DistanceFunctionsTest, angular_gives_expected_score)
 {
-    auto ct = vespalib::eval::ValueType::CellType::DOUBLE;
+    auto ct = vespalib::eval::CellType::DOUBLE;
 
     auto angular = make_distance_function(DistanceMetric::Angular, ct);
 
@@ -109,7 +109,7 @@ TEST(DistanceFunctionsTest, angular_gives_expected_score)
 
 TEST(DistanceFunctionsTest, innerproduct_gives_expected_score)
 {
-    auto ct = vespalib::eval::ValueType::CellType::DOUBLE;
+    auto ct = vespalib::eval::CellType::DOUBLE;
 
     auto innerproduct = make_distance_function(DistanceMetric::InnerProduct, ct);
 
@@ -144,7 +144,7 @@ TEST(DistanceFunctionsTest, innerproduct_gives_expected_score)
 
 TEST(DistanceFunctionsTest, hamming_gives_expected_score)
 {
-    auto ct = vespalib::eval::ValueType::CellType::DOUBLE;
+    auto ct = vespalib::eval::CellType::DOUBLE;
 
     auto hamming = make_distance_function(DistanceMetric::Hamming, ct);
 
@@ -184,7 +184,7 @@ TEST(DistanceFunctionsTest, hamming_gives_expected_score)
 
 TEST(GeoDegreesTest, gives_expected_score)
 {
-    auto ct = vespalib::eval::ValueType::CellType::DOUBLE;
+    auto ct = vespalib::eval::CellType::DOUBLE;
     auto geodeg = make_distance_function(DistanceMetric::GeoDegrees, ct);
 
     std::vector<double> g1_sfo{37.61, -122.38};
diff --git a/searchlib/src/vespa/searchlib/queryeval/nearest_neighbor_iterator.cpp b/searchlib/src/vespa/searchlib/queryeval/nearest_neighbor_iterator.cpp
index dd685ce5c43..85b7e8f89e8 100644
--- a/searchlib/src/vespa/searchlib/queryeval/nearest_neighbor_iterator.cpp
+++ b/searchlib/src/vespa/searchlib/queryeval/nearest_neighbor_iterator.cpp
@@ -7,8 +7,7 @@ using search::tensor::DenseTensorAttribute;
 using vespalib::ConstArrayRef;
 using vespalib::tensor::MutableDenseTensorView;
 using vespalib::eval::TypedCells;
-
-using CellType = vespalib::eval::ValueType::CellType;
+using vespalib::eval::CellType;
 
 namespace search::queryeval {
 
diff --git a/searchlib/src/vespa/searchlib/tensor/default_nearest_neighbor_index_factory.cpp b/searchlib/src/vespa/searchlib/tensor/default_nearest_neighbor_index_factory.cpp
index 0bb6f339455..aca14a1575e 100644
--- a/searchlib/src/vespa/searchlib/tensor/default_nearest_neighbor_index_factory.cpp
+++ b/searchlib/src/vespa/searchlib/tensor/default_nearest_neighbor_index_factory.cpp
@@ -28,7 +28,7 @@ make_random_level_generator(uint32_t m)
 std::unique_ptr<NearestNeighborIndex>
 DefaultNearestNeighborIndexFactory::make(const DocVectorAccess& vectors,
                                          size_t vector_size,
-                                         vespalib::eval::ValueType::CellType cell_type,
+                                         vespalib::eval::CellType cell_type,
                                          const search::attribute::HnswIndexParams& params) const
 {
     (void) vector_size;
diff --git a/searchlib/src/vespa/searchlib/tensor/default_nearest_neighbor_index_factory.h b/searchlib/src/vespa/searchlib/tensor/default_nearest_neighbor_index_factory.h
index 6a9ded92b60..67a19a5431a 100644
--- a/searchlib/src/vespa/searchlib/tensor/default_nearest_neighbor_index_factory.h
+++ b/searchlib/src/vespa/searchlib/tensor/default_nearest_neighbor_index_factory.h
@@ -13,7 +13,7 @@ class DefaultNearestNeighborIndexFactory : public NearestNeighborIndexFactory {
 public:
     std::unique_ptr<NearestNeighborIndex> make(const DocVectorAccess& vectors,
                                                size_t vector_size,
-                                               vespalib::eval::ValueType::CellType cell_type,
+                                               vespalib::eval::CellType cell_type,
                                                const search::attribute::HnswIndexParams& params) const override;
 };
 
diff --git a/searchlib/src/vespa/searchlib/tensor/dense_tensor_store.cpp b/searchlib/src/vespa/searchlib/tensor/dense_tensor_store.cpp
index 1abc3800d97..ddbb956838b 100644
--- a/searchlib/src/vespa/searchlib/tensor/dense_tensor_store.cpp
+++ b/searchlib/src/vespa/searchlib/tensor/dense_tensor_store.cpp
@@ -9,7 +9,7 @@ using vespalib::datastore::Handle;
 using vespalib::tensor::MutableDenseTensorView;
 using vespalib::eval::Value;
 using vespalib::eval::ValueType;
-using CellType = vespalib::eval::ValueType::CellType;
+using CellType = vespalib::eval::CellType;
 
 namespace search::tensor {
 
diff --git a/searchlib/src/vespa/searchlib/tensor/distance_function_factory.cpp b/searchlib/src/vespa/searchlib/tensor/distance_function_factory.cpp
index a868dfe191b..81b27b56258 100644
--- a/searchlib/src/vespa/searchlib/tensor/distance_function_factory.cpp
+++ b/searchlib/src/vespa/searchlib/tensor/distance_function_factory.cpp
@@ -4,44 +4,45 @@
 #include "distance_functions.h"
 
 using search::attribute::DistanceMetric;
+using vespalib::eval::CellType;
 using vespalib::eval::ValueType;
 
 namespace search::tensor {
 
 DistanceFunction::UP
-make_distance_function(DistanceMetric variant, ValueType::CellType cell_type)
+make_distance_function(DistanceMetric variant, CellType cell_type)
 {
     switch (variant) {
         case DistanceMetric::Euclidean:
-            if (cell_type == ValueType::CellType::FLOAT) {
+            if (cell_type == CellType::FLOAT) {
                 return std::make_unique<SquaredEuclideanDistance<float>>();
             } else {
                 return std::make_unique<SquaredEuclideanDistance<double>>();
             }
             break;
         case DistanceMetric::Angular:
-            if (cell_type == ValueType::CellType::FLOAT) {
+            if (cell_type == CellType::FLOAT) {
                 return std::make_unique<AngularDistance<float>>();
             } else {
                 return std::make_unique<AngularDistance<double>>();
             }
             break;
         case DistanceMetric::GeoDegrees:
-            if (cell_type == ValueType::CellType::FLOAT) {
+            if (cell_type == CellType::FLOAT) {
                 return std::make_unique<GeoDegreesDistance<float>>();
             } else {
                 return std::make_unique<GeoDegreesDistance<double>>();
             }
             break;
         case DistanceMetric::InnerProduct:
-            if (cell_type == ValueType::CellType::FLOAT) {
+            if (cell_type == CellType::FLOAT) {
                 return std::make_unique<InnerProductDistance<float>>();
             } else {
                 return std::make_unique<InnerProductDistance<double>>();
             }
             break;
         case DistanceMetric::Hamming:
-            if (cell_type == ValueType::CellType::FLOAT) {
+            if (cell_type == CellType::FLOAT) {
                 return std::make_unique<HammingDistance<float>>();
             } else {
                 return std::make_unique<HammingDistance<double>>();
diff --git a/searchlib/src/vespa/searchlib/tensor/distance_function_factory.h b/searchlib/src/vespa/searchlib/tensor/distance_function_factory.h
index c86e40279bc..abb1f503694 100644
--- a/searchlib/src/vespa/searchlib/tensor/distance_function_factory.h
+++ b/searchlib/src/vespa/searchlib/tensor/distance_function_factory.h
@@ -14,6 +14,6 @@ namespace search::tensor {
  **/
 DistanceFunction::UP
 make_distance_function(search::attribute::DistanceMetric variant,
-                       vespalib::eval::ValueType::CellType cell_type);
+                       vespalib::eval::CellType cell_type);
 
 }
diff --git a/searchlib/src/vespa/searchlib/tensor/nearest_neighbor_index_factory.h b/searchlib/src/vespa/searchlib/tensor/nearest_neighbor_index_factory.h
index 089119944a7..e5c15266ceb 100644
--- a/searchlib/src/vespa/searchlib/tensor/nearest_neighbor_index_factory.h
+++ b/searchlib/src/vespa/searchlib/tensor/nearest_neighbor_index_factory.h
@@ -20,7 +20,7 @@ public:
     virtual ~NearestNeighborIndexFactory() {}
     virtual std::unique_ptr<NearestNeighborIndex> make(const DocVectorAccess& vectors,
                                                        size_t vector_size,
-                                                       vespalib::eval::ValueType::CellType cell_type,
+                                                       vespalib::eval::CellType cell_type,
                                                        const search::attribute::HnswIndexParams& params) const = 0;
 };