diff options
Diffstat (limited to 'eval')
8 files changed, 20 insertions, 7 deletions
diff --git a/eval/src/tests/eval/tensor_function/tensor_function_test.cpp b/eval/src/tests/eval/tensor_function/tensor_function_test.cpp index cfaef979ed0..39f73637749 100644 --- a/eval/src/tests/eval/tensor_function/tensor_function_test.cpp +++ b/eval/src/tests/eval/tensor_function/tensor_function_test.cpp @@ -20,6 +20,7 @@ struct EvalCtx : TensorFunction::Input { std::map<size_t, Value::UP> tensors; EvalCtx(const TensorEngine &engine_in) : engine(engine_in), stash(), neg(), error(), tensors() {} + ~EvalCtx() { } void add_tensor(std::unique_ptr<Tensor> tensor, size_t id) { tensors.emplace(id, std::make_unique<TensorValue>(std::move(tensor))); } diff --git a/eval/src/vespa/eval/eval/simple_tensor.h b/eval/src/vespa/eval/eval/simple_tensor.h index 73399ae527f..51b34813456 100644 --- a/eval/src/vespa/eval/eval/simple_tensor.h +++ b/eval/src/vespa/eval/eval/simple_tensor.h @@ -2,14 +2,15 @@ #pragma once -#include <vespa/vespalib/stllike/string.h> -#include <vespa/vespalib/util/stash.h> -#include <memory> -#include <map> #include "value_type.h" #include "tensor.h" #include "tensor_spec.h" #include "aggr.h" +#include <vespa/vespalib/stllike/string.h> +#include <vespa/vespalib/util/stash.h> +#include <memory> +#include <map> +#include <functional> namespace vespalib { diff --git a/eval/src/vespa/eval/eval/tensor_engine.h b/eval/src/vespa/eval/eval/tensor_engine.h index 92926344e0e..4b1d8fe4684 100644 --- a/eval/src/vespa/eval/eval/tensor_engine.h +++ b/eval/src/vespa/eval/eval/tensor_engine.h @@ -2,12 +2,13 @@ #pragma once -#include <memory> -#include <vector> -#include <vespa/vespalib/stllike/string.h> #include "value_type.h" #include "tensor_function.h" #include "aggr.h" +#include <vespa/vespalib/stllike/string.h> +#include <memory> +#include <vector> +#include <functional> namespace vespalib { diff --git a/eval/src/vespa/eval/eval/tensor_spec.cpp b/eval/src/vespa/eval/eval/tensor_spec.cpp index dfd8b06bb52..ac59f0d4424 100644 --- a/eval/src/vespa/eval/eval/tensor_spec.cpp +++ b/eval/src/vespa/eval/eval/tensor_spec.cpp @@ -12,6 +12,9 @@ TensorSpec::TensorSpec(const vespalib::string &type_spec) _cells() { } +TensorSpec::TensorSpec(const TensorSpec &) = default; +TensorSpec & TensorSpec::operator = (const TensorSpec &) = default; + TensorSpec::~TensorSpec() { } vespalib::string diff --git a/eval/src/vespa/eval/eval/tensor_spec.h b/eval/src/vespa/eval/eval/tensor_spec.h index 4f615d21906..268b870aab9 100644 --- a/eval/src/vespa/eval/eval/tensor_spec.h +++ b/eval/src/vespa/eval/eval/tensor_spec.h @@ -55,6 +55,8 @@ private: Cells _cells; public: TensorSpec(const vespalib::string &type_spec); + TensorSpec(const TensorSpec &); + TensorSpec & operator = (const TensorSpec &); ~TensorSpec(); TensorSpec &add(const Address &address, double value) { _cells.emplace(address, value); diff --git a/eval/src/vespa/eval/eval/test/tensor_conformance.cpp b/eval/src/vespa/eval/eval/test/tensor_conformance.cpp index 3247457bc18..74dfeaebe31 100644 --- a/eval/src/vespa/eval/eval/test/tensor_conformance.cpp +++ b/eval/src/vespa/eval/eval/test/tensor_conformance.cpp @@ -95,6 +95,7 @@ struct SkipNth : Mask { struct Bits : Mask { std::vector<bool> bits; Bits(const std::vector<bool> &bits_in) : bits(bits_in) {} + ~Bits() { } bool operator[](size_t i) const override { ASSERT_LESS(i, bits.size()); return bits[i]; diff --git a/eval/src/vespa/eval/tensor/dense/dense_tensor_builder.cpp b/eval/src/vespa/eval/tensor/dense/dense_tensor_builder.cpp index 872be49f9b4..a00537ffa50 100644 --- a/eval/src/vespa/eval/tensor/dense/dense_tensor_builder.cpp +++ b/eval/src/vespa/eval/tensor/dense/dense_tensor_builder.cpp @@ -100,6 +100,9 @@ DenseTensorBuilder::DenseTensorBuilder() { } +DenseTensorBuilder::~DenseTensorBuilder() { +} + DenseTensorBuilder::Dimension DenseTensorBuilder::defineDimension(const vespalib::string &dimension, size_t dimensionSize) 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 722e7835d32..0a8a33f4c2d 100644 --- a/eval/src/vespa/eval/tensor/dense/dense_tensor_builder.h +++ b/eval/src/vespa/eval/tensor/dense/dense_tensor_builder.h @@ -30,6 +30,7 @@ private: public: DenseTensorBuilder(); + ~DenseTensorBuilder(); Dimension defineDimension(const vespalib::string &dimension, size_t dimensionSize); DenseTensorBuilder &addLabel(Dimension dimension, size_t label); |