Skip to content
This repository has been archived by the owner on Nov 17, 2023. It is now read-only.

Fix inconsistent handling for FResourceRequestEx for imperative and symbolic executor #14007

Merged
merged 2 commits into from
Jan 31, 2019
Merged

Fix inconsistent handling for FResourceRequestEx for imperative and symbolic executor #14007

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4633ad5
Update op_attr_types.h
eric-haibin-lin Jan 28, 2019
050a11e
Update attach_op_resource_pass.cc
eric-haibin-lin Jan 31, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions include/mxnet/op_attr_types.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,8 @@ using FResourceRequest = std::function<
/*!
* \brief The resource request from the operator.
* An operator could register ResourceRequestEx, or ResourceRequest, or neither.
* If an operator registers both ResourceRequestEx and ResourceRequest,
* ResourceRequest is ignored.
*
* \note Register under "FResourceRequestEx"
*/
Expand Down
2 changes: 0 additions & 2 deletions src/executor/attach_op_resource_pass.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,6 @@ void AttachOpResources(
const auto op = inode.source->op();
const bool rsc_req = (fresource.count(op) != 0);
const bool rsc_ex_req = (fresource_ex.count(op) != 0);
CHECK(!(rsc_req && rsc_ex_req))
<< "An operator could not register both ResourceRequestEx and ResourceRequest";
if (rsc_req || rsc_ex_req) {
auto reqs = rsc_ex_req ? fresource_ex[op](inode.source->attrs,
dev_masks[nid],
Expand Down