track CellType move

10 files changed, 22 insertions, 21 deletions

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;
 };