diff options
author | Håvard Pettersen <havardpe@oath.com> | 2018-03-01 11:14:06 +0000 |
---|---|---|
committer | Håvard Pettersen <havardpe@oath.com> | 2018-03-01 11:14:06 +0000 |
commit | f39c0879731a37a904b5bfff7a974aace4743cc9 (patch) | |
tree | b8d3da7a0daf7fe595a13f7681bea754278d703a /eval/src/tests | |
parent | fa1f4c41ec36b8aa8867d6bb8540cd0bb3cced62 (diff) |
added inplace map operation for mutable concrete dense tensors
also added support for specifying mutable inputs in evaluation fixture
Diffstat (limited to 'eval/src/tests')
-rw-r--r-- | eval/src/tests/tensor/dense_inplace_map_function/CMakeLists.txt | 8 | ||||
-rw-r--r-- | eval/src/tests/tensor/dense_inplace_map_function/dense_inplace_map_function_test.cpp | 79 |
2 files changed, 87 insertions, 0 deletions
diff --git a/eval/src/tests/tensor/dense_inplace_map_function/CMakeLists.txt b/eval/src/tests/tensor/dense_inplace_map_function/CMakeLists.txt new file mode 100644 index 00000000000..3bd1dbaf271 --- /dev/null +++ b/eval/src/tests/tensor/dense_inplace_map_function/CMakeLists.txt @@ -0,0 +1,8 @@ +# Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +vespa_add_executable(eval_dense_inplace_map_function_test_app TEST + SOURCES + dense_inplace_map_function_test.cpp + DEPENDS + vespaeval +) +vespa_add_test(NAME eval_dense_inplace_map_function_test_app COMMAND eval_dense_inplace_map_function_test_app) diff --git a/eval/src/tests/tensor/dense_inplace_map_function/dense_inplace_map_function_test.cpp b/eval/src/tests/tensor/dense_inplace_map_function/dense_inplace_map_function_test.cpp new file mode 100644 index 00000000000..77af747a066 --- /dev/null +++ b/eval/src/tests/tensor/dense_inplace_map_function/dense_inplace_map_function_test.cpp @@ -0,0 +1,79 @@ +// Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. + +#include <vespa/vespalib/testkit/test_kit.h> +#include <vespa/eval/eval/tensor_function.h> +#include <vespa/eval/eval/simple_tensor.h> +#include <vespa/eval/eval/simple_tensor_engine.h> +#include <vespa/eval/tensor/default_tensor_engine.h> +#include <vespa/eval/tensor/dense/dense_inplace_map_function.h> +#include <vespa/eval/tensor/dense/dense_tensor.h> +#include <vespa/eval/eval/test/tensor_model.hpp> +#include <vespa/eval/eval/test/eval_fixture.h> + +#include <vespa/vespalib/util/stringfmt.h> +#include <vespa/vespalib/util/stash.h> + +using namespace vespalib; +using namespace vespalib::eval; +using namespace vespalib::eval::test; +using namespace vespalib::tensor; +using namespace vespalib::eval::tensor_function; + +const TensorEngine &prod_engine = DefaultTensorEngine::ref(); + +EvalFixture::ParamRepo make_params() { + return EvalFixture::ParamRepo() + .add("x5", spec({x(5)}, N())) + .add_mutable("_d", spec(5.0)) + .add_mutable("_x5", spec({x(5)}, N())) + .add_mutable("_x5y3", spec({x(5),y(3)}, N())) + .add_mutable("_x5_u", spec({x(5)}, N()), "tensor(x[])") + .add_mutable("_x_m", spec({x({"a", "b", "c"})}, N())); +} +EvalFixture::ParamRepo param_repo = make_params(); + +void verify_optimized(const vespalib::string &expr, size_t cnt) { + EvalFixture fixture(prod_engine, expr, param_repo, true, true); + EXPECT_EQUAL(fixture.result(), EvalFixture::ref(expr, param_repo)); + EXPECT_EQUAL(fixture.get_param(0), fixture.result()); + auto info = fixture.find_all<DenseInplaceMapFunction>(); + ASSERT_EQUAL(info.size(), cnt); + for (size_t i = 0; i < cnt; ++i) { + EXPECT_TRUE(info[i]->result_is_mutable()); + } +} + +void verify_not_optimized(const vespalib::string &expr) { + EvalFixture fixture(prod_engine, expr, param_repo, true, true); + EXPECT_EQUAL(fixture.result(), EvalFixture::ref(expr, param_repo)); + EXPECT_NOT_EQUAL(fixture.get_param(0), fixture.result()); + auto info = fixture.find_all<DenseInplaceMapFunction>(); + EXPECT_TRUE(info.empty()); +} + +TEST("require that mutable dense concrete tensors are optimized") { + TEST_DO(verify_optimized("map(_x5,f(x)(x+10))", 1)); + TEST_DO(verify_optimized("map(_x5y3,f(x)(x+10))", 1)); +} + +TEST("require that inplace map operations can be chained") { + TEST_DO(verify_optimized("map(map(_x5,f(x)(x+10)),f(x)(x-5))", 2)); +} + +TEST("require that abstract tensors are not optimized") { + TEST_DO(verify_not_optimized("map(_x5_u,f(x)(x+10))")); +} + +TEST("require that non-mutable tensors are not optimized") { + TEST_DO(verify_not_optimized("map(x5,f(x)(x+10))")); +} + +TEST("require that scalar values are not optimized") { + TEST_DO(verify_not_optimized("map(_d,f(x)(x+10))")); +} + +TEST("require that mapped tensors are not optimized") { + TEST_DO(verify_not_optimized("map(_x_m,f(x)(x+10))")); +} + +TEST_MAIN() { TEST_RUN_ALL(); } |