aboutsummaryrefslogtreecommitdiffstats
path: root/eval/src/tests/instruction/dense_multi_matmul_function
diff options
context:
space:
mode:
authorArne Juul <arnej@verizonmedia.com>2020-11-24 20:35:16 +0000
committerArne Juul <arnej@verizonmedia.com>2020-11-27 07:07:15 +0000
commitfa7208968fc8ac2aa6e832925d615fcd9e8fd4a6 (patch)
tree0880a247e24bba5bf1dfbc331538159d1a03fb78 /eval/src/tests/instruction/dense_multi_matmul_function
parent127115efbaed70330cdde3d0b7d5032bed1f91aa (diff)
test with FastValue instead of DefaultTensorEngine
Diffstat (limited to 'eval/src/tests/instruction/dense_multi_matmul_function')
-rw-r--r--eval/src/tests/instruction/dense_multi_matmul_function/dense_multi_matmul_function_test.cpp23
1 files changed, 0 insertions, 23 deletions
diff --git a/eval/src/tests/instruction/dense_multi_matmul_function/dense_multi_matmul_function_test.cpp b/eval/src/tests/instruction/dense_multi_matmul_function/dense_multi_matmul_function_test.cpp
index 8f4a06b2335..ac3abe4f05e 100644
--- a/eval/src/tests/instruction/dense_multi_matmul_function/dense_multi_matmul_function_test.cpp
+++ b/eval/src/tests/instruction/dense_multi_matmul_function/dense_multi_matmul_function_test.cpp
@@ -6,7 +6,6 @@
#include <vespa/eval/eval/test/eval_fixture.h>
#include <vespa/eval/eval/test/tensor_model.hpp>
#include <vespa/eval/instruction/dense_multi_matmul_function.h>
-#include <vespa/eval/tensor/default_tensor_engine.h>
#include <vespa/vespalib/testkit/test_kit.h>
#include <vespa/vespalib/util/stash.h>
#include <vespa/vespalib/util/stringfmt.h>
@@ -16,7 +15,6 @@ using namespace vespalib::eval;
using namespace vespalib::eval::test;
using namespace vespalib::eval::tensor_function;
-const TensorEngine &old_engine = tensor::DefaultTensorEngine::ref();
const ValueBuilderFactory &prod_factory = FastValueBuilderFactory::get();
EvalFixture::ParamRepo make_params() {
@@ -54,20 +52,6 @@ void verify_optimized(const vespalib::string &expr,
EXPECT_EQUAL(info[0]->matmul_cnt(), matmul_cnt);
EXPECT_EQUAL(info[0]->lhs_common_inner(), lhs_inner);
EXPECT_EQUAL(info[0]->rhs_common_inner(), rhs_inner);
-
- EvalFixture old_slow_fixture(old_engine, expr, param_repo, false);
- EvalFixture old_fixture(old_engine, expr, param_repo, true);
- EXPECT_EQUAL(old_fixture.result(), EvalFixture::ref(expr, param_repo));
- EXPECT_EQUAL(old_fixture.result(), old_slow_fixture.result());
- info = old_fixture.find_all<DenseMultiMatMulFunction>();
- ASSERT_EQUAL(info.size(), 1u);
- EXPECT_TRUE(info[0]->result_is_mutable());
- EXPECT_EQUAL(info[0]->lhs_size(), lhs_size);
- EXPECT_EQUAL(info[0]->common_size(), common_size);
- EXPECT_EQUAL(info[0]->rhs_size(), rhs_size);
- EXPECT_EQUAL(info[0]->matmul_cnt(), matmul_cnt);
- EXPECT_EQUAL(info[0]->lhs_common_inner(), lhs_inner);
- EXPECT_EQUAL(info[0]->rhs_common_inner(), rhs_inner);
}
void verify_not_optimized(const vespalib::string &expr) {
@@ -77,13 +61,6 @@ void verify_not_optimized(const vespalib::string &expr) {
EXPECT_EQUAL(fixture.result(), slow_fixture.result());
auto info = fixture.find_all<DenseMultiMatMulFunction>();
EXPECT_TRUE(info.empty());
-
- EvalFixture old_slow_fixture(old_engine, expr, param_repo, false);
- EvalFixture old_fixture(old_engine, expr, param_repo, true);
- EXPECT_EQUAL(old_fixture.result(), EvalFixture::ref(expr, param_repo));
- EXPECT_EQUAL(old_fixture.result(), old_slow_fixture.result());
- info = old_fixture.find_all<DenseMultiMatMulFunction>();
- EXPECT_TRUE(info.empty());
}
TEST("require that multi matmul can be optimized") {