diff options
Diffstat (limited to 'eval')
-rw-r--r-- | eval/src/vespa/eval/tensor/dense/dense_tensor.h | 12 | ||||
-rw-r--r-- | eval/src/vespa/eval/tensor/dense/dense_tensor_reduce.hpp | 8 |
2 files changed, 8 insertions, 12 deletions
diff --git a/eval/src/vespa/eval/tensor/dense/dense_tensor.h b/eval/src/vespa/eval/tensor/dense/dense_tensor.h index 7f7d92a42ed..3795831c914 100644 --- a/eval/src/vespa/eval/tensor/dense/dense_tensor.h +++ b/eval/src/vespa/eval/tensor/dense/dense_tensor.h @@ -13,20 +13,16 @@ namespace vespalib::tensor { class DenseTensor : public DenseTensorView { public: - typedef std::unique_ptr<DenseTensor> UP; - using Cells = std::vector<double>; - -private: - eval::ValueType _type; - Cells _cells; - -public: DenseTensor(); ~DenseTensor() override; DenseTensor(const eval::ValueType &type_in, const Cells &cells_in); DenseTensor(const eval::ValueType &type_in, Cells &&cells_in); DenseTensor(eval::ValueType &&type_in, Cells &&cells_in); bool operator==(const DenseTensor &rhs) const; +private: + eval::ValueType _type; + Cells _cells; + }; } diff --git a/eval/src/vespa/eval/tensor/dense/dense_tensor_reduce.hpp b/eval/src/vespa/eval/tensor/dense/dense_tensor_reduce.hpp index 8480e7418e1..98db89dd2a7 100644 --- a/eval/src/vespa/eval/tensor/dense/dense_tensor_reduce.hpp +++ b/eval/src/vespa/eval/tensor/dense/dense_tensor_reduce.hpp @@ -25,7 +25,7 @@ public: ~DimensionReducer(); template <typename Function> - DenseTensor::UP + std::unique_ptr<DenseTensorView> reduceCells(CellsRef cellsIn, Function &&func) { auto itr_in = cellsIn.cbegin(); auto itr_out = _cellsResult.begin(); @@ -54,7 +54,7 @@ public: namespace { template <typename Function> -DenseTensor::UP +std::unique_ptr<DenseTensorView> reduce(const DenseTensorView &tensor, const vespalib::string &dimensionToRemove, Function &&func) { DimensionReducer reducer(tensor.fast_type(), dimensionToRemove); @@ -70,9 +70,9 @@ reduce(const DenseTensorView &tensor, const std::vector<vespalib::string> &dimen if (dimensions.size() == 1) { return reduce(tensor, dimensions[0], func); } else if (dimensions.size() > 0) { - DenseTensor::UP result = reduce(tensor, dimensions[0], func); + std::unique_ptr<DenseTensorView> result = reduce(tensor, dimensions[0], func); for (size_t i = 1; i < dimensions.size(); ++i) { - DenseTensor::UP tmpResult = reduce(DenseTensorView(*result), dimensions[i], func); + std::unique_ptr<DenseTensorView> tmpResult = reduce(*result, dimensions[i], func); result = std::move(tmpResult); } return result; |