added dense remove dimension optimizer

3 files changed, 103 insertions, 0 deletions

diff --git a/eval/src/tests/tensor/dense_remove_dimension_optimizer/CMakeLists.txt b/eval/src/tests/tensor/dense_remove_dimension_optimizer/CMakeLists.txt
new file mode 100644
index 00000000000..c945bd31609
--- /dev/null
+++ b/eval/src/tests/tensor/dense_remove_dimension_optimizer/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_remove_dimension_optimizer_test_app TEST
+    SOURCES
+    dense_remove_dimension_optimizer_test.cpp
+    DEPENDS
+    vespaeval
+)
+vespa_add_test(NAME eval_dense_remove_dimension_optimizer_test_app COMMAND eval_dense_remove_dimension_optimizer_test_app)
diff --git a/eval/src/tests/tensor/dense_remove_dimension_optimizer/dense_remove_dimension_optimizer_test.cpp b/eval/src/tests/tensor/dense_remove_dimension_optimizer/dense_remove_dimension_optimizer_test.cpp
new file mode 100644
index 00000000000..b87393c2980
--- /dev/null
+++ b/eval/src/tests/tensor/dense_remove_dimension_optimizer/dense_remove_dimension_optimizer_test.cpp
@@ -0,0 +1,83 @@
+// 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_replace_type_function.h>
+#include <vespa/eval/tensor/dense/dense_fast_rename_optimizer.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("x1y5z1", spec({x(1),y(5),z(1)}, N()))
+        .add("x1y1z1", spec({x(1),y(1),z(1)}, N()))
+        .add("x1y5z1_u", spec({x(1),y(5),z(1)}, N()), "tensor(x[1],y[5],z[])")
+        .add("x1y5z_m", spec({x(1),y(5),z({"a"})}, N()));
+}
+EvalFixture::ParamRepo param_repo = make_params();
+
+void verify_optimized(const vespalib::string &expr) {
+    EvalFixture fixture(prod_engine, expr, param_repo, true);
+    EXPECT_EQUAL(fixture.result(), EvalFixture::ref(expr, param_repo));
+    auto info = fixture.find_all<DenseReplaceTypeFunction>();
+    EXPECT_EQUAL(info.size(), 1u);
+}
+
+void verify_not_optimized(const vespalib::string &expr) {
+    EvalFixture fixture(prod_engine, expr, param_repo, true);
+    EXPECT_EQUAL(fixture.result(), EvalFixture::ref(expr, param_repo));
+    auto info = fixture.find_all<DenseReplaceTypeFunction>();
+    EXPECT_TRUE(info.empty());
+}
+
+TEST("require that dimension removal can be optimized for appropriate aggregators") {
+    TEST_DO(verify_optimized("reduce(x1y5z1,avg,x)"));
+    TEST_DO(verify_not_optimized("reduce(x1y5z1,count,x)")); // NB
+    TEST_DO(verify_optimized("reduce(x1y5z1,prod,x)"));
+    TEST_DO(verify_optimized("reduce(x1y5z1,sum,x)"));
+    TEST_DO(verify_optimized("reduce(x1y5z1,max,x)"));
+    TEST_DO(verify_optimized("reduce(x1y5z1,min,x)"));    
+}
+
+TEST("require that multi-dimension removal can be optimized") {
+    TEST_DO(verify_optimized("reduce(x1y5z1,sum,x,z)"));
+}
+
+TEST("require that chained dimension removal can be optimized (and compacted)") {
+    TEST_DO(verify_optimized("reduce(reduce(x1y5z1,sum,x),sum,z)"));
+}
+
+TEST("require that reducing non-trivial dimension is not optimized") {
+    TEST_DO(verify_not_optimized("reduce(x1y5z1,sum,y)"));
+    TEST_DO(verify_not_optimized("reduce(x1y5z1,sum,x,y)"));
+    TEST_DO(verify_not_optimized("reduce(x1y5z1,sum,y,z)"));
+}
+
+TEST("require that full reduce is not optimized") {
+    TEST_DO(verify_not_optimized("reduce(x1y1z1,sum)"));
+    TEST_DO(verify_not_optimized("reduce(x1y1z1,sum,x,y,z)"));
+}
+
+TEST("require that inappropriate tensor types cannot be optimized") {
+    TEST_DO(verify_not_optimized("reduce(x1y5z1_u,sum,x)"));
+    TEST_DO(verify_not_optimized("reduce(x1y5z1_u,sum,z)"));
+    TEST_DO(verify_not_optimized("reduce(x1y5z_m,sum,x)"));
+    TEST_DO(verify_not_optimized("reduce(x1y5z_m,sum,z)"));
+}
+
+TEST_MAIN() { TEST_RUN_ALL(); }
diff --git a/eval/src/tests/tensor/dense_replace_type_function/dense_replace_type_function_test.cpp b/eval/src/tests/tensor/dense_replace_type_function/dense_replace_type_function_test.cpp
index 0e774be3dc3..7e6b933d7c6 100644
--- a/eval/src/tests/tensor/dense_replace_type_function/dense_replace_type_function_test.cpp
+++ b/eval/src/tests/tensor/dense_replace_type_function/dense_replace_type_function_test.cpp
@@ -64,4 +64,16 @@ TEST_F("require that DenseReplaceTypeFunction works as expected", Fixture()) {
     fprintf(stderr, "%s\n", f1.my_fun.as_string().c_str());
 }
 
+TEST("require that create_compact will collapse duplicate replace operations") {
+    Stash stash;
+    ValueType type = ValueType::double_type();
+    ChildMock leaf(type);
+    const DenseReplaceTypeFunction &a = DenseReplaceTypeFunction::create_compact(type, leaf, stash);
+    const DenseReplaceTypeFunction &b = DenseReplaceTypeFunction::create_compact(type, a, stash);
+    EXPECT_EQUAL(a.result_type(), type);
+    EXPECT_EQUAL(&a.child(), &leaf);
+    EXPECT_EQUAL(b.result_type(), type);
+    EXPECT_EQUAL(&b.child(), &leaf);
+}
+
 TEST_MAIN() { TEST_RUN_ALL(); }