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

Delete the parameter allow_soft_placement in function AssignDevice #30987

Merged
merged 1 commit into from Jul 26, 2019
Merged

Delete the parameter allow_soft_placement in function AssignDevice #30987

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
4 changes: 2 additions & 2 deletions tensorflow/core/common_runtime/colocation_graph.cc
View file
Open in desktop
Expand Up @@ -438,7 +438,7 @@ bool Member::MergeSupportedDevices(
return true;
}

Status Member::AssignDevice(const Node& node, bool allow_soft_placement) {
Status Member::AssignDevice(const Node& node) {
if (node.assigned_device_name_index() == assigned_device_name_index_) {
return Status::OK();
}
Expand Down Expand Up @@ -914,7 +914,7 @@ Status ColocationGraph::LimitToAssignedDevice(const Node& node) {
}
int root = FindAndUpdateRoot(node.id());
Member& root_member = members_[root];
return root_member.AssignDevice(node, allow_soft_placement_);
return root_member.AssignDevice(node);
}

void ColocationGraph::GetSoftDeviceCandidates(
Expand Down
2 changes: 1 addition & 1 deletion tensorflow/core/common_runtime/colocation_graph.h
View file
Open in desktop
Expand Up @@ -80,7 +80,7 @@ class Member {
// not update this. Else returns true and updates this.
bool MergeSupportedDevices(const Member& other);

Status AssignDevice(const Node& node, bool allow_soft_placement);
Status AssignDevice(const Node& node);

// Limit the possible devices of this (should be a root) to the device
// specifications in `devices`.
Expand Down