diff options
author | Arne H Juul <arnej27959@users.noreply.github.com> | 2020-12-08 17:34:04 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-12-08 17:34:04 +0100 |
commit | e777d1c8ddecbeffaa55eccf336e641e80a4970d (patch) | |
tree | 6e900d46fcf44aa224fe523a748dfb1755a59ca4 /eval/src/tests/tensor | |
parent | 54d51d42fb884c7635aea518bfcaf827bc54a9d8 (diff) | |
parent | 29ed1d039ef2bf02ad3753344f39ac77a890d9c2 (diff) |
Merge pull request #15743 from vespa-engine/arnej/move-partial-update
Arnej/move partial update
Diffstat (limited to 'eval/src/tests/tensor')
6 files changed, 0 insertions, 356 deletions
diff --git a/eval/src/tests/tensor/partial_add/CMakeLists.txt b/eval/src/tests/tensor/partial_add/CMakeLists.txt deleted file mode 100644 index f0d07a8e9cf..00000000000 --- a/eval/src/tests/tensor/partial_add/CMakeLists.txt +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -vespa_add_executable(eval_partial_add_test_app TEST - SOURCES - partial_add_test.cpp - DEPENDS - vespaeval - GTest::GTest -) -vespa_add_test(NAME eval_partial_add_test_app COMMAND eval_partial_add_test_app) diff --git a/eval/src/tests/tensor/partial_add/partial_add_test.cpp b/eval/src/tests/tensor/partial_add/partial_add_test.cpp deleted file mode 100644 index 893acf07adb..00000000000 --- a/eval/src/tests/tensor/partial_add/partial_add_test.cpp +++ /dev/null @@ -1,89 +0,0 @@ -// Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. - -#include <vespa/eval/eval/simple_value.h> -#include <vespa/eval/eval/test/tensor_model.hpp> -#include <vespa/eval/eval/value_codec.h> -#include <vespa/eval/tensor/partial_update.h> -#include <vespa/vespalib/util/stringfmt.h> -#include <vespa/vespalib/gtest/gtest.h> -#include <optional> - -using namespace vespalib; -using namespace vespalib::eval; -using namespace vespalib::eval::test; - -using vespalib::make_string_short::fmt; - -std::vector<Layout> add_layouts = { - {x({"a"})}, {x({"b"})}, - {x({"a","b"})}, {x({"a","c"})}, - float_cells({x({"a","b"})}), {x({"a","c"})}, - {x({"a","b"})}, float_cells({x({"a","c"})}), - float_cells({x({"a","b"})}), float_cells({x({"a","c"})}), - {x({"a","b","c"}),y({"d","e"})}, {x({"b","f"}),y({"d","g"})}, - {x(3),y({"a","b"})}, {x(3),y({"b","c"})} -}; - -TensorSpec reference_add(const TensorSpec &a, const TensorSpec &b) { - TensorSpec result(a.type()); - for (const auto &cell: b.cells()) { - result.add(cell.first, cell.second); - } - auto end_iter = b.cells().end(); - for (const auto &cell: a.cells()) { - auto iter = b.cells().find(cell.first); - if (iter == end_iter) { - result.add(cell.first, cell.second); - } - } - return result; -} - -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); -} - -TensorSpec perform_partial_add(const TensorSpec &a, const TensorSpec &b) { - auto up = try_partial_add(a, b); - EXPECT_TRUE(up); - return spec_from_value(*up); -} - -TEST(PartialAddTest, partial_add_works_for_simple_values) { - ASSERT_TRUE((add_layouts.size() % 2) == 0); - for (size_t i = 0; i < add_layouts.size(); i += 2) { - TensorSpec lhs = spec(add_layouts[i], N()); - TensorSpec rhs = spec(add_layouts[i + 1], Div16(N())); - SCOPED_TRACE(fmt("\n===\nLHS: %s\nRHS: %s\n===\n", lhs.to_string().c_str(), rhs.to_string().c_str())); - auto expect = reference_add(lhs, rhs); - auto actual = perform_partial_add(lhs, rhs); - EXPECT_EQ(actual, expect); - } -} - -std::vector<Layout> bad_layouts = { - {x(3)}, {x(3),y(1)}, - {x(3),y(1)}, {x(3)}, - {x(3),y(3)}, {x(3),y({"a"})}, - {x(3),y({"a"})}, {x(3),y(3)}, - {x({"a"})}, {x({"a"}),y({"b"})}, - {x({"a"}),y({"b"})}, {x({"a"})}, - {x({"a"})}, {x({"a"}),y(1)} -}; - -TEST(PartialAddTest, partial_add_returns_nullptr_on_invalid_inputs) { - ASSERT_TRUE((bad_layouts.size() % 2) == 0); - for (size_t i = 0; i < bad_layouts.size(); i += 2) { - TensorSpec lhs = spec(bad_layouts[i], N()); - TensorSpec rhs = spec(bad_layouts[i + 1], Div16(N())); - SCOPED_TRACE(fmt("\n===\nLHS: %s\nRHS: %s\n===\n", lhs.to_string().c_str(), rhs.to_string().c_str())); - auto actual = try_partial_add(lhs, rhs); - auto expect = Value::UP(); - EXPECT_EQ(actual, expect); - } -} - -GTEST_MAIN_RUN_ALL_TESTS() diff --git a/eval/src/tests/tensor/partial_modify/CMakeLists.txt b/eval/src/tests/tensor/partial_modify/CMakeLists.txt deleted file mode 100644 index 42a08acaae6..00000000000 --- a/eval/src/tests/tensor/partial_modify/CMakeLists.txt +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -vespa_add_executable(eval_partial_modify_test_app TEST - SOURCES - partial_modify_test.cpp - DEPENDS - vespaeval - GTest::GTest -) -vespa_add_test(NAME eval_partial_modify_test_app COMMAND eval_partial_modify_test_app) diff --git a/eval/src/tests/tensor/partial_modify/partial_modify_test.cpp b/eval/src/tests/tensor/partial_modify/partial_modify_test.cpp deleted file mode 100644 index a1802540fa5..00000000000 --- a/eval/src/tests/tensor/partial_modify/partial_modify_test.cpp +++ /dev/null @@ -1,110 +0,0 @@ -// Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. - -#include <vespa/eval/eval/simple_value.h> -#include <vespa/eval/eval/test/tensor_model.hpp> -#include <vespa/eval/eval/value_codec.h> -#include <vespa/eval/tensor/partial_update.h> -#include <vespa/vespalib/util/stringfmt.h> -#include <vespa/vespalib/gtest/gtest.h> -#include <optional> - -using namespace vespalib; -using namespace vespalib::eval; -using namespace vespalib::eval::test; - -using vespalib::make_string_short::fmt; - -std::vector<Layout> modify_layouts = { - {x({"a"})}, {x({"a"})}, - {x({"a",""})}, {x({"b","c","d","e"})}, - {x(5)}, {x({"1","2","foo","17"})}, - {x({"a","b","c"}),y({"d","e"})}, {x({"b"}),y({"d"})}, - {x({"a","b","c"})}, {x({"b","c","d"})}, - {x(4),y({"a","b","c","d"}),z(5)}, {x({"1","2"}),y({"b","d"}),z({"1","3"})}, - {x(3),y(2)}, {x({"0","1"}),y({"0","1"})}, - {x({"a","","b"})}, {x({""})} -}; - -TensorSpec::Address sparsify(const TensorSpec::Address &input) { - TensorSpec::Address output; - for (const auto & kv : input) { - if (kv.second.is_indexed()) { - auto val = fmt("%zu", kv.second.index); - output.emplace(kv.first, val); - } else { - output.emplace(kv.first, kv.second); - } - } - return output; -} - -TensorSpec reference_modify(const TensorSpec &a, const TensorSpec &b, join_fun_t fun) { - TensorSpec result(a.type()); - auto end_iter = b.cells().end(); - for (const auto &cell: a.cells()) { - double v = cell.second; - auto sparse_addr = sparsify(cell.first); - auto iter = b.cells().find(sparse_addr); - if (iter == end_iter) { - result.add(cell.first, v); - } else { - result.add(cell.first, fun(v, iter->second)); - } - } - return result; -} - -Value::UP try_partial_modify(const TensorSpec &a, const TensorSpec &b, join_fun_t 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); -} - -TensorSpec perform_partial_modify(const TensorSpec &a, const TensorSpec &b, join_fun_t fun) { - auto up = try_partial_modify(a, b, fun); - EXPECT_TRUE(up); - return spec_from_value(*up); -} - -TEST(PartialModifyTest, partial_modify_works_for_simple_values) { - ASSERT_TRUE((modify_layouts.size() % 2) == 0); - for (size_t i = 0; i < modify_layouts.size(); i += 2) { - TensorSpec lhs = spec(modify_layouts[i], N()); - TensorSpec rhs = spec(modify_layouts[i + 1], Div16(N())); - SCOPED_TRACE(fmt("\n===\nLHS: %s\nRHS: %s\n===\n", lhs.to_string().c_str(), rhs.to_string().c_str())); - for (auto fun: {operation::Add::f, operation::Mul::f, operation::Sub::f}) { - auto expect = reference_modify(lhs, rhs, fun); - auto actual = perform_partial_modify(lhs, rhs, fun); - EXPECT_EQ(actual, expect); - } - auto fun = [](double, double keep) { return keep; }; - auto expect = reference_modify(lhs, rhs, fun); - auto actual = perform_partial_modify(lhs, rhs, fun); - EXPECT_EQ(actual, expect); - } -} - -std::vector<Layout> bad_layouts = { - {x(3)}, {x(3)}, - {x(3),y({"a"})}, {x(3),y({"a"})}, - {x({"a"})}, {x({"a"}),y({"b"})}, - {x({"a"}),y({"b"})}, {x({"a"})}, - {x({"a"})}, {x({"a"}),y(1)} -}; - -TEST(PartialModifyTest, partial_modify_returns_nullptr_on_invalid_inputs) { - ASSERT_TRUE((bad_layouts.size() % 2) == 0); - for (size_t i = 0; i < bad_layouts.size(); i += 2) { - TensorSpec lhs = spec(bad_layouts[i], N()); - TensorSpec rhs = spec(bad_layouts[i + 1], Div16(N())); - SCOPED_TRACE(fmt("\n===\nLHS: %s\nRHS: %s\n===\n", lhs.to_string().c_str(), rhs.to_string().c_str())); - for (auto fun: {operation::Add::f}) { - auto actual = try_partial_modify(lhs, rhs, fun); - auto expect = Value::UP(); - EXPECT_EQ(actual, expect); - } - } -} - -GTEST_MAIN_RUN_ALL_TESTS() diff --git a/eval/src/tests/tensor/partial_remove/CMakeLists.txt b/eval/src/tests/tensor/partial_remove/CMakeLists.txt deleted file mode 100644 index 1680324f574..00000000000 --- a/eval/src/tests/tensor/partial_remove/CMakeLists.txt +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -vespa_add_executable(eval_partial_remove_test_app TEST - SOURCES - partial_remove_test.cpp - DEPENDS - vespaeval - GTest::GTest -) -vespa_add_test(NAME eval_partial_remove_test_app COMMAND eval_partial_remove_test_app) diff --git a/eval/src/tests/tensor/partial_remove/partial_remove_test.cpp b/eval/src/tests/tensor/partial_remove/partial_remove_test.cpp deleted file mode 100644 index fef6d99519f..00000000000 --- a/eval/src/tests/tensor/partial_remove/partial_remove_test.cpp +++ /dev/null @@ -1,130 +0,0 @@ -// Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. - -#include <vespa/eval/eval/simple_value.h> -#include <vespa/eval/eval/test/tensor_model.hpp> -#include <vespa/eval/eval/value_codec.h> -#include <vespa/eval/tensor/partial_update.h> -#include <vespa/vespalib/util/stringfmt.h> -#include <vespa/vespalib/gtest/gtest.h> -#include <optional> - -using namespace vespalib; -using namespace vespalib::eval; -using namespace vespalib::eval::test; - -using vespalib::make_string_short::fmt; - -std::vector<Layout> remove_layouts = { - {x({"a"})}, {x({"b"})}, - {x({"a","b"})}, {x({"a","c"})}, - {x({"a","b"})}, {x({"a","b"})}, - float_cells({x({"a","b"})}), {x({"a","c"})}, - {x({"a","b"})}, float_cells({x({"a","c"})}), - float_cells({x({"a","b"})}), float_cells({x({"a","c"})}), - {x({"a","b","c"}),y({"d","e"})}, {x({"b","f"}),y({"d","g"})}, - {x(3),y({"a","b"})}, {y({"b","c"})} -}; - -TensorSpec::Address only_sparse(const TensorSpec::Address &input) { - TensorSpec::Address output; - for (const auto & kv : input) { - if (kv.second.is_mapped()) { - output.emplace(kv.first, kv.second); - } - } - return output; -} - -TensorSpec reference_remove(const TensorSpec &a, const TensorSpec &b) { - TensorSpec result(a.type()); - auto end_iter = b.cells().end(); - for (const auto &cell: a.cells()) { - auto iter = b.cells().find(only_sparse(cell.first)); - if (iter == end_iter) { - result.add(cell.first, cell.second); - } - } - return result; -} - -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); -} - -TensorSpec perform_partial_remove(const TensorSpec &a, const TensorSpec &b) { - auto up = try_partial_remove(a, b); - EXPECT_TRUE(up); - return spec_from_value(*up); -} - -TEST(PartialRemoveTest, partial_remove_works_for_simple_values) { - ASSERT_TRUE((remove_layouts.size() % 2) == 0); - for (size_t i = 0; i < remove_layouts.size(); i += 2) { - TensorSpec lhs = spec(remove_layouts[i], N()); - TensorSpec rhs = spec(remove_layouts[i + 1], Div16(N())); - SCOPED_TRACE(fmt("\n===\nLHS: %s\nRHS: %s\n===\n", lhs.to_string().c_str(), rhs.to_string().c_str())); - auto expect = reference_remove(lhs, rhs); - auto actual = perform_partial_remove(lhs, rhs); - EXPECT_EQ(actual, expect); - } -} - -std::vector<Layout> bad_layouts = { - {x(3)}, {x(3)}, - {x(3),y({"a"})}, {x(3)}, - {x(3),y({"a"})}, {x(3),y({"a"})}, - {x({"a"})}, {y({"a"})}, - {x({"a"})}, {x({"a"}),y({"b"})} -}; - -TEST(PartialRemoveTest, partial_remove_returns_nullptr_on_invalid_inputs) { - ASSERT_TRUE((bad_layouts.size() % 2) == 0); - for (size_t i = 0; i < bad_layouts.size(); i += 2) { - TensorSpec lhs = spec(bad_layouts[i], N()); - TensorSpec rhs = spec(bad_layouts[i + 1], Div16(N())); - SCOPED_TRACE(fmt("\n===\nLHS: %s\nRHS: %s\n===\n", lhs.to_string().c_str(), rhs.to_string().c_str())); - auto actual = try_partial_remove(lhs, rhs); - auto expect = Value::UP(); - EXPECT_EQ(actual, expect); - } -} - -void -expect_partial_remove(const TensorSpec& input, const TensorSpec& remove, const TensorSpec& exp) -{ - auto act = perform_partial_remove(input, remove); - EXPECT_EQ(exp, act); -} - -TEST(PartialRemoveTest, remove_where_address_is_not_fully_specified) { - auto input_sparse = TensorSpec("tensor(x{},y{})"). - add({{"x", "a"},{"y", "c"}}, 3.0). - add({{"x", "a"},{"y", "d"}}, 5.0). - add({{"x", "b"},{"y", "c"}}, 7.0); - - expect_partial_remove(input_sparse, TensorSpec("tensor(x{})").add({{"x", "a"}}, 1.0), - TensorSpec("tensor(x{},y{})").add({{"x", "b"},{"y", "c"}}, 7.0)); - - expect_partial_remove(input_sparse, TensorSpec("tensor(y{})").add({{"y", "c"}}, 1.0), - TensorSpec("tensor(x{},y{})").add({{"x", "a"},{"y", "d"}}, 5.0)); - - expect_partial_remove(input_sparse, TensorSpec("tensor(y{})").add({{"y", "d"}}, 1.0), - TensorSpec("tensor(x{},y{})").add({{"x", "a"},{"y", "c"}}, 3.0) - .add({{"x", "b"},{"y", "c"}}, 7.0)); - - auto input_mixed = TensorSpec("tensor(x{},y{},z[1])"). - add({{"x", "a"},{"y", "c"},{"z", 0}}, 3.0). - add({{"x", "a"},{"y", "d"},{"z", 0}}, 5.0). - add({{"x", "b"},{"y", "c"},{"z", 0}}, 7.0); - - expect_partial_remove(input_mixed,TensorSpec("tensor(x{})").add({{"x", "a"}}, 1.0), - TensorSpec("tensor(x{},y{},z[1])").add({{"x", "b"},{"y", "c"},{"z", 0}}, 7.0)); - - expect_partial_remove(input_mixed, TensorSpec("tensor(y{})").add({{"y", "c"}}, 1.0), - TensorSpec("tensor(x{},y{},z[1])").add({{"x", "a"},{"y", "d"},{"z", 0}}, 5.0)); -} - -GTEST_MAIN_RUN_ALL_TESTS() |