summaryrefslogtreecommitdiffstats
path: root/eval
diff options
context:
space:
mode:
authorHåvard Pettersen <havardpe@oath.com>2018-03-02 13:44:09 +0000
committerHåvard Pettersen <havardpe@oath.com>2018-03-02 13:44:09 +0000
commit51ae60d41ddd496b10ad61e9af350064643ec749 (patch)
treedad429eb19acb833ae9eb23974b37bc0b496f74e /eval
parentdeeceb6caa231e0045bed187f9267316d695f1bd (diff)
move test
Diffstat (limited to 'eval')
-rw-r--r--eval/src/tests/tensor/dense_inplace_join_function/dense_inplace_join_function_test.cpp5
-rw-r--r--eval/src/tests/tensor/dense_xw_product_function/dense_xw_product_function_test.cpp1
2 files changed, 1 insertions, 5 deletions
diff --git a/eval/src/tests/tensor/dense_inplace_join_function/dense_inplace_join_function_test.cpp b/eval/src/tests/tensor/dense_inplace_join_function/dense_inplace_join_function_test.cpp
index daa84bd226f..c794b81f573 100644
--- a/eval/src/tests/tensor/dense_inplace_join_function/dense_inplace_join_function_test.cpp
+++ b/eval/src/tests/tensor/dense_inplace_join_function/dense_inplace_join_function_test.cpp
@@ -38,7 +38,6 @@ EvalFixture::ParamRepo make_params() {
.add("con_x5_A", spec({x(5)}, seq))
.add("con_x5_B", spec({x(5)}, seq))
.add("con_x5_C", spec({x(5)}, seq))
- .add("con_y3_A", spec({y(3)}, seq))
.add("con_x5y3_A", spec({x(5),y(3)}, seq))
.add("con_x5y3_B", spec({x(5),y(3)}, seq))
.add_mutable("mut_dbl_A", spec(1.5))
@@ -145,8 +144,4 @@ TEST("require that mapped tensors are not optimized") {
TEST_DO(verify_not_optimized("mut_x_sparse+mut_x_sparse"));
}
-TEST("require that output from xw product can be optimized") {
- TEST_DO(verify_optimized("reduce(con_x5_A*con_x5y3_B,sum,x)+con_y3_A", 1, -1));
-}
-
TEST_MAIN() { TEST_RUN_ALL(); }
diff --git a/eval/src/tests/tensor/dense_xw_product_function/dense_xw_product_function_test.cpp b/eval/src/tests/tensor/dense_xw_product_function/dense_xw_product_function_test.cpp
index 01abad343ae..536dd95de9c 100644
--- a/eval/src/tests/tensor/dense_xw_product_function/dense_xw_product_function_test.cpp
+++ b/eval/src/tests/tensor/dense_xw_product_function/dense_xw_product_function_test.cpp
@@ -63,6 +63,7 @@ void verify_optimized(const vespalib::string &expr, size_t vec_size, size_t res_
EXPECT_EQUAL(fixture.result(), EvalFixture::ref(expr, param_repo));
auto info = fixture.find_all<DenseXWProductFunction>();
ASSERT_EQUAL(info.size(), 1u);
+ EXPECT_TRUE(info[0]->result_is_mutable());
EXPECT_EQUAL(info[0]->vectorSize(), vec_size);
EXPECT_EQUAL(info[0]->resultSize(), res_size);
EXPECT_EQUAL(info[0]->matrixHasCommonDimensionInnermost(), happy);