Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Grappler] Add dataset.shard(1, 0) to noop_elimination pass #47499

Merged
merged 1 commit into from
Apr 6, 2021
Merged

[Grappler] Add dataset.shard(1, 0) to noop_elimination pass #47499

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 8 additions & 1 deletion tensorflow/core/grappler/optimizers/data/noop_elimination.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,13 @@ bool IsPrefetchZero(const NodeDef& prefetch_node,
return IsConstNodeWithValue(*graph.GetNode(prefetch_node.input(1)), 0);
}

bool IsShardOne(const NodeDef& shard_node,
const MutableGraphView& graph) {
if (shard_node.op() != "ShardDataset") return false;
// We are looking only for shard(0) nodes.
return IsConstNodeWithValue(*graph.GetNode(shard_node.input(1)), 1);
}

bool IsOutputIdentityOfInput(const FunctionDef& fdef, const string& output_arg,
const string& input_arg) {
if (!fdef.ret().contains(output_arg)) {
Expand Down Expand Up @@ -131,7 +138,7 @@ bool IsMapIdentity(const NodeDef& map_node, const MutableGraphView& graph) {
bool IsNoOp(const NodeDef& node, const MutableGraphView& graph) {
return IsTakeAll(node, graph) || IsSkipNone(node, graph) ||
IsRepeatOne(node, graph) || IsPrefetchZero(node, graph) ||
IsMapIdentity(node, graph);
IsShardOne(node, graph) || IsMapIdentity(node, graph);
}

} // namespace
Expand Down
161 changes: 104 additions & 57 deletions tensorflow/core/grappler/optimizers/data/noop_elimination_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,19 +35,35 @@ std::vector<std::pair<string, AttrValue>> GetCommonAttributes() {
return commonAttributes;
}

NodeDef *MakeUnaryNode(StringPiece node_type, int count, string input_node,
MutableGraphView *graph) {
NodeDef *node_count = graph_utils::AddScalarConstNode<int64>(count, graph);
return graph_utils::AddNode("", node_type,
{std::move(input_node), node_count->name()},
NodeDef *MakeNode(StringPiece node_type, std::vector<int> params,
string input_node, MutableGraphView *graph) {
std::vector<NodeDef *> node_params;
for (int param : params) {
node_params.push_back(
graph_utils::AddScalarConstNode<int64>(param, graph));
}
std::vector<string> inputs = {input_node};
for (int i = 0; i < node_params.size(); i++) {
inputs.push_back(node_params[i]->name());
}
return graph_utils::AddNode("", node_type, inputs,
GetCommonAttributes(), graph);
}

NodeDef *MakeUnaryNonConstNode(StringPiece node_type, string input_node,
MutableGraphView *graph) {
NodeDef *node_count = graph_utils::AddScalarPlaceholder(DT_INT32, graph);
return graph_utils::AddNode("", node_type,
{std::move(input_node), node_count->name()},
NodeDef *MakeNonConstNode(
StringPiece node_type, std::vector<DataType> param_dtypes,
string input_node, MutableGraphView *graph) {
std::vector<NodeDef *> node_params;
for (DataType dtype : param_dtypes) {
node_params.push_back(
graph_utils::AddScalarPlaceholder(dtype, graph));
}
std::vector<string> inputs = {input_node};
for (int i = 0; i < node_params.size(); i++) {
inputs.push_back(node_params[i]->name());
}

return graph_utils::AddNode("", node_type, inputs,
GetCommonAttributes(), graph);
}

Expand All @@ -72,7 +88,7 @@ NodeDef *MakeRangeNode(MutableGraphView *graph) {
}

struct NoOpLastEliminationTest
: ::testing::TestWithParam<std::tuple<string, int, bool>> {};
: ::testing::TestWithParam<std::tuple<string, std::vector<int>, bool>> {};

// This test checks whether the no-op elimination correctly handles
// transformations at the end of the pipeline.
Expand All @@ -81,13 +97,13 @@ TEST_P(NoOpLastEliminationTest, EliminateLastNoOpNode) {
MutableGraphView graph(&item.graph);

const string &node_type = std::get<0>(GetParam());
const int node_count = std::get<1>(GetParam());
const std::vector<int> node_params = std::get<1>(GetParam());
const bool should_keep_node = std::get<2>(GetParam());

NodeDef *range_node = MakeRangeNode(&graph);

NodeDef *node =
MakeUnaryNode(node_type, node_count, range_node->name(), &graph);
MakeNode(node_type, node_params, range_node->name(), &graph);

NoOpElimination optimizer;
GraphDef output;
Expand All @@ -99,20 +115,23 @@ TEST_P(NoOpLastEliminationTest, EliminateLastNoOpNode) {

INSTANTIATE_TEST_CASE_P(
BasicRemovalTest, NoOpLastEliminationTest,
::testing::Values(std::make_tuple("TakeDataset", -3, false),
std::make_tuple("TakeDataset", -1, false),
std::make_tuple("TakeDataset", 0, true),
std::make_tuple("TakeDataset", 3, true),
std::make_tuple("SkipDataset", -1, true),
std::make_tuple("SkipDataset", 0, false),
std::make_tuple("SkipDataset", 3, true),
std::make_tuple("PrefetchDataset", 0, false),
std::make_tuple("PrefetchDataset", 1, true),
std::make_tuple("RepeatDataset", 1, false),
std::make_tuple("RepeatDataset", 2, true)));
::testing::Values(
std::make_tuple("TakeDataset", std::vector<int>({-3}), false),
std::make_tuple("TakeDataset", std::vector<int>({-1}), false),
std::make_tuple("TakeDataset", std::vector<int>({0}), true),
std::make_tuple("TakeDataset", std::vector<int>({3}), true),
std::make_tuple("SkipDataset", std::vector<int>({-1}), true),
std::make_tuple("SkipDataset", std::vector<int>({0}), false),
std::make_tuple("SkipDataset", std::vector<int>({3}), true),
std::make_tuple("PrefetchDataset", std::vector<int>({0}), false),
std::make_tuple("PrefetchDataset", std::vector<int>({1}), true),
std::make_tuple("RepeatDataset", std::vector<int>({1}), false),
std::make_tuple("RepeatDataset", std::vector<int>({2}), true),
std::make_tuple("ShardDataset", std::vector<int>({1, 0}), false),
std::make_tuple("ShardDataset", std::vector<int>({2, 0}), true)));

struct NoOpMiddleEliminationTest
: ::testing::TestWithParam<std::tuple<string, int, bool>> {};
: ::testing::TestWithParam<std::tuple<string, std::vector<int>, bool>> {};

// This test checks whether the no-op elimination correctly handles
// transformations int the middle of the pipeline.
Expand All @@ -121,13 +140,13 @@ TEST_P(NoOpMiddleEliminationTest, EliminateMiddleNoOpNode) {
MutableGraphView graph(&item.graph);

const string &node_type = std::get<0>(GetParam());
const int node_count = std::get<1>(GetParam());
const std::vector<int> node_params = std::get<1>(GetParam());
const bool should_keep_node = std::get<2>(GetParam());

NodeDef *range_node = MakeRangeNode(&graph);

NodeDef *node =
MakeUnaryNode(node_type, node_count, range_node->name(), &graph);
MakeNode(node_type, node_params, range_node->name(), &graph);

NodeDef *cache_node = MakeCacheNode(node->name(), &graph);
NoOpElimination optimizer;
Expand All @@ -149,19 +168,23 @@ TEST_P(NoOpMiddleEliminationTest, EliminateMiddleNoOpNode) {

INSTANTIATE_TEST_CASE_P(
BasicRemovalTest, NoOpMiddleEliminationTest,
::testing::Values(std::make_tuple("TakeDataset", -1, false),
std::make_tuple("TakeDataset", -3, false),
std::make_tuple("TakeDataset", 0, true),
std::make_tuple("TakeDataset", 3, true),
std::make_tuple("SkipDataset", -1, true),
std::make_tuple("SkipDataset", 0, false),
std::make_tuple("SkipDataset", 3, true),
std::make_tuple("PrefetchDataset", 0, false),
std::make_tuple("PrefetchDataset", 1, true),
std::make_tuple("RepeatDataset", 1, false),
std::make_tuple("RepeatDataset", 2, true)));

using NodesTypes = std::tuple<std::pair<string, int>, std::pair<string, int>>;
::testing::Values(
std::make_tuple("TakeDataset", std::vector<int>({-1}), false),
std::make_tuple("TakeDataset", std::vector<int>({-3}), false),
std::make_tuple("TakeDataset", std::vector<int>({0}), true),
std::make_tuple("TakeDataset", std::vector<int>({3}), true),
std::make_tuple("SkipDataset", std::vector<int>({-1}), true),
std::make_tuple("SkipDataset", std::vector<int>({0}), false),
std::make_tuple("SkipDataset", std::vector<int>({3}), true),
std::make_tuple("PrefetchDataset", std::vector<int>({0}), false),
std::make_tuple("PrefetchDataset", std::vector<int>({1}), true),
std::make_tuple("RepeatDataset", std::vector<int>({1}), false),
std::make_tuple("RepeatDataset", std::vector<int>({2}), true),
std::make_tuple("ShardDataset", std::vector<int>({1, 0}), false),
std::make_tuple("ShardDataset", std::vector<int>({2, 0}), true)));

using NodesTypes = std::tuple<std::pair<string, std::vector<int>>,
std::pair<string, std::vector<int>>>;
struct NoOpMultipleEliminationTest : ::testing::TestWithParam<NodesTypes> {};

// This test checks whether the no-op elimination correctly removes
Expand All @@ -172,7 +195,7 @@ TEST_P(NoOpMultipleEliminationTest, EliminateMultipleNoOpNode) {

static_assert(std::tuple_size<NodesTypes>::value == 2,
"Make sure to include everything in the test");
const std::vector<std::pair<string, int>> noop_nodes = {
const std::vector<std::pair<string, std::vector<int>>> noop_nodes = {
std::get<0>(GetParam()), std::get<1>(GetParam())};

NodeDef *range_node = MakeRangeNode(&graph);
Expand All @@ -182,8 +205,8 @@ TEST_P(NoOpMultipleEliminationTest, EliminateMultipleNoOpNode) {
nodes_to_remove.reserve(noop_nodes.size());

for (const auto &noop_node : noop_nodes) {
NodeDef *node = MakeUnaryNode(noop_node.first, noop_node.second,
previous->name(), &graph);
NodeDef *node = MakeNode(noop_node.first, noop_node.second,
previous->name(), &graph);
nodes_to_remove.push_back(node->name());
previous = node;
}
Expand All @@ -207,37 +230,45 @@ TEST_P(NoOpMultipleEliminationTest, EliminateMultipleNoOpNode) {
EXPECT_EQ(cache_node_out.input(0), range_node->name());
}

const auto *const kTakeNode = new std::pair<string, int>{"TakeDataset", -1};
const auto *const kSkipNode = new std::pair<string, int>{"SkipDataset", 0};
const auto *const kRepeatNode = new std::pair<string, int>{"RepeatDataset", 1};
const auto *const kTakeNode =
new std::pair<string, std::vector<int>>{"TakeDataset", {-1}};
const auto *const kSkipNode =
new std::pair<string, std::vector<int>>{"SkipDataset", {0}};
const auto *const kRepeatNode =
new std::pair<string, std::vector<int>>{"RepeatDataset", {1}};
const auto *const kPrefetchNode =
new std::pair<string, int>{"PrefetchDataset", 0};
new std::pair<string, std::vector<int>>{"PrefetchDataset", {0}};
const auto *const kShardNode =
new std::pair<string, std::vector<int>>{"ShardDataset", {1, 0}};

INSTANTIATE_TEST_CASE_P(
BasicRemovalTest, NoOpMultipleEliminationTest,
::testing::Combine(::testing::Values(*kTakeNode, *kSkipNode, *kRepeatNode,
*kPrefetchNode),
*kPrefetchNode, *kShardNode),
::testing::Values(*kTakeNode, *kSkipNode, *kRepeatNode,
*kPrefetchNode)));
*kPrefetchNode, *kShardNode)));

struct NoOpPlaceholdersTest
: ::testing::TestWithParam<std::tuple<string, string>> {};
: ::testing::TestWithParam<
std::tuple<std::pair<string, std::vector<DataType>>,
std::pair<string, std::vector<DataType>>>> {};

TEST_P(NoOpPlaceholdersTest, NonConstNoOpNode) {
GrapplerItem item;
MutableGraphView graph(&item.graph);

static_assert(std::tuple_size<NodesTypes>::value == 2,
"Make sure to include everything in the test");
const std::vector<string> noop_nodes = {std::get<0>(GetParam()),
std::get<1>(GetParam())};
const std::vector<std::pair<string, std::vector<DataType>>> noop_nodes =
{std::get<0>(GetParam()), std::get<1>(GetParam())};
NodeDef *range_node = MakeRangeNode(&graph);
std::vector<string> nodes_to_keep;
nodes_to_keep.reserve(noop_nodes.size());
NodeDef *previous = range_node;

for (const auto &noop_node : noop_nodes) {
NodeDef *node = MakeUnaryNonConstNode(noop_node, previous->name(), &graph);
NodeDef *node = MakeNonConstNode(noop_node.first, noop_node.second,
previous->name(), &graph);
nodes_to_keep.push_back(node->name());
previous = node;
}
Expand All @@ -249,12 +280,28 @@ TEST_P(NoOpPlaceholdersTest, NonConstNoOpNode) {
EXPECT_TRUE(graph_utils::ContainsGraphNodeWithName(noop_node_name, output));
}

const auto *const kNonConstTakeNode =
new std::pair<string, std::vector<DataType>>{"TakeDataset", {DT_INT32}};
const auto *const kNonConstSkipNode =
new std::pair<string, std::vector<DataType>>{"SkipDataset", {DT_INT32}};
const auto *const kNonConstRepeatNode =
new std::pair<string, std::vector<DataType>>{"RepeatDataset", {DT_INT32}};
const auto *const kNonConstPrefetchNode =
new std::pair<string, std::vector<DataType>>{"PrefetchDataset",
{DT_INT32}};
const auto *const kNonConstShardNode =
new std::pair<string, std::vector<DataType>>{"ShardDataset",
{DT_INT32, DT_INT32}};

INSTANTIATE_TEST_CASE_P(
DoNotRemovePlaceholders, NoOpPlaceholdersTest,
::testing::Combine(::testing::Values("TakeDataset", "SkipDataset",
"RepeatDataset", "PrefetchDataset"),
::testing::Values("TakeDataset", "SkipDataset",
"RepeatDataset", "PrefetchDataset")));
::testing::Combine(
::testing::Values(*kNonConstTakeNode, *kNonConstSkipNode,
*kNonConstRepeatNode, *kNonConstPrefetchNode,
*kNonConstShardNode),
::testing::Values(*kNonConstTakeNode, *kNonConstSkipNode,
*kNonConstRepeatNode, *kNonConstPrefetchNode,
*kNonConstShardNode)));

} // namespace
} // namespace grappler
Expand Down
2 changes: 2 additions & 0 deletions tensorflow/python/data/experimental/kernel_tests/optimization/noop_elimination_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,8 @@ def apply_map_with_multiple_components(ds):
("PMapNonIdentity",
lambda ds: ds.map(lambda x: x * 2, num_parallel_calls=2),
parallel_map_name),
("Shard1", lambda ds: ds.shard(1, 0), None),
("ShardN", lambda ds: ds.shard(2, 0), "Shard"),
]

def reduce_fn(result, case):
Expand Down