diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2020-02-23 23:46:48 +0000 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2020-02-23 23:46:48 +0000 |
commit | d2c9bd6588e23b449c4b672bec023ddb535bc9ec (patch) | |
tree | 125cc501bdba4d13ed6e24b766fd6e71c46c22af /eval/src | |
parent | 0d90251fe2dee64524836751b9d27dc71e3ab2e1 (diff) |
- Add debug logging.
- std::make_unique
- Reduce code visibility.
Diffstat (limited to 'eval/src')
-rw-r--r-- | eval/src/vespa/eval/eval/interpreted_function.cpp | 21 | ||||
-rw-r--r-- | eval/src/vespa/eval/eval/interpreted_function.h | 6 | ||||
-rw-r--r-- | eval/src/vespa/eval/eval/lazy_params.cpp | 15 | ||||
-rw-r--r-- | eval/src/vespa/eval/eval/tensor_function.h | 13 | ||||
-rw-r--r-- | eval/src/vespa/eval/eval/value.h | 11 |
5 files changed, 24 insertions, 42 deletions
diff --git a/eval/src/vespa/eval/eval/interpreted_function.cpp b/eval/src/vespa/eval/eval/interpreted_function.cpp index 0a630a3e20a..ec28604fd87 100644 --- a/eval/src/vespa/eval/eval/interpreted_function.cpp +++ b/eval/src/vespa/eval/eval/interpreted_function.cpp @@ -3,21 +3,16 @@ #include "interpreted_function.h" #include "node_visitor.h" #include "node_traverser.h" -#include "check_type.h" -#include "tensor_spec.h" -#include "operation.h" #include "tensor_nodes.h" #include "tensor_engine.h" +#include "make_tensor_function.h" +#include "compile_tensor_function.h" #include <vespa/vespalib/util/classname.h> #include <vespa/eval/eval/llvm/compile_cache.h> #include <vespa/vespalib/util/benchmark_timer.h> #include <set> -#include "make_tensor_function.h" -#include "compile_tensor_function.h" - -namespace vespalib { -namespace eval { +namespace vespalib::eval { namespace { @@ -42,11 +37,12 @@ InterpretedFunction::State::State(const TensorEngine &engine_in) params(nullptr), stash(), stack(), - program_offset(0) + program_offset(0), + if_cnt(0) { } -InterpretedFunction::State::~State() {} +InterpretedFunction::State::~State() = default; void InterpretedFunction::State::init(const LazyParams ¶ms_in) { @@ -82,7 +78,7 @@ InterpretedFunction::InterpretedFunction(const TensorEngine &engine, const nodes _program = compile_tensor_function(optimized, _stash); } -InterpretedFunction::~InterpretedFunction() {} +InterpretedFunction::~InterpretedFunction() = default; const Value & InterpretedFunction::eval(Context &ctx, const LazyParams ¶ms) const @@ -123,5 +119,4 @@ InterpretedFunction::detect_issues(const Function &function) return Function::Issues(std::move(checker.issues)); } -} // namespace vespalib::eval -} // namespace vespalib +} diff --git a/eval/src/vespa/eval/eval/interpreted_function.h b/eval/src/vespa/eval/eval/interpreted_function.h index e3e8d18b44f..e638ccffcea 100644 --- a/eval/src/vespa/eval/eval/interpreted_function.h +++ b/eval/src/vespa/eval/eval/interpreted_function.h @@ -7,8 +7,7 @@ #include "lazy_params.h" #include <vespa/vespalib/util/stash.h> -namespace vespalib { -namespace eval { +namespace vespalib::eval { namespace nodes { struct Node; } struct TensorEngine; @@ -107,5 +106,4 @@ public: static Function::Issues detect_issues(const Function &function); }; -} // namespace vespalib::eval -} // namespace vespalib +} diff --git a/eval/src/vespa/eval/eval/lazy_params.cpp b/eval/src/vespa/eval/eval/lazy_params.cpp index aec8cf78059..2c00c4c312b 100644 --- a/eval/src/vespa/eval/eval/lazy_params.cpp +++ b/eval/src/vespa/eval/eval/lazy_params.cpp @@ -1,19 +1,16 @@ // Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "lazy_params.h" -#include <assert.h> +#include <vespa/vespalib/util/stash.h> +#include <cassert> namespace vespalib::eval { -LazyParams::~LazyParams() -{ -} +LazyParams::~LazyParams() = default; //----------------------------------------------------------------------------- -SimpleObjectParams::~SimpleObjectParams() -{ -} +SimpleObjectParams::~SimpleObjectParams() = default; const Value & SimpleObjectParams::resolve(size_t idx, Stash &) const @@ -24,9 +21,7 @@ SimpleObjectParams::resolve(size_t idx, Stash &) const //----------------------------------------------------------------------------- -SimpleParams::~SimpleParams() -{ -} +SimpleParams::~SimpleParams() = default; const Value & SimpleParams::resolve(size_t idx, Stash &stash) const diff --git a/eval/src/vespa/eval/eval/tensor_function.h b/eval/src/vespa/eval/eval/tensor_function.h index 4b862e9ec6a..55d27fb74ea 100644 --- a/eval/src/vespa/eval/eval/tensor_function.h +++ b/eval/src/vespa/eval/eval/tensor_function.h @@ -2,20 +2,17 @@ #pragma once -#include <memory> -#include <vector> -#include <variant> -#include <vespa/vespalib/stllike/asciistream.h> -#include <vespa/vespalib/stllike/string.h> -#include <vespa/vespalib/util/arrayref.h> -#include <vespa/vespalib/util/overload.h> #include "tensor_spec.h" #include "lazy_params.h" #include "value_type.h" #include "value.h" #include "aggr.h" - #include "interpreted_function.h" +#include <vespa/vespalib/stllike/asciistream.h> +#include <vespa/vespalib/stllike/string.h> +#include <vespa/vespalib/util/arrayref.h> +#include <vespa/vespalib/util/overload.h> +#include <variant> namespace vespalib { diff --git a/eval/src/vespa/eval/eval/value.h b/eval/src/vespa/eval/eval/value.h index 6701173bcd3..cad76c93c5c 100644 --- a/eval/src/vespa/eval/eval/value.h +++ b/eval/src/vespa/eval/eval/value.h @@ -2,13 +2,11 @@ #pragma once -#include <vespa/vespalib/stllike/string.h> -#include <memory> -#include <vespa/vespalib/util/stash.h> #include "value_type.h" +#include <vespa/vespalib/util/traits.h> +#include <memory> -namespace vespalib { -namespace eval { +namespace vespalib::eval { class Tensor; @@ -40,7 +38,6 @@ public: static const ValueType &double_type() { return _type; } }; -} // namespace vespalib::eval -} // namespace vespalib +} VESPA_CAN_SKIP_DESTRUCTION(::vespalib::eval::DoubleValue); |