diff options
author | Arne Juul <arnej@yahooinc.com> | 2023-04-25 13:11:39 +0000 |
---|---|---|
committer | Arne Juul <arnej@yahooinc.com> | 2023-04-25 15:56:19 +0000 |
commit | 7d3241ca8b5bd2a4edb0f35d11883dd6d497faa2 (patch) | |
tree | 4b2d379c85893895b7f9b92b9451159f212d9155 | |
parent | 6201b1979bbc7fd0c156bf77af855b09237a7045 (diff) |
remove unused method from API
6 files changed, 6 insertions, 18 deletions
diff --git a/searchlib/src/vespa/searchlib/tensor/angular_distance.cpp b/searchlib/src/vespa/searchlib/tensor/angular_distance.cpp index efc1170baf5..a7ae02bb9f4 100644 --- a/searchlib/src/vespa/searchlib/tensor/angular_distance.cpp +++ b/searchlib/src/vespa/searchlib/tensor/angular_distance.cpp @@ -61,8 +61,7 @@ private: double _lhs_norm_sq; public: BoundAngularDistance(const vespalib::eval::TypedCells& lhs) - : BoundDistanceFunction(vespalib::eval::get_cell_type<FloatType>()), - _computer(vespalib::hwaccelrated::IAccelrated::getAccelerator()), + : _computer(vespalib::hwaccelrated::IAccelrated::getAccelerator()), _tmpSpace(lhs.size), _lhs(_tmpSpace.storeLhs(lhs)) { diff --git a/searchlib/src/vespa/searchlib/tensor/bound_distance_function.h b/searchlib/src/vespa/searchlib/tensor/bound_distance_function.h index 5d602a52227..c072d6de8e5 100644 --- a/searchlib/src/vespa/searchlib/tensor/bound_distance_function.h +++ b/searchlib/src/vespa/searchlib/tensor/bound_distance_function.h @@ -20,20 +20,13 @@ namespace search::tensor { * mutable temporary storage. */ class BoundDistanceFunction : public DistanceConverter { -private: - vespalib::eval::CellType _expect_cell_type; public: using UP = std::unique_ptr<BoundDistanceFunction>; - BoundDistanceFunction(vespalib::eval::CellType expected) : _expect_cell_type(expected) {} + BoundDistanceFunction() = default; virtual ~BoundDistanceFunction() = default; - // input vectors will be converted to this cell type: - vespalib::eval::CellType expected_cell_type() const { - return _expect_cell_type; - } - // calculate internal distance (comparable) virtual double calc(const vespalib::eval::TypedCells& rhs) const = 0; diff --git a/searchlib/src/vespa/searchlib/tensor/distance_function_factory.cpp b/searchlib/src/vespa/searchlib/tensor/distance_function_factory.cpp index 5473d7db6f5..30bca0d4212 100644 --- a/searchlib/src/vespa/searchlib/tensor/distance_function_factory.cpp +++ b/searchlib/src/vespa/searchlib/tensor/distance_function_factory.cpp @@ -55,8 +55,7 @@ class SimpleBoundDistanceFunction : public BoundDistanceFunction { public: SimpleBoundDistanceFunction(const vespalib::eval::TypedCells& lhs, const DistanceFunction &df) - : BoundDistanceFunction(lhs.type), - _lhs(lhs), + : _lhs(lhs), _df(df) {} diff --git a/searchlib/src/vespa/searchlib/tensor/euclidean_distance.cpp b/searchlib/src/vespa/searchlib/tensor/euclidean_distance.cpp index 9c37b191637..7995c87d055 100644 --- a/searchlib/src/vespa/searchlib/tensor/euclidean_distance.cpp +++ b/searchlib/src/vespa/searchlib/tensor/euclidean_distance.cpp @@ -62,8 +62,7 @@ private: static const int8_t *cast(const Int8Float * p) { return reinterpret_cast<const int8_t *>(p); } public: BoundEuclideanDistance(const vespalib::eval::TypedCells& lhs) - : BoundDistanceFunction(vespalib::eval::get_cell_type<FloatType>()), - _computer(vespalib::hwaccelrated::IAccelrated::getAccelerator()), + : _computer(vespalib::hwaccelrated::IAccelrated::getAccelerator()), _tmpSpace(lhs.size), _lhs_vector(_tmpSpace.storeLhs(lhs)) {} diff --git a/searchlib/src/vespa/searchlib/tensor/geo_degrees_distance.cpp b/searchlib/src/vespa/searchlib/tensor/geo_degrees_distance.cpp index 973d50ef98d..38ba8205c90 100644 --- a/searchlib/src/vespa/searchlib/tensor/geo_degrees_distance.cpp +++ b/searchlib/src/vespa/searchlib/tensor/geo_degrees_distance.cpp @@ -57,8 +57,7 @@ private: static GeoDegreesDistance _g_d_helper; public: BoundGeoDistance(const vespalib::eval::TypedCells& lhs) - : BoundDistanceFunction(vespalib::eval::CellType::DOUBLE), - _tmpSpace(lhs.size), + : _tmpSpace(lhs.size), _lh_vector(_tmpSpace.storeLhs(lhs)) {} double calc(const vespalib::eval::TypedCells& rhs) const override { diff --git a/searchlib/src/vespa/searchlib/tensor/prenormalized_angular_distance.cpp b/searchlib/src/vespa/searchlib/tensor/prenormalized_angular_distance.cpp index d2693f9f443..292edc1259d 100644 --- a/searchlib/src/vespa/searchlib/tensor/prenormalized_angular_distance.cpp +++ b/searchlib/src/vespa/searchlib/tensor/prenormalized_angular_distance.cpp @@ -17,8 +17,7 @@ private: double _lhs_norm_sq; public: BoundPrenormalizedAngularDistance(const vespalib::eval::TypedCells& lhs) - : BoundDistanceFunction(vespalib::eval::get_cell_type<FloatType>()), - _computer(vespalib::hwaccelrated::IAccelrated::getAccelerator()), + : _computer(vespalib::hwaccelrated::IAccelrated::getAccelerator()), _tmpSpace(lhs.size), _lhs(_tmpSpace.storeLhs(lhs)) { |