fix a bug in CachedOp. (#11675)

* fix a bug. * add tests. * use default context. * move all tests to test_contrib_control_flow.py * fix test.
apache · Jul 21, 2018 · 6798703 · 6798703
1 parent 11b69f2
commit 6798703
Show file tree

Hide file tree

Showing 4 changed files with 539 additions and 531 deletions.
diff --git a/src/imperative/imperative_utils.h b/src/imperative/imperative_utils.h
@@ -963,13 +963,13 @@ inline void CreateEngineOpSeg(
     seg_execs.push_back(exec);
 
     auto& seg = (*opr_segs)[nid];
-    if (is_async) {
-      seg = EngineOprSeg{false, nid + 1};
-      seg.opr.reset(CreateEngineOp(default_ctx, seg_execs));
+    if (!valid) {
+      seg = EngineOprSeg{false, nid + 1, nullptr};
       seg_execs.clear();
       seg_start = nid + 1;
-    } else if (!valid) {
-      seg = EngineOprSeg{false, nid + 1, nullptr};
+    } else if (is_async) {
+      seg = EngineOprSeg{false, nid + 1};
+      seg.opr.reset(CreateEngineOp(default_ctx, seg_execs));
       seg_execs.clear();
       seg_start = nid + 1;
     }