diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2017-12-18 22:08:08 +0100 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2017-12-18 22:08:08 +0100 |
commit | e51fc7a8fef25b2fbbc523dcde3a816a38ced39f (patch) | |
tree | 311ee29d35d2af20f0f92e2780df6dda9b5c81f9 /eval | |
parent | 5a0655fca8daf58380a721d9a22cc85cffd846b1 (diff) |
Unify on nested namespace.
Diffstat (limited to 'eval')
34 files changed, 116 insertions, 200 deletions
diff --git a/eval/src/vespa/eval/tensor/dense/dense_dot_product_function.cpp b/eval/src/vespa/eval/tensor/dense/dense_dot_product_function.cpp index 992f2eae750..fdd0cd6638f 100644 --- a/eval/src/vespa/eval/tensor/dense/dense_dot_product_function.cpp +++ b/eval/src/vespa/eval/tensor/dense/dense_dot_product_function.cpp @@ -6,8 +6,7 @@ #include <vespa/eval/eval/value.h> #include <vespa/eval/tensor/tensor.h> -namespace vespalib { -namespace tensor { +namespace vespalib::tensor { using CellsRef = DenseTensorView::CellsRef; @@ -39,5 +38,5 @@ DenseDotProductFunction::eval(ConstArrayRef<eval::Value::CREF> params, Stash &st return stash.create<eval::DoubleValue>(result); } -} // namespace tensor -} // namespace vespalib +} + diff --git a/eval/src/vespa/eval/tensor/dense/dense_dot_product_function.h b/eval/src/vespa/eval/tensor/dense/dense_dot_product_function.h index 8ad57d69524..288f2afd084 100644 --- a/eval/src/vespa/eval/tensor/dense/dense_dot_product_function.h +++ b/eval/src/vespa/eval/tensor/dense/dense_dot_product_function.h @@ -5,8 +5,7 @@ #include <vespa/eval/eval/tensor_function.h> #include <vespa/vespalib/hwaccelrated/iaccelrated.h> -namespace vespalib { -namespace tensor { +namespace vespalib::tensor { /** * Tensor function for a dot product between two 1-dimensional dense tensors. @@ -27,5 +26,5 @@ public: const eval::Value &eval(ConstArrayRef<eval::Value::CREF> params, Stash &stash) const override; }; -} // namespace tensor -} // namespace vespalib +} + diff --git a/eval/src/vespa/eval/tensor/dense/dense_tensor.cpp b/eval/src/vespa/eval/tensor/dense/dense_tensor.cpp index 5d7e0c83267..9693e89bb75 100644 --- a/eval/src/vespa/eval/tensor/dense/dense_tensor.cpp +++ b/eval/src/vespa/eval/tensor/dense/dense_tensor.cpp @@ -4,12 +4,10 @@ #include <vespa/vespalib/util/stringfmt.h> #include <vespa/vespalib/util/exceptions.h> #include <vespa/eval/eval/operation.h> -#include <sstream> using vespalib::eval::TensorSpec; -namespace vespalib { -namespace tensor { +namespace vespalib::tensor { namespace { @@ -84,5 +82,5 @@ DenseTensor::operator==(const DenseTensor &rhs) const (_cells == rhs._cells); } -} // namespace vespalib::tensor -} // namespace vespalib +} + diff --git a/eval/src/vespa/eval/tensor/dense/dense_tensor.h b/eval/src/vespa/eval/tensor/dense/dense_tensor.h index 1b97438272e..0fa9062d223 100644 --- a/eval/src/vespa/eval/tensor/dense/dense_tensor.h +++ b/eval/src/vespa/eval/tensor/dense/dense_tensor.h @@ -8,8 +8,7 @@ #include "dense_tensor_cells_iterator.h" #include "dense_tensor_view.h" -namespace vespalib { -namespace tensor { +namespace vespalib::tensor { /** * A dense tensor where all dimensions are indexed. @@ -40,5 +39,5 @@ public: }; -} // namespace vespalib::tensor -} // namespace vespalib +} + diff --git a/eval/src/vespa/eval/tensor/dense/dense_tensor_address_combiner.cpp b/eval/src/vespa/eval/tensor/dense/dense_tensor_address_combiner.cpp index 3e9f4f619f0..eee2755fe9a 100644 --- a/eval/src/vespa/eval/tensor/dense/dense_tensor_address_combiner.cpp +++ b/eval/src/vespa/eval/tensor/dense/dense_tensor_address_combiner.cpp @@ -4,8 +4,7 @@ #include <vespa/vespalib/util/exceptions.h> #include <cassert> -namespace vespalib { -namespace tensor { +namespace vespalib::tensor { using Address = DenseTensorAddressCombiner::Address; @@ -83,8 +82,6 @@ DenseTensorAddressCombiner::combine(const CellsIterator &lhsItr, _combinedAddress.emplace_back(lhsLabel); } } - assert(!lhsReader.valid()); - assert(!rhsReader.valid()); return true; } @@ -120,5 +117,4 @@ DenseTensorAddressCombiner::combineDimensions(const eval::ValueType &lhs, eval::ValueType::tensor_type(std::move(result))); } -} // namespace vespalib::tensor -} // namespace vespalib +} diff --git a/eval/src/vespa/eval/tensor/dense/dense_tensor_address_combiner.h b/eval/src/vespa/eval/tensor/dense/dense_tensor_address_combiner.h index 30bfd740fdd..094d642513c 100644 --- a/eval/src/vespa/eval/tensor/dense/dense_tensor_address_combiner.h +++ b/eval/src/vespa/eval/tensor/dense/dense_tensor_address_combiner.h @@ -7,8 +7,7 @@ #include <vespa/eval/tensor/types.h> #include <vespa/eval/eval/value_type.h> -namespace vespalib { -namespace tensor { +namespace vespalib::tensor { /** @@ -46,5 +45,4 @@ public: }; -} // namespace vespalib::tensor -} // namespace vespalib +} diff --git a/eval/src/vespa/eval/tensor/dense/dense_tensor_apply.h b/eval/src/vespa/eval/tensor/dense/dense_tensor_apply.h index 36432c420f5..49e075f6999 100644 --- a/eval/src/vespa/eval/tensor/dense/dense_tensor_apply.h +++ b/eval/src/vespa/eval/tensor/dense/dense_tensor_apply.h @@ -2,13 +2,12 @@ #pragma once -namespace vespalib { -namespace tensor { +namespace vespalib::tensor { + class Tensor; + class DenseTensor; +} -class Tensor; -class DenseTensor; - -namespace dense { +namespace vespalib::tensor::dense { /** * Creates a new tensor using all combinations of input tensor cells with matching @@ -22,7 +21,4 @@ template <typename Function> std::unique_ptr<Tensor> apply(const DenseTensorView &lhs, const DenseTensorView &rhs, Function &&func); -} // namespace vespalib::tensor::dense -} // namespace vespalib::tensor -} // namespace vespalib - +} diff --git a/eval/src/vespa/eval/tensor/dense/dense_tensor_apply.hpp b/eval/src/vespa/eval/tensor/dense/dense_tensor_apply.hpp index 65fee767690..dc47d02d47c 100644 --- a/eval/src/vespa/eval/tensor/dense/dense_tensor_apply.hpp +++ b/eval/src/vespa/eval/tensor/dense/dense_tensor_apply.hpp @@ -6,9 +6,7 @@ #include "dense_tensor_address_combiner.h" #include "direct_dense_tensor_builder.h" -namespace vespalib { -namespace tensor { -namespace dense { +namespace vespalib::tensor::dense { template <typename Function> std::unique_ptr<Tensor> @@ -42,6 +40,4 @@ apply(const DenseTensorView &lhs, const Tensor &rhs, Function &&func) return Tensor::UP(); } -} // namespace vespalib::tensor::dense -} // namespace vespalib::tensor -} // namespace vespalib +} diff --git a/eval/src/vespa/eval/tensor/dense/dense_tensor_builder.h b/eval/src/vespa/eval/tensor/dense/dense_tensor_builder.h index 765ed57393a..3969a9335b8 100644 --- a/eval/src/vespa/eval/tensor/dense/dense_tensor_builder.h +++ b/eval/src/vespa/eval/tensor/dense/dense_tensor_builder.h @@ -6,8 +6,7 @@ #include <vespa/vespalib/stllike/hash_map.h> #include <vespa/eval/tensor/tensor_builder.h> -namespace vespalib { -namespace tensor { +namespace vespalib::tensor { /** * A builder of for dense tensors. @@ -38,5 +37,5 @@ public: Tensor::UP build(); }; -} // namespace vespalib::tensor -} // namespace vespalib +} + diff --git a/eval/src/vespa/eval/tensor/dense/dense_tensor_cells_iterator.cpp b/eval/src/vespa/eval/tensor/dense/dense_tensor_cells_iterator.cpp index 59b4646a22b..eabd58efd74 100644 --- a/eval/src/vespa/eval/tensor/dense/dense_tensor_cells_iterator.cpp +++ b/eval/src/vespa/eval/tensor/dense/dense_tensor_cells_iterator.cpp @@ -2,8 +2,7 @@ #include "dense_tensor_cells_iterator.h" -namespace vespalib { -namespace tensor { +namespace vespalib::tensor { void DenseTensorCellsIterator::next() @@ -20,5 +19,4 @@ DenseTensorCellsIterator::next() } } -} // namespace vespalib::tensor -} // namespace vespalib +} diff --git a/eval/src/vespa/eval/tensor/dense/dense_tensor_cells_iterator.h b/eval/src/vespa/eval/tensor/dense/dense_tensor_cells_iterator.h index f77517bfdc5..beef1b9e5f2 100644 --- a/eval/src/vespa/eval/tensor/dense/dense_tensor_cells_iterator.h +++ b/eval/src/vespa/eval/tensor/dense/dense_tensor_cells_iterator.h @@ -8,8 +8,7 @@ #include <vespa/eval/tensor/tensor.h> #include <vespa/vespalib/util/arrayref.h> -namespace vespalib { -namespace tensor { +namespace vespalib::tensor { /** * Utility class to iterate over cells in a dense tensor. @@ -20,7 +19,7 @@ private: using CellsRef = vespalib::ConstArrayRef<double>; const eval::ValueType &_type; CellsRef _cells; - size_t _cellIdx; + size_t _cellIdx; std::vector<size_t> _address; public: @@ -37,5 +36,4 @@ public: const eval::ValueType &fast_type() const { return _type; } }; -} // namespace vespalib::tensor -} // namespace vespalib +} diff --git a/eval/src/vespa/eval/tensor/dense/dense_tensor_function_compiler.cpp b/eval/src/vespa/eval/tensor/dense/dense_tensor_function_compiler.cpp index 1268a46b8e5..22e2a3fb78c 100644 --- a/eval/src/vespa/eval/tensor/dense/dense_tensor_function_compiler.cpp +++ b/eval/src/vespa/eval/tensor/dense/dense_tensor_function_compiler.cpp @@ -11,8 +11,7 @@ using namespace vespalib::eval; using namespace vespalib::eval::tensor_function; using namespace vespalib::eval::operation; -namespace vespalib { -namespace tensor { +namespace vespalib::tensor { namespace { @@ -89,5 +88,5 @@ DenseTensorFunctionCompiler::compile(const eval::tensor_function::Node &expr, St return InnerProductFunctionCompiler::compile(expr, stash); } -} // namespace tensor -} // namespace vespalib +} + diff --git a/eval/src/vespa/eval/tensor/dense/dense_tensor_function_compiler.h b/eval/src/vespa/eval/tensor/dense/dense_tensor_function_compiler.h index d5ba4e4f7a7..61c3af079e3 100644 --- a/eval/src/vespa/eval/tensor/dense/dense_tensor_function_compiler.h +++ b/eval/src/vespa/eval/tensor/dense/dense_tensor_function_compiler.h @@ -4,11 +4,9 @@ #include <vespa/eval/eval/tensor_function.h> -namespace vespalib { +namespace vespalib { class Stash; } -class Stash; - -namespace tensor { +namespace vespalib::tensor { /** * Class that recognizes calculations over dense tensors (in tensor function intermediate representation) @@ -19,5 +17,5 @@ struct DenseTensorFunctionCompiler static const eval::TensorFunction &compile(const eval::tensor_function::Node &expr, Stash &stash); }; -} // namespace tensor -} // namespace vespalib +} + diff --git a/eval/src/vespa/eval/tensor/dense/dense_tensor_reduce.h b/eval/src/vespa/eval/tensor/dense/dense_tensor_reduce.h index d8f47d2234c..fb054318985 100644 --- a/eval/src/vespa/eval/tensor/dense/dense_tensor_reduce.h +++ b/eval/src/vespa/eval/tensor/dense/dense_tensor_reduce.h @@ -4,9 +4,7 @@ #include "dense_tensor.h" -namespace vespalib { -namespace tensor { -namespace dense { +namespace vespalib::tensor::dense { /** * Returns a tensor with the given dimension(s) removed and the cell values in that dimension(s) @@ -16,6 +14,5 @@ template<typename Function> std::unique_ptr<Tensor> reduce(const DenseTensorView &tensor, const std::vector<vespalib::string> &dimensions, Function &&func); -} // namespace dense -} // namespace tensor -} // namespace vespalib +} + diff --git a/eval/src/vespa/eval/tensor/dense/dense_tensor_view.cpp b/eval/src/vespa/eval/tensor/dense/dense_tensor_view.cpp index 30c9f17348e..feec93713e4 100644 --- a/eval/src/vespa/eval/tensor/dense/dense_tensor_view.cpp +++ b/eval/src/vespa/eval/tensor/dense/dense_tensor_view.cpp @@ -13,8 +13,7 @@ using vespalib::eval::TensorSpec; -namespace vespalib { -namespace tensor { +namespace vespalib::tensor { namespace { @@ -264,5 +263,4 @@ DenseTensorView::reduce(join_fun_t op, op); } -} // namespace vespalib::tensor -} // namespace vespalib +} diff --git a/eval/src/vespa/eval/tensor/dense/dense_tensor_view.h b/eval/src/vespa/eval/tensor/dense/dense_tensor_view.h index 5a59594667d..071df1dde24 100644 --- a/eval/src/vespa/eval/tensor/dense/dense_tensor_view.h +++ b/eval/src/vespa/eval/tensor/dense/dense_tensor_view.h @@ -7,8 +7,7 @@ #include <vespa/eval/eval/value_type.h> #include "dense_tensor_cells_iterator.h" -namespace vespalib { -namespace tensor { +namespace vespalib::tensor { class DenseTensor; @@ -61,5 +60,5 @@ public: virtual void accept(TensorVisitor &visitor) const override; }; -} // namespace vespalib::tensor -} // namespace vespalib +} + diff --git a/eval/src/vespa/eval/tensor/dense/dense_xw_product_function.cpp b/eval/src/vespa/eval/tensor/dense/dense_xw_product_function.cpp index 45de00dc7fe..1ab78b8ee30 100644 --- a/eval/src/vespa/eval/tensor/dense/dense_xw_product_function.cpp +++ b/eval/src/vespa/eval/tensor/dense/dense_xw_product_function.cpp @@ -8,8 +8,7 @@ #include <vespa/vespalib/util/exceptions.h> #include <assert.h> -namespace vespalib { -namespace tensor { +namespace vespalib::tensor { DenseXWProductFunction::DenseXWProductFunction(const eval::ValueType &resultType, size_t vectorId, @@ -87,5 +86,5 @@ DenseXWProductFunction::eval(ConstArrayRef<eval::Value::CREF> params, Stash &sta return stash.create<DenseTensorView>(_resultType, outputCells); } -} // namespace tensor -} // namespace vespalib +} + diff --git a/eval/src/vespa/eval/tensor/dense/dense_xw_product_function.h b/eval/src/vespa/eval/tensor/dense/dense_xw_product_function.h index db006100e5a..151f1f13800 100644 --- a/eval/src/vespa/eval/tensor/dense/dense_xw_product_function.h +++ b/eval/src/vespa/eval/tensor/dense/dense_xw_product_function.h @@ -6,8 +6,7 @@ #include "dense_tensor_view.h" #include <vespa/vespalib/hwaccelrated/iaccelrated.h> -namespace vespalib { -namespace tensor { +namespace vespalib::tensor { using XWInput = DenseTensorView::CellsRef; using XWOutput = ArrayRef<double>; @@ -49,5 +48,5 @@ public: const eval::Value &eval(ConstArrayRef<eval::Value::CREF> params, Stash &stash) const override; }; -} // namespace tensor -} // namespace vespalib +} + diff --git a/eval/src/vespa/eval/tensor/dense/direct_dense_tensor_builder.cpp b/eval/src/vespa/eval/tensor/dense/direct_dense_tensor_builder.cpp index f73d123d4bd..27d72e18f96 100644 --- a/eval/src/vespa/eval/tensor/dense/direct_dense_tensor_builder.cpp +++ b/eval/src/vespa/eval/tensor/dense/direct_dense_tensor_builder.cpp @@ -3,8 +3,7 @@ #include "direct_dense_tensor_builder.h" #include <cassert> -namespace vespalib { -namespace tensor { +namespace vespalib::tensor { using Address = DirectDenseTensorBuilder::Address; using eval::ValueType; @@ -35,7 +34,7 @@ calculateCellAddress(const Address &address, const ValueType &type) } -DirectDenseTensorBuilder::~DirectDenseTensorBuilder() { } +DirectDenseTensorBuilder::~DirectDenseTensorBuilder() = default; DirectDenseTensorBuilder::DirectDenseTensorBuilder(const ValueType &type_in) : _type(type_in), @@ -57,5 +56,5 @@ DirectDenseTensorBuilder::build() return std::make_unique<DenseTensor>(std::move(_type), std::move(_cells)); } -} // namespace tensor -} // namesapce vespalib +} + diff --git a/eval/src/vespa/eval/tensor/dense/direct_dense_tensor_builder.h b/eval/src/vespa/eval/tensor/dense/direct_dense_tensor_builder.h index 5e0368e8e69..8566eedf246 100644 --- a/eval/src/vespa/eval/tensor/dense/direct_dense_tensor_builder.h +++ b/eval/src/vespa/eval/tensor/dense/direct_dense_tensor_builder.h @@ -4,8 +4,7 @@ #include "dense_tensor.h" -namespace vespalib { -namespace tensor { +namespace vespalib::tensor { /** * Class for building a dense tensor by inserting cell values directly into underlying array of cells. @@ -27,5 +26,5 @@ public: Tensor::UP build(); }; -} // namespace tensor -} // namespace vespalib +} + diff --git a/eval/src/vespa/eval/tensor/dense/mutable_dense_tensor_view.cpp b/eval/src/vespa/eval/tensor/dense/mutable_dense_tensor_view.cpp index 71b7824ee5d..e3b4c8dee42 100644 --- a/eval/src/vespa/eval/tensor/dense/mutable_dense_tensor_view.cpp +++ b/eval/src/vespa/eval/tensor/dense/mutable_dense_tensor_view.cpp @@ -4,8 +4,7 @@ using vespalib::eval::ValueType; -namespace vespalib { -namespace tensor { +namespace vespalib::tensor { MutableDenseTensorView::MutableValueType::MutableValueType(ValueType type_in) : _type(type_in) @@ -19,7 +18,7 @@ MutableDenseTensorView::MutableValueType::MutableValueType(ValueType type_in) } } -MutableDenseTensorView::MutableValueType::~MutableValueType() {} +MutableDenseTensorView::MutableValueType::~MutableValueType() = default; MutableDenseTensorView::MutableDenseTensorView(ValueType type_in) : DenseTensorView(_concreteType.fast_type(), CellsRef()), @@ -33,5 +32,5 @@ MutableDenseTensorView::MutableDenseTensorView(ValueType type_in, CellsRef cells { } -} // namespace tensor -} // namespace vespalib +} + diff --git a/eval/src/vespa/eval/tensor/dense/mutable_dense_tensor_view.h b/eval/src/vespa/eval/tensor/dense/mutable_dense_tensor_view.h index 7eee3a9483c..1575e27ae26 100644 --- a/eval/src/vespa/eval/tensor/dense/mutable_dense_tensor_view.h +++ b/eval/src/vespa/eval/tensor/dense/mutable_dense_tensor_view.h @@ -5,8 +5,7 @@ #include "dense_tensor_view.h" #include <cassert> -namespace vespalib { -namespace tensor { +namespace vespalib::tensor { /** * A mutable view to a dense tensor where all dimensions are indexed. @@ -55,5 +54,5 @@ public: } }; -} // namespace vespalib::tensor -} // namespace vespalib +} + diff --git a/eval/src/vespa/eval/tensor/sparse/sparse_tensor.cpp b/eval/src/vespa/eval/tensor/sparse/sparse_tensor.cpp index b02de7dc310..1aa05bf4f61 100644 --- a/eval/src/vespa/eval/tensor/sparse/sparse_tensor.cpp +++ b/eval/src/vespa/eval/tensor/sparse/sparse_tensor.cpp @@ -33,8 +33,7 @@ copyCells(Cells &cells, const Cells &cells_in, Stash &stash) } -SparseTensor::SparseTensor(const eval::ValueType &type_in, - const Cells &cells_in) +SparseTensor::SparseTensor(const eval::ValueType &type_in, const Cells &cells_in) : _type(type_in), _cells(), _stash(STASH_CHUNK_SIZE) @@ -43,14 +42,13 @@ SparseTensor::SparseTensor(const eval::ValueType &type_in, } -SparseTensor::SparseTensor(eval::ValueType &&type_in, - Cells &&cells_in, Stash &&stash_in) +SparseTensor::SparseTensor(eval::ValueType &&type_in, Cells &&cells_in, Stash &&stash_in) : _type(std::move(type_in)), _cells(std::move(cells_in)), _stash(std::move(stash_in)) -{ -} +{ } +SparseTensor::~SparseTensor() = default; bool SparseTensor::operator==(const SparseTensor &rhs) const diff --git a/eval/src/vespa/eval/tensor/sparse/sparse_tensor.h b/eval/src/vespa/eval/tensor/sparse/sparse_tensor.h index ef0827ce8ac..78c69bd5e43 100644 --- a/eval/src/vespa/eval/tensor/sparse/sparse_tensor.h +++ b/eval/src/vespa/eval/tensor/sparse/sparse_tensor.h @@ -33,6 +33,7 @@ private: public: explicit SparseTensor(const eval::ValueType &type_in, const Cells &cells_in); SparseTensor(eval::ValueType &&type_in, Cells &&cells_in, Stash &&stash_in); + ~SparseTensor() override; const Cells &cells() const { return _cells; } const eval::ValueType &fast_type() const { return _type; } bool operator==(const SparseTensor &rhs) const; diff --git a/eval/src/vespa/eval/tensor/sparse/sparse_tensor_address_combiner.h b/eval/src/vespa/eval/tensor/sparse/sparse_tensor_address_combiner.h index 491d5c9be8b..8e792cb100a 100644 --- a/eval/src/vespa/eval/tensor/sparse/sparse_tensor_address_combiner.h +++ b/eval/src/vespa/eval/tensor/sparse/sparse_tensor_address_combiner.h @@ -5,9 +5,8 @@ #include "sparse_tensor_address_builder.h" #include <vespa/eval/tensor/types.h> -namespace vespalib { -namespace eval { class ValueType; } -namespace tensor::sparse { +namespace vespalib::eval { class ValueType; } +namespace vespalib::tensor::sparse { /** * Combine two tensor addresses to a new tensor address. Common dimensions @@ -15,12 +14,7 @@ namespace tensor::sparse { */ class TensorAddressCombiner : public SparseTensorAddressBuilder { - enum class AddressOp - { - LHS, - RHS, - BOTH - }; + enum class AddressOp { LHS, RHS, BOTH }; std::vector<AddressOp> _ops; @@ -33,6 +27,5 @@ public: size_t numDimensions() const { return _ops.size(); } }; +} -} // namespace vespalib::tensor::sparse -} // namespace vespalib diff --git a/eval/src/vespa/eval/tensor/sparse/sparse_tensor_address_decoder.h b/eval/src/vespa/eval/tensor/sparse/sparse_tensor_address_decoder.h index 3a0502aee5b..2fbd9932009 100644 --- a/eval/src/vespa/eval/tensor/sparse/sparse_tensor_address_decoder.h +++ b/eval/src/vespa/eval/tensor/sparse/sparse_tensor_address_decoder.h @@ -5,10 +5,7 @@ #include <vespa/vespalib/stllike/string.h> #include "sparse_tensor_address_ref.h" -namespace vespalib { - - -namespace tensor { +namespace vespalib::tensor { /** * A decoder for a serialized tensor address, with only labels present. @@ -40,5 +37,5 @@ public: }; -} // namespace vespalib::tensor -} // namespace vespalib +} + diff --git a/eval/src/vespa/eval/tensor/sparse/sparse_tensor_address_padder.h b/eval/src/vespa/eval/tensor/sparse/sparse_tensor_address_padder.h index 506f8b29593..29e10c778ba 100644 --- a/eval/src/vespa/eval/tensor/sparse/sparse_tensor_address_padder.h +++ b/eval/src/vespa/eval/tensor/sparse/sparse_tensor_address_padder.h @@ -6,8 +6,7 @@ #include "sparse_tensor_address_decoder.h" #include <cassert> -namespace vespalib { -namespace tensor { +namespace vespalib::tensor { /** @@ -16,11 +15,7 @@ namespace tensor { */ class SparseTensorAddressPadder : public SparseTensorAddressBuilder { - enum class PadOp - { - PAD, - COPY - }; + enum class PadOp { PAD, COPY }; std::vector<PadOp> _padOps; @@ -67,6 +62,5 @@ public: } }; +} -} // namespace vespalib::tensor -} // namespace vespalib diff --git a/eval/src/vespa/eval/tensor/sparse/sparse_tensor_address_reducer.cpp b/eval/src/vespa/eval/tensor/sparse/sparse_tensor_address_reducer.cpp index 7da5bd8d61a..fbd0034bc14 100644 --- a/eval/src/vespa/eval/tensor/sparse/sparse_tensor_address_reducer.cpp +++ b/eval/src/vespa/eval/tensor/sparse/sparse_tensor_address_reducer.cpp @@ -4,20 +4,16 @@ #include <vespa/eval/eval/value_type.h> #include <vespa/vespalib/stllike/hash_set.hpp> -namespace vespalib { -namespace tensor { -namespace sparse { +namespace vespalib::tensor::sparse { TensorAddressReducer::TensorAddressReducer(const eval::ValueType &type, - const std::vector<vespalib::string> & - removeDimensions) + const std::vector<vespalib::string> & removeDimensions) : SparseTensorAddressBuilder(), _ops() { - TensorDimensionsSet removeSet(removeDimensions.cbegin(), - removeDimensions.cend()); + TensorDimensionsSet removeSet(removeDimensions.cbegin(), removeDimensions.cend()); _ops.reserve(type.dimensions().size()); - for (auto &dim : type.dimensions()) { + for (const auto &dim : type.dimensions()) { if (removeSet.find(dim.name) != removeSet.end()) { _ops.push_back(AddressOp::REMOVE); } else { @@ -26,10 +22,7 @@ TensorAddressReducer::TensorAddressReducer(const eval::ValueType &type, } } -TensorAddressReducer::~TensorAddressReducer() -{ +TensorAddressReducer::~TensorAddressReducer() = default; + } -} // namespace vespalib::tensor::sparse -} // namespace vespalib::tensor -} // namespace vespalib diff --git a/eval/src/vespa/eval/tensor/sparse/sparse_tensor_address_reducer.h b/eval/src/vespa/eval/tensor/sparse/sparse_tensor_address_reducer.h index c40d34d9a53..a2034d3be49 100644 --- a/eval/src/vespa/eval/tensor/sparse/sparse_tensor_address_reducer.h +++ b/eval/src/vespa/eval/tensor/sparse/sparse_tensor_address_reducer.h @@ -7,21 +7,15 @@ #include "sparse_tensor_address_decoder.h" #include <cassert> -namespace vespalib { -namespace eval { class ValueType; } -namespace tensor { -namespace sparse { +namespace vespalib::eval { class ValueType; } +namespace vespalib::tensor::sparse { /** * Reduce sparse tensor address by removing one or more dimensions. */ class TensorAddressReducer : public SparseTensorAddressBuilder { - enum AddressOp - { - REMOVE, - COPY - }; + enum AddressOp { REMOVE, COPY }; using AddressOps = std::vector<AddressOp>; @@ -50,7 +44,5 @@ public: } }; +} -} // namespace vespalib::tensor::sparse -} // namespace vespalib::tensor -} // namespace vespalib diff --git a/eval/src/vespa/eval/tensor/sparse/sparse_tensor_apply.h b/eval/src/vespa/eval/tensor/sparse/sparse_tensor_apply.h index 92345b260fd..ec6edf2d847 100644 --- a/eval/src/vespa/eval/tensor/sparse/sparse_tensor_apply.h +++ b/eval/src/vespa/eval/tensor/sparse/sparse_tensor_apply.h @@ -3,9 +3,11 @@ #pragma once namespace vespalib::tensor { -class Tensor; -class SparseTensor; -namespace sparse { + class Tensor; + class SparseTensor; +} + +namespace vespalib::tensor::sparse { /** * Create new tensor using all combinations of input tensor cells with matching @@ -16,6 +18,5 @@ template <typename Function> std::unique_ptr<Tensor> apply(const SparseTensor &lhs, const SparseTensor &rhs, Function &&func); +} -} // namespace vespalib::tensor::sparse -} // namespace vespalib::tensor diff --git a/eval/src/vespa/eval/tensor/sparse/sparse_tensor_builder.cpp b/eval/src/vespa/eval/tensor/sparse/sparse_tensor_builder.cpp index dacf0c27593..9c3b13f6260 100644 --- a/eval/src/vespa/eval/tensor/sparse/sparse_tensor_builder.cpp +++ b/eval/src/vespa/eval/tensor/sparse/sparse_tensor_builder.cpp @@ -3,8 +3,7 @@ #include "sparse_tensor_builder.h" #include <cassert> -namespace vespalib { -namespace tensor { +namespace vespalib::tensor { SparseTensorBuilder::SparseTensorBuilder() : TensorBuilder(), @@ -19,10 +18,7 @@ SparseTensorBuilder::SparseTensorBuilder() { } -SparseTensorBuilder::~SparseTensorBuilder() -{ -} - +SparseTensorBuilder::~SparseTensorBuilder() = default; void SparseTensorBuilder::makeType() @@ -103,6 +99,5 @@ SparseTensorBuilder::build() return ret; } +} -} // namespace vespalib::tensor -} // namespace vespalib diff --git a/eval/src/vespa/eval/tensor/sparse/sparse_tensor_builder.h b/eval/src/vespa/eval/tensor/sparse/sparse_tensor_builder.h index af1566d46c5..ea5f607ff7e 100644 --- a/eval/src/vespa/eval/tensor/sparse/sparse_tensor_builder.h +++ b/eval/src/vespa/eval/tensor/sparse/sparse_tensor_builder.h @@ -10,8 +10,7 @@ #include <vespa/vespalib/stllike/hash_map.h> #include <vespa/vespalib/util/stash.h> -namespace vespalib { -namespace tensor { +namespace vespalib::tensor { /** * A builder of sparse tensors. @@ -30,17 +29,13 @@ class SparseTensorBuilder : public TensorBuilder void makeType(); public: SparseTensorBuilder(); - virtual ~SparseTensorBuilder(); + ~SparseTensorBuilder() override; - virtual Dimension - define_dimension(const vespalib::string &dimension) override; - virtual TensorBuilder & - add_label(Dimension dimension, - const vespalib::string &label) override; - virtual TensorBuilder &add_cell(double value) override; - - virtual Tensor::UP build() override; + Dimension define_dimension(const vespalib::string &dimension) override; + TensorBuilder & add_label(Dimension dimension, const vespalib::string &label) override; + TensorBuilder &add_cell(double value) override; + Tensor::UP build() override; }; -} // namespace vespalib::tensor -} // namespace vespalib +} + diff --git a/eval/src/vespa/eval/tensor/sparse/sparse_tensor_unsorted_address_builder.cpp b/eval/src/vespa/eval/tensor/sparse/sparse_tensor_unsorted_address_builder.cpp index 1e112cbaa6e..866956dd23e 100644 --- a/eval/src/vespa/eval/tensor/sparse/sparse_tensor_unsorted_address_builder.cpp +++ b/eval/src/vespa/eval/tensor/sparse/sparse_tensor_unsorted_address_builder.cpp @@ -14,12 +14,10 @@ SparseTensorUnsortedAddressBuilder::SparseTensorUnsortedAddressBuilder() { } -SparseTensorUnsortedAddressBuilder::~SparseTensorUnsortedAddressBuilder() { -} +SparseTensorUnsortedAddressBuilder::~SparseTensorUnsortedAddressBuilder() = default; void -SparseTensorUnsortedAddressBuilder::buildTo(SparseTensorAddressBuilder & - builder, +SparseTensorUnsortedAddressBuilder::buildTo(SparseTensorAddressBuilder & builder, const eval::ValueType &type) { const char *base = &_elementStrings[0]; @@ -47,3 +45,4 @@ SparseTensorUnsortedAddressBuilder::buildTo(SparseTensorAddressBuilder & } } + diff --git a/eval/src/vespa/eval/tensor/sparse/sparse_tensor_unsorted_address_builder.h b/eval/src/vespa/eval/tensor/sparse/sparse_tensor_unsorted_address_builder.h index 24519e924d9..681bdabc5eb 100644 --- a/eval/src/vespa/eval/tensor/sparse/sparse_tensor_unsorted_address_builder.h +++ b/eval/src/vespa/eval/tensor/sparse/sparse_tensor_unsorted_address_builder.h @@ -6,9 +6,8 @@ #include <vector> #include <vespa/eval/tensor/types.h> -namespace vespalib { -namespace eval { class ValueType; } -namespace tensor { +namespace vespalib::eval { class ValueType; } +namespace vespalib::tensor { class SparseTensorAddressBuilder; @@ -73,11 +72,9 @@ public: * Sort the stored tensor address and pass it over to a strict * tensor address builder in sorted order. */ - void buildTo(SparseTensorAddressBuilder &builder, - const eval::ValueType &type); + void buildTo(SparseTensorAddressBuilder &builder, const eval::ValueType &type); void clear() { _elementStrings.clear(); _elements.clear(); } }; +} -} // namespace vespalib::tensor -} // namespace vespalib |