Fix inconsistent handling for FResourceRequestEx for imperative and s…

…ymbolic executor (apache#14007) * Update op_attr_types.h * Update attach_op_resource_pass.cc
stephenrawls · Feb 16, 2019 · 87b6711 · 87b6711
1 parent f78d776
commit 87b6711
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/include/mxnet/op_attr_types.h b/include/mxnet/op_attr_types.h
@@ -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"
  */

diff --git a/src/executor/attach_op_resource_pass.cc b/src/executor/attach_op_resource_pass.cc
@@ -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],