summaryrefslogtreecommitdiffstats
path: root/eval
diff options
context:
space:
mode:
authorArne Juul <arnej@verizonmedia.com>2020-11-03 14:53:58 +0000
committerArne Juul <arnej@verizonmedia.com>2020-11-03 15:59:06 +0000
commitad8787ce2fe985bd5dd305280a1d7b07fab6504c (patch)
tree7ebd5d0df28566f85ea1d7b8987f3caa1d9abff9 /eval
parent1bb61817d751db52c6781ec7737dd083c9e9efad (diff)
test with simple factory also
Diffstat (limited to 'eval')
-rw-r--r--eval/src/tests/eval/tensor_lambda/tensor_lambda_test.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/eval/src/tests/eval/tensor_lambda/tensor_lambda_test.cpp b/eval/src/tests/eval/tensor_lambda/tensor_lambda_test.cpp
index c8091fd7c6e..00956a96b1c 100644
--- a/eval/src/tests/eval/tensor_lambda/tensor_lambda_test.cpp
+++ b/eval/src/tests/eval/tensor_lambda/tensor_lambda_test.cpp
@@ -4,6 +4,8 @@
#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/eval/simple_value.h>
+#include <vespa/eval/eval/fast_value.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_cell_range_function.h>
@@ -40,6 +42,7 @@ std::ostream &operator<<(std::ostream &os, EvalMode eval_mode)
}
const TensorEngine &prod_engine = DefaultTensorEngine::ref();
+const ValueBuilderFactory &simple_factory = SimpleValueBuilderFactory::get();
EvalFixture::ParamRepo make_params() {
return EvalFixture::ParamRepo()
@@ -59,7 +62,9 @@ template <typename T, typename F>
void verify_impl(const vespalib::string &expr, const vespalib::string &expect, F &&inspect) {
EvalFixture fixture(prod_engine, expr, param_repo, true);
EvalFixture slow_fixture(prod_engine, expr, param_repo, false);
+ EvalFixture simple_factory_fixture(simple_factory, expr, param_repo, false);
EXPECT_EQUAL(fixture.result(), slow_fixture.result());
+ EXPECT_EQUAL(fixture.result(), simple_factory_fixture.result());
EXPECT_EQUAL(fixture.result(), EvalFixture::ref(expr, param_repo));
EXPECT_EQUAL(fixture.result(), EvalFixture::ref(expect, param_repo));
auto info = fixture.find_all<T>();