diff options
author | Arne Juul <arnej@verizonmedia.com> | 2020-12-08 14:07:57 +0000 |
---|---|---|
committer | Arne Juul <arnej@verizonmedia.com> | 2020-12-08 14:07:57 +0000 |
commit | 29ed1d039ef2bf02ad3753344f39ac77a890d9c2 (patch) | |
tree | af6964f1cdbbdfa9ff87cefb8207d596351e0a18 /document | |
parent | d795c74d18dfbe406b8dec43ee42c45b19dbe424 (diff) |
move TensorPartialUpdate to document namespace
Diffstat (limited to 'document')
8 files changed, 9 insertions, 8 deletions
diff --git a/document/src/tests/tensor_fieldvalue/partial_add/partial_add_test.cpp b/document/src/tests/tensor_fieldvalue/partial_add/partial_add_test.cpp index db391a5b889..95597204657 100644 --- a/document/src/tests/tensor_fieldvalue/partial_add/partial_add_test.cpp +++ b/document/src/tests/tensor_fieldvalue/partial_add/partial_add_test.cpp @@ -8,6 +8,7 @@ #include <vespa/vespalib/gtest/gtest.h> #include <optional> +using namespace document; using namespace vespalib; using namespace vespalib::eval; using namespace vespalib::eval::test; @@ -43,7 +44,7 @@ Value::UP try_partial_add(const TensorSpec &a, const TensorSpec &b) { const auto &factory = SimpleValueBuilderFactory::get(); auto lhs = value_from_spec(a, factory); auto rhs = value_from_spec(b, factory); - return tensor::TensorPartialUpdate::add(*lhs, *rhs, factory); + return TensorPartialUpdate::add(*lhs, *rhs, factory); } TensorSpec perform_partial_add(const TensorSpec &a, const TensorSpec &b) { diff --git a/document/src/tests/tensor_fieldvalue/partial_modify/partial_modify_test.cpp b/document/src/tests/tensor_fieldvalue/partial_modify/partial_modify_test.cpp index a4562c09e50..fbb9ed75e46 100644 --- a/document/src/tests/tensor_fieldvalue/partial_modify/partial_modify_test.cpp +++ b/document/src/tests/tensor_fieldvalue/partial_modify/partial_modify_test.cpp @@ -8,6 +8,7 @@ #include <vespa/vespalib/gtest/gtest.h> #include <optional> +using namespace document; using namespace vespalib; using namespace vespalib::eval; using namespace vespalib::eval::test; @@ -58,7 +59,7 @@ Value::UP try_partial_modify(const TensorSpec &a, const TensorSpec &b, join_fun_ const auto &factory = SimpleValueBuilderFactory::get(); auto lhs = value_from_spec(a, factory); auto rhs = value_from_spec(b, factory); - return tensor::TensorPartialUpdate::modify(*lhs, fun, *rhs, factory); + return TensorPartialUpdate::modify(*lhs, fun, *rhs, factory); } TensorSpec perform_partial_modify(const TensorSpec &a, const TensorSpec &b, join_fun_t fun) { diff --git a/document/src/tests/tensor_fieldvalue/partial_remove/partial_remove_test.cpp b/document/src/tests/tensor_fieldvalue/partial_remove/partial_remove_test.cpp index 7b5b17b9cf8..79237963475 100644 --- a/document/src/tests/tensor_fieldvalue/partial_remove/partial_remove_test.cpp +++ b/document/src/tests/tensor_fieldvalue/partial_remove/partial_remove_test.cpp @@ -8,6 +8,7 @@ #include <vespa/vespalib/gtest/gtest.h> #include <optional> +using namespace document; using namespace vespalib; using namespace vespalib::eval; using namespace vespalib::eval::test; @@ -51,7 +52,7 @@ Value::UP try_partial_remove(const TensorSpec &a, const TensorSpec &b) { const auto &factory = SimpleValueBuilderFactory::get(); auto lhs = value_from_spec(a, factory); auto rhs = value_from_spec(b, factory); - return tensor::TensorPartialUpdate::remove(*lhs, *rhs, factory); + return TensorPartialUpdate::remove(*lhs, *rhs, factory); } TensorSpec perform_partial_remove(const TensorSpec &a, const TensorSpec &b) { diff --git a/document/src/vespa/document/update/tensor_add_update.cpp b/document/src/vespa/document/update/tensor_add_update.cpp index 8846ec2fc0a..c8ce728172e 100644 --- a/document/src/vespa/document/update/tensor_add_update.cpp +++ b/document/src/vespa/document/update/tensor_add_update.cpp @@ -21,7 +21,6 @@ using vespalib::IllegalArgumentException; using vespalib::IllegalStateException; using vespalib::make_string; using vespalib::eval::FastValueBuilderFactory; -using vespalib::tensor::TensorPartialUpdate; namespace document { diff --git a/document/src/vespa/document/update/tensor_modify_update.cpp b/document/src/vespa/document/update/tensor_modify_update.cpp index bc4085ec4fa..f7fca784ab2 100644 --- a/document/src/vespa/document/update/tensor_modify_update.cpp +++ b/document/src/vespa/document/update/tensor_modify_update.cpp @@ -23,7 +23,6 @@ using vespalib::IllegalStateException; using vespalib::make_string; using vespalib::eval::ValueType; using vespalib::eval::FastValueBuilderFactory; -using vespalib::tensor::TensorPartialUpdate; using join_fun_t = double (*)(double, double); diff --git a/document/src/vespa/document/update/tensor_partial_update.cpp b/document/src/vespa/document/update/tensor_partial_update.cpp index 9bf243602dd..fbc60cc09af 100644 --- a/document/src/vespa/document/update/tensor_partial_update.cpp +++ b/document/src/vespa/document/update/tensor_partial_update.cpp @@ -11,9 +11,10 @@ #include <vespa/log/log.h> LOG_SETUP(".eval.tensor.partial_update"); +using namespace vespalib; using namespace vespalib::eval; -namespace vespalib::tensor { +namespace document { namespace { diff --git a/document/src/vespa/document/update/tensor_partial_update.h b/document/src/vespa/document/update/tensor_partial_update.h index b3e9d32fca8..55340de18f8 100644 --- a/document/src/vespa/document/update/tensor_partial_update.h +++ b/document/src/vespa/document/update/tensor_partial_update.h @@ -6,7 +6,7 @@ #include <vespa/eval/eval/value.h> #include <vespa/eval/eval/operation.h> -namespace vespalib::tensor { +namespace document { struct TensorPartialUpdate { using join_fun_t = vespalib::eval::operation::op2_t; diff --git a/document/src/vespa/document/update/tensor_remove_update.cpp b/document/src/vespa/document/update/tensor_remove_update.cpp index c9ff1a462c5..b3a7e93c86a 100644 --- a/document/src/vespa/document/update/tensor_remove_update.cpp +++ b/document/src/vespa/document/update/tensor_remove_update.cpp @@ -20,7 +20,6 @@ using vespalib::make_string; using vespalib::eval::Value; using vespalib::eval::ValueType; using vespalib::eval::FastValueBuilderFactory; -using vespalib::tensor::TensorPartialUpdate; namespace document { |