---

yaml
---
r: 262078
b: refs/heads/tensorflow
c: 1cd29f7
h: refs/heads/master

Author: bgogul

[refs]

@@ -818,7 +818,7 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2018-04-25-a: 22f738a831d43aff2b9c9773bcb65
 refs/tags/swift-DEVELOPMENT-SNAPSHOT-2018-05-08-a: 7d98cc16689baba5c8a3b90a9329bdcc1a12b4e9
 refs/heads/cherr42: a566ad54b073c2c56ac0a705d0a5bed9743135a5
 "refs/heads/codable_test_comment_fix": fc8f6824f7f347e1e8db55bff62db385c5728b5a
-refs/heads/tensorflow: 63500997eeb59d154854863865c2fffd013fd0f5
+refs/heads/tensorflow: 1cd29f7f6b9d69819306c0bb92428e0e144084fe
 refs/tags/swift-4.1-DEVELOPMENT-SNAPSHOT-2018-05-11-a: 8126fd7a652e2f70ad6d76505239e34fb2ef3e1a
 refs/tags/swift-4.1-DEVELOPMENT-SNAPSHOT-2018-05-12-a: b3fd3dd84df6717f2e2e9df58c6d7e99fed57086
 refs/tags/swift-4.1-DEVELOPMENT-SNAPSHOT-2018-05-13-a: 71135119579039dc321c5f65d870050fe36efda2

branches/tensorflow/lib/SILOptimizer/Mandatory/TFUtilities.cpp

@@ -264,20 +264,25 @@ bool tf::isStatefulOp(const GraphOperationInst *graphOp) {
   StringRef tensorOpName = decoder.getOperationName();
   // Is this a known stateful op used in partitioning?
   if (tensorOpName.startswith("tfc.SendToHost") ||
-      tensorOpName.startswith("tfc.RecvFromHost")) {
+      tensorOpName.startswith("tfc.RecvFromHost") ||
+      tensorOpName.startswith("tfc.D2DTensorRecv") ||
+      tensorOpName.startswith("tfc.D2DTensorSend") ||
+      tensorOpName.startswith("tfc.TensorTransfer")) {
     return true;
   }
+  // Other ops only known to Swift for TensorFlow.
+  if (tensorOpName.startswith("tf_tensor_to_i1") ||
+      tensorOpName.startswith("tfc.")) {
+    return false;
+  }
   // Is this a stateful TensorFlow op?
   std::unique_ptr<TF_Status, decltype(&TF_DeleteStatus)> status(
       TF_NewStatus(), TF_DeleteStatus);
   int isStateful = TF_OpIsStateful(tensorOpName.str().c_str(), status.get());
   TF_Code statusCode = TF_GetCode(status.get());
-  // FIXME(SR-9388): we should actually fail if statusCode != TF_OK. However,
-  // the current tests use arbitrary strings in graph_op. Therefore, we will
-  // just allow TF_NOT_FOUND for now to avoid changing too many tests.
-  assert((statusCode == TF_OK || statusCode == TF_NOT_FOUND) &&
+  assert(statusCode == TF_OK &&
          "Error checking if a TensorFlow op is stateful.");
-  return (statusCode == TF_OK && isStateful);
+  return isStateful;
 }
 
 /// Create a "Const" tensor operation containing the specified scalars, with

branches/tensorflow/test/TensorFlow/canonicalize_cfg_xla.sil

@@ -49,8 +49,8 @@ bb2(%14 : $TensorCore<Builtin.Int64>, %15 : $TensorCore<Float>): // Preds: bb3 b
   %16 = graph_op "Add"(%14 : $TensorCore<Builtin.Int64>, %9 : $TensorCore<Builtin.Int64>) : $TensorCore<Builtin.Int64> // users: %23, %17
   %17 = graph_op "Equal"(%16 : $TensorCore<Builtin.Int64>, %5 : $TensorCore<Builtin.Int64>) : $TensorCore<Builtin.Int1> // user: %21
   %18 = graph_op "Add"(%15 : $TensorCore<Float>, %15 : $TensorCore<Float>) : $TensorCore<Float> // user: %19
-  %19 = graph_op "tensorflowSend"(%18 : $TensorCore<Float>) : $()
-  %20 = graph_op "tensorflowReceive"() : $TensorCore<Float> // users: %12, %23, %11, %11
+  %19 = graph_op "Identity"(%18 : $TensorCore<Float>) : $()
+  %20 = graph_op "Const"() : $TensorCore<Float> // users: %12, %23, %11, %11
   %21 = graph_op "tf_tensor_to_i1"(%17 : $TensorCore<Builtin.Int1>) : $Builtin.Int1 // user: %22
   cond_br %21, bb1, bb3                           // id: %22