diff options
| author | Arne H Juul <arnej27959@users.noreply.github.com> | 2020-11-27 14:45:34 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-27 14:45:34 +0100 |
| commit | 7a1a70055770a82bf42bff668abaf011af3f6e55 (patch) | |
| tree | eaeea3d4509d44116c527a0d17b25308fdd5ec03 /document | |
| parent | 24532f5a250c2ccc42439be854858c23ab95956b (diff) | |
| parent | d6a3e072a0bcfe7999e8369f61287930a3bf1bb0 (diff) | |
Merge pull request #15505 from vespa-engine/arnej/less-use-of-eval-tensor
Arnej/less use of eval tensor
Diffstat (limited to 'document')
4 files changed, 2 insertions, 11 deletions
diff --git a/document/src/tests/tensor_fieldvalue/tensor_fieldvalue_test.cpp b/document/src/tests/tensor_fieldvalue/tensor_fieldvalue_test.cpp index 231fba93d10..067cf4ac649 100644 --- a/document/src/tests/tensor_fieldvalue/tensor_fieldvalue_test.cpp +++ b/document/src/tests/tensor_fieldvalue/tensor_fieldvalue_test.cpp @@ -9,16 +9,13 @@ LOG_SETUP("fieldvalue_test"); #include <vespa/document/fieldvalue/tensorfieldvalue.h> #include <vespa/eval/eval/engine_or_factory.h> #include <vespa/eval/eval/value.h> -#include <vespa/eval/tensor/test/test_utils.h> #include <vespa/vespalib/testkit/testapp.h> using namespace document; -using namespace vespalib::tensor; using vespalib::eval::TensorSpec; using vespalib::eval::ValueType; using vespalib::eval::EngineOrFactory; -using vespalib::tensor::test::makeTensor; namespace { @@ -33,8 +30,8 @@ vespalib::eval::Value::UP createTensor(const TensorSpec &spec) { std::unique_ptr<vespalib::eval::Value> makeSimpleTensor() { - return makeTensor<vespalib::eval::Value>(TensorSpec("tensor(x{},y{})"). - add({{"x", "4"}, {"y", "5"}}, 7)); + return EngineOrFactory::get().from_spec(TensorSpec("tensor(x{},y{})"). + add({{"x", "4"}, {"y", "5"}}, 7)); } FieldValue::UP clone(FieldValue &fv) { diff --git a/document/src/vespa/document/update/tensor_add_update.cpp b/document/src/vespa/document/update/tensor_add_update.cpp index 3ae599f22a0..d71ab7d922c 100644 --- a/document/src/vespa/document/update/tensor_add_update.cpp +++ b/document/src/vespa/document/update/tensor_add_update.cpp @@ -11,7 +11,6 @@ #include <vespa/eval/eval/value.h> #include <vespa/eval/eval/engine_or_factory.h> #include <vespa/eval/tensor/partial_update.h> -#include <vespa/eval/tensor/tensor.h> #include <vespa/vespalib/objects/nbostream.h> #include <vespa/vespalib/stllike/asciistream.h> #include <vespa/vespalib/util/stringfmt.h> diff --git a/document/src/vespa/document/update/tensor_modify_update.cpp b/document/src/vespa/document/update/tensor_modify_update.cpp index 2ff45b11b07..970550b7c88 100644 --- a/document/src/vespa/document/update/tensor_modify_update.cpp +++ b/document/src/vespa/document/update/tensor_modify_update.cpp @@ -12,8 +12,6 @@ #include <vespa/eval/eval/value.h> #include <vespa/eval/eval/engine_or_factory.h> #include <vespa/eval/tensor/partial_update.h> -#include <vespa/eval/tensor/tensor.h> -#include <vespa/eval/tensor/cell_values.h> #include <vespa/vespalib/objects/nbostream.h> #include <vespa/vespalib/stllike/asciistream.h> #include <vespa/vespalib/util/stringfmt.h> diff --git a/document/src/vespa/document/update/tensor_remove_update.cpp b/document/src/vespa/document/update/tensor_remove_update.cpp index 688f9cf5399..f04728e95a4 100644 --- a/document/src/vespa/document/update/tensor_remove_update.cpp +++ b/document/src/vespa/document/update/tensor_remove_update.cpp @@ -8,9 +8,6 @@ #include <vespa/document/serialization/vespadocumentdeserializer.h> #include <vespa/eval/eval/engine_or_factory.h> #include <vespa/eval/tensor/partial_update.h> -#include <vespa/eval/tensor/tensor.h> -#include <vespa/eval/tensor/cell_values.h> -#include <vespa/eval/tensor/sparse/sparse_tensor.h> #include <vespa/eval/eval/value.h> #include <vespa/vespalib/objects/nbostream.h> #include <vespa/vespalib/util/xmlstream.h> |