diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2020-03-05 09:46:44 +0000 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2020-03-05 10:33:12 +0000 |
commit | 2121b0adf8e6ecbd73fda057bd5e2a2107316681 (patch) | |
tree | 705bb3a537d839548addd13fab8162ceb7616a08 /eval | |
parent | c639bafe621e3c8f3825ce3371321c1b3c395159 (diff) |
- Remove unused includes.
- = default
- push_back -> emplace_back
- std::move on vector.
No semantic changes.
Diffstat (limited to 'eval')
15 files changed, 18 insertions, 50 deletions
diff --git a/eval/src/vespa/eval/tensor/dense/dense_add_dimension_optimizer.cpp b/eval/src/vespa/eval/tensor/dense/dense_add_dimension_optimizer.cpp index a4331b6b251..2e2b94cc7a6 100644 --- a/eval/src/vespa/eval/tensor/dense/dense_add_dimension_optimizer.cpp +++ b/eval/src/vespa/eval/tensor/dense/dense_add_dimension_optimizer.cpp @@ -2,9 +2,7 @@ #include "dense_add_dimension_optimizer.h" #include "dense_replace_type_function.h" -#include <vespa/eval/eval/value_type.h> #include <vespa/eval/eval/operation.h> -#include <vespa/eval/eval/value.h> #include <vespa/log/log.h> LOG_SETUP(".eval.tensor.dense.add_dimension_optimizer"); 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 f2c374ea02d..2fe89861e9f 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 @@ -1,11 +1,9 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "dense_dot_product_function.h" -#include "dense_tensor.h" #include "dense_tensor_view.h" #include <vespa/eval/eval/operation.h> #include <vespa/eval/eval/value.h> -#include <vespa/eval/tensor/tensor.h> #include <cblas.h> diff --git a/eval/src/vespa/eval/tensor/dense/dense_fast_rename_optimizer.cpp b/eval/src/vespa/eval/tensor/dense/dense_fast_rename_optimizer.cpp index ac8442477e4..7c3dde5fa2e 100644 --- a/eval/src/vespa/eval/tensor/dense/dense_fast_rename_optimizer.cpp +++ b/eval/src/vespa/eval/tensor/dense/dense_fast_rename_optimizer.cpp @@ -2,10 +2,8 @@ #include "dense_fast_rename_optimizer.h" #include "dense_replace_type_function.h" -#include "dense_tensor.h" #include "dense_tensor_view.h" #include <vespa/eval/eval/value.h> -#include <vespa/eval/tensor/tensor.h> namespace vespalib::tensor { diff --git a/eval/src/vespa/eval/tensor/dense/dense_inplace_join_function.cpp b/eval/src/vespa/eval/tensor/dense/dense_inplace_join_function.cpp index 0b5bba88d37..990215cbbe8 100644 --- a/eval/src/vespa/eval/tensor/dense/dense_inplace_join_function.cpp +++ b/eval/src/vespa/eval/tensor/dense/dense_inplace_join_function.cpp @@ -1,11 +1,9 @@ // Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "dense_inplace_join_function.h" -#include "dense_tensor.h" #include "dense_tensor_view.h" #include <vespa/vespalib/objects/objectvisitor.h> #include <vespa/eval/eval/value.h> -#include <vespa/eval/tensor/tensor.h> namespace vespalib::tensor { diff --git a/eval/src/vespa/eval/tensor/dense/dense_inplace_map_function.cpp b/eval/src/vespa/eval/tensor/dense/dense_inplace_map_function.cpp index c82cda34a28..e086eab0b13 100644 --- a/eval/src/vespa/eval/tensor/dense/dense_inplace_map_function.cpp +++ b/eval/src/vespa/eval/tensor/dense/dense_inplace_map_function.cpp @@ -1,10 +1,8 @@ // Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "dense_inplace_map_function.h" -#include "dense_tensor.h" #include "dense_tensor_view.h" #include <vespa/eval/eval/value.h> -#include <vespa/eval/tensor/tensor.h> namespace vespalib::tensor { diff --git a/eval/src/vespa/eval/tensor/dense/dense_matmul_function.cpp b/eval/src/vespa/eval/tensor/dense/dense_matmul_function.cpp index 272ceb319c8..1feecc31e51 100644 --- a/eval/src/vespa/eval/tensor/dense/dense_matmul_function.cpp +++ b/eval/src/vespa/eval/tensor/dense/dense_matmul_function.cpp @@ -3,12 +3,9 @@ #include "dense_matmul_function.h" #include "dense_tensor_view.h" #include <vespa/vespalib/objects/objectvisitor.h> -#include <vespa/vespalib/util/overload.h> -#include <vespa/vespalib/util/visit_ranges.h> #include <vespa/eval/eval/value.h> #include <vespa/eval/eval/operation.h> -#include <vespa/eval/tensor/tensor.h> -#include <assert.h> +#include <cassert> #include <cblas.h> diff --git a/eval/src/vespa/eval/tensor/dense/dense_tensor.cpp b/eval/src/vespa/eval/tensor/dense/dense_tensor.cpp index 73cdfc12a38..7faba87dbd3 100644 --- a/eval/src/vespa/eval/tensor/dense/dense_tensor.cpp +++ b/eval/src/vespa/eval/tensor/dense/dense_tensor.cpp @@ -3,7 +3,6 @@ #include "dense_tensor.h" #include <vespa/vespalib/util/stringfmt.h> #include <vespa/vespalib/util/exceptions.h> -#include <vespa/eval/eval/operation.h> using vespalib::eval::TensorSpec; diff --git a/eval/src/vespa/eval/tensor/dense/dense_tensor_address_mapper.cpp b/eval/src/vespa/eval/tensor/dense/dense_tensor_address_mapper.cpp index c1c24d28b7f..f32af0d097b 100644 --- a/eval/src/vespa/eval/tensor/dense/dense_tensor_address_mapper.cpp +++ b/eval/src/vespa/eval/tensor/dense/dense_tensor_address_mapper.cpp @@ -2,7 +2,6 @@ #include "dense_tensor_address_mapper.h" #include <vespa/eval/eval/value_type.h> -#include <vespa/eval/tensor/types.h> #include <vespa/eval/tensor/tensor_address.h> #include <vespa/eval/tensor/tensor_address_element_iterator.h> diff --git a/eval/src/vespa/eval/tensor/dense/dense_tensor_create_function.cpp b/eval/src/vespa/eval/tensor/dense/dense_tensor_create_function.cpp index d590e870cfe..b072f334f13 100644 --- a/eval/src/vespa/eval/tensor/dense/dense_tensor_create_function.cpp +++ b/eval/src/vespa/eval/tensor/dense/dense_tensor_create_function.cpp @@ -2,7 +2,6 @@ #include "dense_tensor_create_function.h" #include "dense_tensor_view.h" -#include <vespa/eval/eval/operation.h> #include <vespa/eval/eval/value.h> #include <vespa/eval/tensor/tensor.h> @@ -16,7 +15,6 @@ using eval::TensorFunction; using Child = eval::TensorFunction::Child; using eval::as; using namespace eval::tensor_function; -using namespace eval::operation; namespace { @@ -30,7 +28,7 @@ void my_tensor_create_op(eval::InterpretedFunction::State &state, uint64_t param state.stack.pop_back(); } const Value &result = state.stash.create<DenseTensorView>(self->result_type, TypedCells(cells)); - state.stack.push_back(result); + state.stack.emplace_back(result); } struct MyTensorCreateOp { @@ -59,15 +57,13 @@ DenseTensorCreateFunction::DenseTensorCreateFunction(const ValueType &res_type, { } -DenseTensorCreateFunction::~DenseTensorCreateFunction() -{ -} +DenseTensorCreateFunction::~DenseTensorCreateFunction() = default; void DenseTensorCreateFunction::push_children(std::vector<Child::CREF> &target) const { for (const Child &c : _children) { - target.push_back(c); + target.emplace_back(c); } } diff --git a/eval/src/vespa/eval/tensor/dense/dense_tensor_peek_function.cpp b/eval/src/vespa/eval/tensor/dense/dense_tensor_peek_function.cpp index 2920ca26234..07a2f08c423 100644 --- a/eval/src/vespa/eval/tensor/dense/dense_tensor_peek_function.cpp +++ b/eval/src/vespa/eval/tensor/dense/dense_tensor_peek_function.cpp @@ -2,8 +2,6 @@ #include "dense_tensor_peek_function.h" #include "dense_tensor_view.h" -#include <vespa/vespalib/util/overload.h> -#include <vespa/eval/eval/operation.h> #include <vespa/eval/eval/value.h> #include <vespa/eval/tensor/tensor.h> @@ -17,7 +15,6 @@ using eval::TensorFunction; using Child = eval::TensorFunction::Child; using eval::as; using namespace eval::tensor_function; -using namespace eval::operation; namespace { @@ -41,7 +38,7 @@ void my_tensor_peek_op(eval::InterpretedFunction::State &state, uint64_t param) auto cells = DenseTensorView::typify_cells<CT>(state.peek(0)); state.stack.pop_back(); const Value &result = state.stash.create<DoubleValue>(valid ? cells[idx] : 0.0); - state.stack.push_back(result); + state.stack.emplace_back(result); } struct MyTensorPeekOp { @@ -52,10 +49,10 @@ struct MyTensorPeekOp { } // namespace vespalib::tensor::<unnamed> DenseTensorPeekFunction::DenseTensorPeekFunction(std::vector<Child> children, - const std::vector<std::pair<int64_t,size_t>> &spec) + std::vector<std::pair<int64_t,size_t>> spec) : TensorFunction(), _children(std::move(children)), - _spec(spec) + _spec(std::move(spec)) { } @@ -65,7 +62,7 @@ void DenseTensorPeekFunction::push_children(std::vector<Child::CREF> &target) const { for (const Child &c: _children) { - target.push_back(c); + target.emplace_back(c); } } @@ -100,7 +97,7 @@ DenseTensorPeekFunction::optimize(const eval::TensorFunction &expr, Stash &stash } }, dim_spec->second); } - return stash.create<DenseTensorPeekFunction>(peek->copy_children(), spec); + return stash.create<DenseTensorPeekFunction>(peek->copy_children(), std::move(spec)); } } return expr; diff --git a/eval/src/vespa/eval/tensor/dense/dense_tensor_peek_function.h b/eval/src/vespa/eval/tensor/dense/dense_tensor_peek_function.h index 4924a0de329..150bab5211f 100644 --- a/eval/src/vespa/eval/tensor/dense/dense_tensor_peek_function.h +++ b/eval/src/vespa/eval/tensor/dense/dense_tensor_peek_function.h @@ -22,7 +22,7 @@ private: // (note that child expression order is inverted by the stack) std::vector<std::pair<int64_t,size_t>> _spec; public: - DenseTensorPeekFunction(std::vector<Child> children, const std::vector<std::pair<int64_t,size_t>> &spec); + DenseTensorPeekFunction(std::vector<Child> children, std::vector<std::pair<int64_t,size_t>> spec); ~DenseTensorPeekFunction(); const eval::ValueType &result_type() const override { return eval::DoubleValue::double_type(); } void push_children(std::vector<Child::CREF> &children) const override; diff --git a/eval/src/vespa/eval/tensor/dense/dense_tensor_reduce.cpp b/eval/src/vespa/eval/tensor/dense/dense_tensor_reduce.cpp index 252be199208..d44fe88bb10 100644 --- a/eval/src/vespa/eval/tensor/dense/dense_tensor_reduce.cpp +++ b/eval/src/vespa/eval/tensor/dense/dense_tensor_reduce.cpp @@ -14,8 +14,7 @@ DimensionReducer::calcCellsSize(const eval::ValueType &type) return cellsSize; } -DimensionReducer::DimensionReducer(const eval::ValueType &oldType, - const string &dimensionToRemove) +DimensionReducer::DimensionReducer(const eval::ValueType &oldType, const string &dimensionToRemove) : _type(oldType.reduce({ dimensionToRemove })), _innerDimSize(1), _sumDimSize(1), 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 e450aa49284..9cb0b7d2510 100644 --- a/eval/src/vespa/eval/tensor/dense/dense_tensor_view.cpp +++ b/eval/src/vespa/eval/tensor/dense/dense_tensor_view.cpp @@ -138,7 +138,7 @@ joinDenseTensors(const DenseTensorView &lhs, const Tensor &rhs, vespalib::stringref operation, Function &&func) { - const DenseTensorView *view = dynamic_cast<const DenseTensorView *>(&rhs); + auto view = dynamic_cast<const DenseTensorView *>(&rhs); if (view) { checkDimensions(lhs, *view, operation); return joinDenseTensors(lhs, *view, func); @@ -215,7 +215,7 @@ DenseTensorView::apply(const CellFunction &func) const bool DenseTensorView::equals(const Tensor &arg) const { - const DenseTensorView *view = dynamic_cast<const DenseTensorView *>(&arg); + auto view = dynamic_cast<const DenseTensorView *>(&arg); if (view) { return *this == *view; } 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 7b03f45e9cc..fb126b03d19 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 @@ -1,14 +1,11 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "dense_xw_product_function.h" -#include "dense_tensor.h" #include "dense_tensor_view.h" #include <vespa/vespalib/objects/objectvisitor.h> #include <vespa/eval/eval/value.h> #include <vespa/eval/eval/operation.h> -#include <vespa/eval/tensor/tensor.h> -#include <vespa/vespalib/util/exceptions.h> -#include <assert.h> +#include <cassert> #include <cblas.h> diff --git a/eval/src/vespa/eval/tensor/dense/vector_from_doubles_function.cpp b/eval/src/vespa/eval/tensor/dense/vector_from_doubles_function.cpp index 4694aea717d..4ef678a1de9 100644 --- a/eval/src/vespa/eval/tensor/dense/vector_from_doubles_function.cpp +++ b/eval/src/vespa/eval/tensor/dense/vector_from_doubles_function.cpp @@ -1,11 +1,8 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "vector_from_doubles_function.h" -#include "dense_tensor.h" #include "dense_tensor_view.h" -#include <vespa/eval/eval/operation.h> #include <vespa/eval/eval/value.h> -#include <vespa/eval/tensor/tensor.h> namespace vespalib::tensor { @@ -15,7 +12,6 @@ using eval::TensorFunction; using Child = eval::TensorFunction::Child; using eval::as; using namespace eval::tensor_function; -using namespace eval::operation; namespace { @@ -38,7 +34,7 @@ void my_vector_from_doubles_op(eval::InterpretedFunction::State &state, uint64_t size_t numCells = self->resultSize; TypedCells cells = dispatch_0<CallVectorFromDoubles>(ct, state, numCells); const Value &result = state.stash.create<DenseTensorView>(self->resultType, cells); - state.stack.push_back(result); + state.stack.emplace_back(result); } size_t vector_size(const TensorFunction &child, const vespalib::string &dimension) { @@ -55,7 +51,7 @@ size_t vector_size(const TensorFunction &child, const vespalib::string &dimensio void flatten_into(const TensorFunction &child, std::vector<Child> &vec) { if (child.result_type().is_double()) { - vec.push_back(child); + vec.emplace_back(child); } else { std::vector<Child::CREF> tmp; child.push_children(tmp); @@ -83,15 +79,13 @@ VectorFromDoublesFunction::VectorFromDoublesFunction(std::vector<Child> children { } -VectorFromDoublesFunction::~VectorFromDoublesFunction() -{ -} +VectorFromDoublesFunction::~VectorFromDoublesFunction() = default; void VectorFromDoublesFunction::push_children(std::vector<Child::CREF> &target) const { for (const Child &c : _children) { - target.push_back(c); + target.emplace_back(c); } } |