summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHåvard Pettersen <havardpe@oath.com>2020-04-30 11:37:05 +0000
committerHåvard Pettersen <havardpe@oath.com>2020-04-30 11:37:05 +0000
commit6cf232863ef9047412aa62cc6465ebbdd719a642 (patch)
tree1e40a6c1d72e766345f32bdec04b592b610a5487
parent8d6e9a97a5da936e8b72573b7477f6ec555138cd (diff)
fix PR comments
-rw-r--r--eval/src/vespa/eval/eval/node_tools.cpp6
-rw-r--r--eval/src/vespa/eval/eval/tensor_function.h2
-rw-r--r--eval/src/vespa/eval/tensor/dense/dense_cell_range_function.cpp4
-rw-r--r--eval/src/vespa/eval/tensor/dense/dense_cell_range_function.h2
-rw-r--r--eval/src/vespa/eval/tensor/dense/dense_lambda_peek_function.cpp4
-rw-r--r--eval/src/vespa/eval/tensor/dense/dense_lambda_peek_function.h2
-rw-r--r--eval/src/vespa/eval/tensor/dense/dense_lambda_peek_optimizer.cpp1
7 files changed, 8 insertions, 13 deletions
diff --git a/eval/src/vespa/eval/eval/node_tools.cpp b/eval/src/vespa/eval/eval/node_tools.cpp
index 179594963e9..7bbe095c060 100644
--- a/eval/src/vespa/eval/eval/node_tools.cpp
+++ b/eval/src/vespa/eval/eval/node_tools.cpp
@@ -26,9 +26,9 @@ struct CopyNode : NodeTraverser, NodeVisitor {
std::vector<Node_UP> stack;
CopyNode() : error(), stack() {}
- ~CopyNode();
+ ~CopyNode() override;
- Node_UP get_result() {
+ Node_UP result() {
if (error) {
return std::move(error);
}
@@ -203,7 +203,7 @@ NodeTools::copy(const Node &node)
{
CopyNode copy_node;
node.traverse(copy_node);
- return copy_node.get_result();
+ return copy_node.result();
}
} // namespace vespalib::eval
diff --git a/eval/src/vespa/eval/eval/tensor_function.h b/eval/src/vespa/eval/eval/tensor_function.h
index 584cfea2581..e1961079017 100644
--- a/eval/src/vespa/eval/eval/tensor_function.h
+++ b/eval/src/vespa/eval/eval/tensor_function.h
@@ -343,7 +343,7 @@ private:
public:
Lambda(const ValueType &result_type_in, const std::vector<size_t> &bindings_in, const Function &lambda_in, NodeTypes lambda_types_in)
: Node(result_type_in), _bindings(bindings_in), _lambda(lambda_in.shared_from_this()), _lambda_types(std::move(lambda_types_in)) {}
- const std::vector<size_t> bindings() const { return _bindings; }
+ const std::vector<size_t> &bindings() const { return _bindings; }
const Function &lambda() const { return *_lambda; }
const NodeTypes &types() const { return _lambda_types; }
static TensorSpec create_spec_impl(const ValueType &type, const LazyParams &params, const std::vector<size_t> &bind, const InterpretedFunction &fun);
diff --git a/eval/src/vespa/eval/tensor/dense/dense_cell_range_function.cpp b/eval/src/vespa/eval/tensor/dense/dense_cell_range_function.cpp
index 7a616d91064..9b93f5e7d72 100644
--- a/eval/src/vespa/eval/tensor/dense/dense_cell_range_function.cpp
+++ b/eval/src/vespa/eval/tensor/dense/dense_cell_range_function.cpp
@@ -39,9 +39,7 @@ DenseCellRangeFunction::DenseCellRangeFunction(const eval::ValueType &result_typ
{
}
-DenseCellRangeFunction::~DenseCellRangeFunction()
-{
-}
+DenseCellRangeFunction::~DenseCellRangeFunction() = default;
eval::InterpretedFunction::Instruction
DenseCellRangeFunction::compile_self(const TensorEngine &, Stash &) const
diff --git a/eval/src/vespa/eval/tensor/dense/dense_cell_range_function.h b/eval/src/vespa/eval/tensor/dense/dense_cell_range_function.h
index 148f28495de..3f220826324 100644
--- a/eval/src/vespa/eval/tensor/dense/dense_cell_range_function.h
+++ b/eval/src/vespa/eval/tensor/dense/dense_cell_range_function.h
@@ -21,7 +21,7 @@ public:
DenseCellRangeFunction(const eval::ValueType &result_type,
const eval::TensorFunction &child,
size_t offset, size_t length);
- ~DenseCellRangeFunction();
+ ~DenseCellRangeFunction() override;
size_t offset() const { return _offset; }
size_t length() const { return _length; }
eval::InterpretedFunction::Instruction compile_self(const eval::TensorEngine &engine, Stash &stash) const override;
diff --git a/eval/src/vespa/eval/tensor/dense/dense_lambda_peek_function.cpp b/eval/src/vespa/eval/tensor/dense/dense_lambda_peek_function.cpp
index 1cc928a25ca..0c7debde4ef 100644
--- a/eval/src/vespa/eval/tensor/dense/dense_lambda_peek_function.cpp
+++ b/eval/src/vespa/eval/tensor/dense/dense_lambda_peek_function.cpp
@@ -69,9 +69,7 @@ DenseLambdaPeekFunction::DenseLambdaPeekFunction(const ValueType &result_type,
{
}
-DenseLambdaPeekFunction::~DenseLambdaPeekFunction()
-{
-}
+DenseLambdaPeekFunction::~DenseLambdaPeekFunction() = default;
InterpretedFunction::Instruction
DenseLambdaPeekFunction::compile_self(const TensorEngine &, Stash &stash) const
diff --git a/eval/src/vespa/eval/tensor/dense/dense_lambda_peek_function.h b/eval/src/vespa/eval/tensor/dense/dense_lambda_peek_function.h
index 6d664aa76d2..a4146787bfa 100644
--- a/eval/src/vespa/eval/tensor/dense/dense_lambda_peek_function.h
+++ b/eval/src/vespa/eval/tensor/dense/dense_lambda_peek_function.h
@@ -22,7 +22,7 @@ public:
DenseLambdaPeekFunction(const eval::ValueType &result_type,
const eval::TensorFunction &child,
std::shared_ptr<eval::Function const> idx_fun);
- ~DenseLambdaPeekFunction();
+ ~DenseLambdaPeekFunction() override;
eval::InterpretedFunction::Instruction compile_self(const eval::TensorEngine &engine, Stash &stash) const override;
vespalib::string idx_fun_dump() const;
bool result_is_mutable() const override { return true; }
diff --git a/eval/src/vespa/eval/tensor/dense/dense_lambda_peek_optimizer.cpp b/eval/src/vespa/eval/tensor/dense/dense_lambda_peek_optimizer.cpp
index 13544bf6c84..cb42ff86fbe 100644
--- a/eval/src/vespa/eval/tensor/dense/dense_lambda_peek_optimizer.cpp
+++ b/eval/src/vespa/eval/tensor/dense/dense_lambda_peek_optimizer.cpp
@@ -111,7 +111,6 @@ struct PeekAnalyzer {
}
}
src_idx_fun = Function::create(std::move(idx_expr), dst_type.dimension_names());
- auto str = src_idx_fun->dump_as_lambda();
}
bool step_params(std::vector<double> &params) {