aboutsummaryrefslogtreecommitdiffstats
path: root/eval/src/tests
diff options
context:
space:
mode:
authorArne Juul <arnej@verizonmedia.com>2020-12-03 12:57:17 +0000
committerArne Juul <arnej@verizonmedia.com>2020-12-03 12:57:17 +0000
commit70920040fef4a26ea47914672575ebe7a7214488 (patch)
tree64ce2ed0a7ed250f8cc4fa19be604fe165827f48 /eval/src/tests
parent10011313d4d0e45cd0e2420bcd0b07ccf88224cd (diff)
remove tests depending on EngineOrFactory with engine
Diffstat (limited to 'eval/src/tests')
-rw-r--r--eval/src/tests/tensor/partial_add/partial_add_test.cpp21
-rw-r--r--eval/src/tests/tensor/partial_modify/partial_modify_test.cpp25
-rw-r--r--eval/src/tests/tensor/partial_remove/partial_remove_test.cpp22
3 files changed, 0 insertions, 68 deletions
diff --git a/eval/src/tests/tensor/partial_add/partial_add_test.cpp b/eval/src/tests/tensor/partial_add/partial_add_test.cpp
index 046306b467e..711bf7a1c49 100644
--- a/eval/src/tests/tensor/partial_add/partial_add_test.cpp
+++ b/eval/src/tests/tensor/partial_add/partial_add_test.cpp
@@ -54,15 +54,6 @@ TensorSpec perform_partial_add(const TensorSpec &a, const TensorSpec &b) {
return spec_from_value(*up);
}
-TensorSpec perform_old_add(const TensorSpec &a, const TensorSpec &b) {
- const auto &engine = tensor::DefaultTensorEngine::ref();
- auto lhs = engine.from_spec(a);
- auto rhs = engine.from_spec(b);
- auto up = tensor::TensorPartialUpdate::add(*lhs, *rhs, engine);
- EXPECT_TRUE(up);
- return engine.to_spec(*up);
-}
-
TEST(PartialAddTest, partial_add_works_for_simple_values) {
ASSERT_TRUE((add_layouts.size() % 2) == 0);
for (size_t i = 0; i < add_layouts.size(); i += 2) {
@@ -75,18 +66,6 @@ TEST(PartialAddTest, partial_add_works_for_simple_values) {
}
}
-TEST(PartialAddTest, partial_add_works_like_old_add) {
- ASSERT_TRUE((add_layouts.size() % 2) == 0);
- for (size_t i = 0; i < add_layouts.size(); i += 2) {
- TensorSpec lhs = spec(add_layouts[i], N());
- TensorSpec rhs = spec(add_layouts[i + 1], Div16(N()));
- SCOPED_TRACE(fmt("\n===\nLHS: %s\nRHS: %s\n===\n", lhs.to_string().c_str(), rhs.to_string().c_str()));
- auto expect = perform_old_add(lhs, rhs);
- auto actual = perform_partial_add(lhs, rhs);
- EXPECT_EQ(actual, expect);
- }
-}
-
std::vector<Layout> bad_layouts = {
{x(3)}, {x(3),y(1)},
{x(3),y(1)}, {x(3)},
diff --git a/eval/src/tests/tensor/partial_modify/partial_modify_test.cpp b/eval/src/tests/tensor/partial_modify/partial_modify_test.cpp
index 3236a8ac127..ab04f195b1f 100644
--- a/eval/src/tests/tensor/partial_modify/partial_modify_test.cpp
+++ b/eval/src/tests/tensor/partial_modify/partial_modify_test.cpp
@@ -69,17 +69,6 @@ TensorSpec perform_partial_modify(const TensorSpec &a, const TensorSpec &b, join
return spec_from_value(*up);
}
-TensorSpec perform_old_modify(const TensorSpec &a, const TensorSpec &b, join_fun_t fun) {
- const auto &engine = tensor::DefaultTensorEngine::ref();
- auto lhs = engine.from_spec(a);
- auto rhs = engine.from_spec(b);
- EXPECT_TRUE(tensor::TensorPartialUpdate::check_suitably_sparse(*rhs, engine));
- auto up = tensor::TensorPartialUpdate::modify(*lhs, fun, *rhs, engine);
- EXPECT_TRUE(up);
- return engine.to_spec(*up);
-}
-
-
TEST(PartialModifyTest, partial_modify_works_for_simple_values) {
ASSERT_TRUE((modify_layouts.size() % 2) == 0);
for (size_t i = 0; i < modify_layouts.size(); i += 2) {
@@ -98,20 +87,6 @@ TEST(PartialModifyTest, partial_modify_works_for_simple_values) {
}
}
-TEST(PartialModifyTest, partial_modify_works_like_old_modify) {
- ASSERT_TRUE((modify_layouts.size() % 2) == 0);
- for (size_t i = 0; i < modify_layouts.size(); i += 2) {
- TensorSpec lhs = spec(modify_layouts[i], N());
- TensorSpec rhs = spec(modify_layouts[i + 1], Div16(N()));
- SCOPED_TRACE(fmt("\n===\nLHS: %s\nRHS: %s\n===\n", lhs.to_string().c_str(), rhs.to_string().c_str()));
- for (auto fun: {operation::Add::f, operation::Mul::f, operation::Sub::f}) {
- auto expect = perform_old_modify(lhs, rhs, fun);
- auto actual = perform_partial_modify(lhs, rhs, fun);
- EXPECT_EQ(actual, expect);
- }
- }
-}
-
std::vector<Layout> bad_layouts = {
{x(3)}, {x(3)},
{x(3),y({"a"})}, {x(3),y({"a"})},
diff --git a/eval/src/tests/tensor/partial_remove/partial_remove_test.cpp b/eval/src/tests/tensor/partial_remove/partial_remove_test.cpp
index 5af2396f5ec..fc22a364e5c 100644
--- a/eval/src/tests/tensor/partial_remove/partial_remove_test.cpp
+++ b/eval/src/tests/tensor/partial_remove/partial_remove_test.cpp
@@ -62,16 +62,6 @@ TensorSpec perform_partial_remove(const TensorSpec &a, const TensorSpec &b) {
return spec_from_value(*up);
}
-TensorSpec perform_old_remove(const TensorSpec &a, const TensorSpec &b) {
- const auto &engine = tensor::DefaultTensorEngine::ref();
- auto lhs = engine.from_spec(a);
- auto rhs = engine.from_spec(b);
- EXPECT_TRUE(tensor::TensorPartialUpdate::check_suitably_sparse(*rhs, engine));
- auto up = tensor::TensorPartialUpdate::remove(*lhs, *rhs, engine);
- EXPECT_TRUE(up);
- return engine.to_spec(*up);
-}
-
TEST(PartialRemoveTest, partial_remove_works_for_simple_values) {
ASSERT_TRUE((remove_layouts.size() % 2) == 0);
for (size_t i = 0; i < remove_layouts.size(); i += 2) {
@@ -84,18 +74,6 @@ TEST(PartialRemoveTest, partial_remove_works_for_simple_values) {
}
}
-TEST(PartialRemoveTest, partial_remove_works_like_old_remove) {
- ASSERT_TRUE((remove_layouts.size() % 2) == 0);
- for (size_t i = 0; i < remove_layouts.size(); i += 2) {
- TensorSpec lhs = spec(remove_layouts[i], N());
- TensorSpec rhs = spec(remove_layouts[i + 1], Div16(N()));
- SCOPED_TRACE(fmt("\n===\nLHS: %s\nRHS: %s\n===\n", lhs.to_string().c_str(), rhs.to_string().c_str()));
- auto expect = perform_old_remove(lhs, rhs);
- auto actual = perform_partial_remove(lhs, rhs);
- EXPECT_EQ(actual, expect);
- }
-}
-
std::vector<Layout> bad_layouts = {
{x(3)}, {x(3)},
{x(3),y({"a"})}, {x(3)},