test with FastValue instead of DefaultTensorEngine

6 files changed, 0 insertions, 116 deletions

diff --git a/eval/src/tests/instruction/dense_dot_product_function/dense_dot_product_function_test.cpp b/eval/src/tests/instruction/dense_dot_product_function/dense_dot_product_function_test.cpp
index ff4a92d4fff..82a0baa8741 100644
--- a/eval/src/tests/instruction/dense_dot_product_function/dense_dot_product_function_test.cpp
+++ b/eval/src/tests/instruction/dense_dot_product_function/dense_dot_product_function_test.cpp
@@ -5,7 +5,6 @@
 #include <vespa/eval/eval/test/eval_fixture.h>
 #include <vespa/eval/eval/test/tensor_model.hpp>
 #include <vespa/eval/instruction/dense_dot_product_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>
@@ -17,7 +16,6 @@ using namespace vespalib;
 using namespace vespalib::eval;
 using namespace vespalib::eval::test;
 
-const TensorEngine &old_engine = tensor::DefaultTensorEngine::ref();
 const ValueBuilderFactory &prod_factory = FastValueBuilderFactory::get();
 
 struct MyVecSeq : Sequence {
@@ -51,12 +49,6 @@ void check_gen_with_result(size_t l, size_t r, double wanted) {
     EXPECT_EQUAL(evaluator.result(), EvalFixture::ref(expr, param_repo));
     auto info = evaluator.find_all<DenseDotProductFunction>();
     EXPECT_EQUAL(info.size(), 1u);
-
-    EvalFixture old_evaluator(old_engine, expr, param_repo, true);
-    EXPECT_EQUAL(spec(wanted), old_evaluator.result());
-    EXPECT_EQUAL(old_evaluator.result(), EvalFixture::ref(expr, param_repo));
-    info = old_evaluator.find_all<DenseDotProductFunction>();
-    EXPECT_EQUAL(info.size(), 1u);
 };
 
 // this should not be possible to set up:
@@ -120,12 +112,6 @@ void assertOptimized(const vespalib::string &expr) {
     auto info = fixture.find_all<DenseDotProductFunction>();
     ASSERT_EQUAL(info.size(), 1u);
     EXPECT_TRUE(info[0]->result_is_mutable());
-
-    EvalFixture old_fixture(old_engine, expr, param_repo, true);
-    EXPECT_EQUAL(old_fixture.result(), EvalFixture::ref(expr, param_repo));
-    info = old_fixture.find_all<DenseDotProductFunction>();
-    ASSERT_EQUAL(info.size(), 1u);
-    EXPECT_TRUE(info[0]->result_is_mutable());
 }
 
 void assertNotOptimized(const vespalib::string &expr) {
@@ -133,11 +119,6 @@ void assertNotOptimized(const vespalib::string &expr) {
     EXPECT_EQUAL(fixture.result(), EvalFixture::ref(expr, param_repo));
     auto info = fixture.find_all<DenseDotProductFunction>();
     EXPECT_TRUE(info.empty());
-
-    EvalFixture old_fixture(old_engine, expr, param_repo, true);
-    EXPECT_EQUAL(old_fixture.result(), EvalFixture::ref(expr, param_repo));
-    info = old_fixture.find_all<DenseDotProductFunction>();
-    EXPECT_TRUE(info.empty());
 }
 
 TEST("require that dot product works with tensor function") {
diff --git a/eval/src/tests/instruction/dense_matmul_function/dense_matmul_function_test.cpp b/eval/src/tests/instruction/dense_matmul_function/dense_matmul_function_test.cpp
index 1269d82a1e0..0bafa450ca2 100644
--- a/eval/src/tests/instruction/dense_matmul_function/dense_matmul_function_test.cpp
+++ b/eval/src/tests/instruction/dense_matmul_function/dense_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_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() {
@@ -46,19 +44,6 @@ void verify_optimized(const vespalib::string &expr,
     EXPECT_EQUAL(info[0]->rhs_size(), rhs_size);
     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<DenseMatMulFunction>();
-    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]->lhs_common_inner(), lhs_inner);
-    EXPECT_EQUAL(info[0]->rhs_common_inner(), rhs_inner);
 }
 
 void verify_not_optimized(const vespalib::string &expr) {
@@ -68,13 +53,6 @@ void verify_not_optimized(const vespalib::string &expr) {
     EXPECT_EQUAL(fixture.result(), slow_fixture.result());
     auto info = fixture.find_all<DenseMatMulFunction>();
     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<DenseMatMulFunction>();
-    EXPECT_TRUE(info.empty());
 }
 
 TEST("require that matmul can be optimized") {
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") {
diff --git a/eval/src/tests/instruction/dense_simple_expand_function/dense_simple_expand_function_test.cpp b/eval/src/tests/instruction/dense_simple_expand_function/dense_simple_expand_function_test.cpp
index bf9b8a181aa..975088f2bff 100644
--- a/eval/src/tests/instruction/dense_simple_expand_function/dense_simple_expand_function_test.cpp
+++ b/eval/src/tests/instruction/dense_simple_expand_function/dense_simple_expand_function_test.cpp
@@ -4,7 +4,6 @@
 #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/instruction/dense_simple_expand_function.h>
 #include <vespa/eval/eval/test/eval_fixture.h>
 #include <vespa/eval/eval/test/tensor_model.hpp>
@@ -17,7 +16,6 @@ using namespace vespalib::eval::tensor_function;
 
 using Inner = DenseSimpleExpandFunction::Inner;
 
-const TensorEngine &old_engine = tensor::DefaultTensorEngine::ref();
 const ValueBuilderFactory &prod_factory = FastValueBuilderFactory::get();
 
 EvalFixture::ParamRepo make_params() {
@@ -49,18 +47,6 @@ void verify_optimized(const vespalib::string &expr, Inner inner) {
     ASSERT_EQ(fixture.num_params(), 2);
     EXPECT_TRUE(!(fixture.get_param(0) == fixture.result()));
     EXPECT_TRUE(!(fixture.get_param(1) == fixture.result()));
-
-    EvalFixture old_slow_fixture(old_engine, expr, param_repo, false);
-    EvalFixture old_fixture(old_engine, expr, param_repo, true, true);
-    EXPECT_EQ(old_fixture.result(), EvalFixture::ref(expr, param_repo));
-    EXPECT_EQ(old_fixture.result(), old_slow_fixture.result());
-    info = old_fixture.find_all<DenseSimpleExpandFunction>();
-    ASSERT_EQ(info.size(), 1u);
-    EXPECT_TRUE(info[0]->result_is_mutable());
-    EXPECT_EQ(info[0]->inner(), inner);
-    ASSERT_EQ(old_fixture.num_params(), 2);
-    EXPECT_TRUE(!(old_fixture.get_param(0) == old_fixture.result()));
-    EXPECT_TRUE(!(old_fixture.get_param(1) == old_fixture.result()));
 }
 
 void verify_not_optimized(const vespalib::string &expr) {
@@ -70,13 +56,6 @@ void verify_not_optimized(const vespalib::string &expr) {
     EXPECT_EQ(fixture.result(), slow_fixture.result());
     auto info = fixture.find_all<DenseSimpleExpandFunction>();
     EXPECT_TRUE(info.empty());
-
-    EvalFixture old_slow_fixture(old_engine, expr, param_repo, false);
-    EvalFixture old_fixture(old_engine, expr, param_repo, true);
-    EXPECT_EQ(old_fixture.result(), EvalFixture::ref(expr, param_repo));
-    EXPECT_EQ(old_fixture.result(), old_slow_fixture.result());
-    info = old_fixture.find_all<DenseSimpleExpandFunction>();
-    EXPECT_TRUE(info.empty());
 }
 
 TEST(ExpandTest, simple_expand_is_optimized) {
diff --git a/eval/src/tests/instruction/dense_tensor_peek_function/dense_tensor_peek_function_test.cpp b/eval/src/tests/instruction/dense_tensor_peek_function/dense_tensor_peek_function_test.cpp
index df9271784b9..195b1f0e6ab 100644
--- a/eval/src/tests/instruction/dense_tensor_peek_function/dense_tensor_peek_function_test.cpp
+++ b/eval/src/tests/instruction/dense_tensor_peek_function/dense_tensor_peek_function_test.cpp
@@ -5,7 +5,6 @@
 #include <vespa/eval/eval/test/eval_fixture.h>
 #include <vespa/eval/eval/test/tensor_model.hpp>
 #include <vespa/eval/instruction/dense_tensor_peek_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>
@@ -15,7 +14,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() {
@@ -43,15 +41,6 @@ void verify(const vespalib::string &expr, double expect, size_t expect_optimized
         EXPECT_TRUE(info[i]->result_is_mutable());
     }
     EXPECT_EQUAL(fixture.find_all<Peek>().size(), expect_not_optimized_cnt);
-
-    EvalFixture old_fixture(old_engine, expr, param_repo, true);
-    EXPECT_EQUAL(old_fixture.result(), expect_spec);
-    info = old_fixture.find_all<DenseTensorPeekFunction>();
-    EXPECT_EQUAL(info.size(), expect_optimized_cnt);
-    for (size_t i = 0; i < info.size(); ++i) {
-        EXPECT_TRUE(info[i]->result_is_mutable());
-    }
-    EXPECT_EQUAL(old_fixture.find_all<Peek>().size(), expect_not_optimized_cnt);
 }
 
 //-----------------------------------------------------------------------------
diff --git a/eval/src/tests/instruction/dense_xw_product_function/dense_xw_product_function_test.cpp b/eval/src/tests/instruction/dense_xw_product_function/dense_xw_product_function_test.cpp
index 769657ae0a2..bd69310972c 100644
--- a/eval/src/tests/instruction/dense_xw_product_function/dense_xw_product_function_test.cpp
+++ b/eval/src/tests/instruction/dense_xw_product_function/dense_xw_product_function_test.cpp
@@ -7,7 +7,6 @@
 #include <vespa/eval/eval/test/eval_fixture.h>
 #include <vespa/eval/eval/test/tensor_model.hpp>
 #include <vespa/eval/instruction/dense_xw_product_function.h>
-#include <vespa/eval/tensor/default_tensor_engine.h>
 
 #include <vespa/vespalib/util/stringfmt.h>
 #include <vespa/vespalib/util/stash.h>
@@ -17,7 +16,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();
 
 struct First {
@@ -78,17 +76,6 @@ void verify_optimized(const vespalib::string &expr, size_t vec_size, size_t res_
     EXPECT_EQUAL(info[0]->vector_size(), vec_size);
     EXPECT_EQUAL(info[0]->result_size(), res_size);
     EXPECT_EQUAL(info[0]->common_inner(), happy);
-
-    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<DenseXWProductFunction>();
-    ASSERT_EQUAL(info.size(), 1u);
-    EXPECT_TRUE(info[0]->result_is_mutable());
-    EXPECT_EQUAL(info[0]->vector_size(), vec_size);
-    EXPECT_EQUAL(info[0]->result_size(), res_size);
-    EXPECT_EQUAL(info[0]->common_inner(), happy);
 }
 
 vespalib::string make_expr(const vespalib::string &a, const vespalib::string &b, const vespalib::string &common,
@@ -119,13 +106,6 @@ void verify_not_optimized(const vespalib::string &expr) {
     EXPECT_EQUAL(fixture.result(), slow_fixture.result());
     auto info = fixture.find_all<DenseXWProductFunction>();
     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<DenseXWProductFunction>();
-    EXPECT_TRUE(info.empty());
 }
 
 TEST("require that xw product gives same results as reference join/reduce") {