---

yaml
---
r: 338815
b: refs/heads/rxwei-patch-1
c: a0a9c9a
h: refs/heads/master
i:
  338813: cc644a5
  338811: f24323b
  338807: 25baace
  338799: afc5b6a
  338783: c280c2c
  338751: 436acfd
  338687: d79809c

Author: rxwei

[refs]

@@ -1015,7 +1015,7 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2018-08-18-a: b10b1fce14385faa6d44f6b933e95
 refs/heads/rdar-43033749-fix-batch-mode-no-diags-swift-5.0-branch: a14e64eaad30de89f0f5f0b2a782eed7ecdcb255
 refs/heads/revert-19006-error-bridging-integer-type: 8a9065a3696535305ea53fe9b71f91cbe6702019
 refs/heads/revert-19050-revert-19006-error-bridging-integer-type: ecf752d54b05dd0a20f510f0bfa54a3fec3bcaca
-refs/heads/rxwei-patch-1: 1232934541238a7a97e462edb308bf80ae86e80f
+refs/heads/rxwei-patch-1: a0a9c9a1e25e62b3fb6d6b2bf8928c4ed26660cd
 refs/heads/shahmishal-patch-1: e58ec0f7488258d42bef51bc3e6d7b3dc74d7b2a
 refs/heads/typelist-existential: 4046359efd541fb5c72d69a92eefc0a784df8f5e
 refs/tags/swift-4.2-DEVELOPMENT-SNAPSHOT-2018-08-20-a: 4319ba09e4fb8650ee86061075c74a016b6baab9

branches/rxwei-patch-1/test/TensorFlow/deabstraction_finished.swift

@@ -134,7 +134,7 @@ public func testConvolution(x: Tensor<Float>, filter: Tensor<Float>) -> Tensor<F
 }
 
 /* CHECK-LABEL: ---- INPUT FUNCTION {{.*}}testConvolution
- * CHECK: graph_op "Conv2D"({{.*}} : $TensorHandle<Float>, {{.*}} : $TensorHandle<Float>) {T$dtype: i32 1, strides: [$Int32: (i32 1), (i32 2), (i32 3), (i32 4)], use_cudnn_on_gpu: i1 -1, padding: "SAME", data_format: "NHWC", dilations: [$Int32: (i32 1), (i32 1), (i32 1), (i32 1)],
+ * CHECK: graph_op "Conv2D"({{.*}} : $TensorHandle<Float>, {{.*}} : $TensorHandle<Float>) {T$dtype: i32 1, strides: [$Int32: (i32 1), (i32 2), (i32 3), (i32 4)], use_cudnn_on_gpu: i1 -1, padding: "SAME", explicit_paddings: [$Int32: ], data_format: "NHWC", dilations: [$Int32: (i32 1), (i32 1), (i32 1), (i32 1)],
  * CHECK-LABEL: ---- END OF
 */
 

branches/rxwei-patch-1/test/TensorFlow/no_copy.swift

@@ -52,7 +52,7 @@ public func testConvolution(x: Tensor<Float>, filter: Tensor<Float>) -> Tensor<F
 // CHECK-LABEL: --- TFPartition Accelerator Result: {{.*}}testConvolution
 // CHECK: sil private @{{.*}}testConvolution{{.*}} : $@callee_owned (TensorHandle<Float>, TensorHandle<Float>) -> TensorHandle<Float> {
 // CHECK: bb0(%0 : @unowned $TensorHandle<Float>, %1 : @unowned $TensorHandle<Float>):
-// CHECK: [[A:%.*]] = graph_op "Conv2D"(%0 : $TensorHandle<Float>, %1 : $TensorHandle<Float>) {T$dtype: i32 1, strides: [$Int32: (i32 1), (i32 2), (i32 3), (i32 4)], use_cudnn_on_gpu: i1 -1, padding: "SAME", data_format: "NHWC", dilations: [$Int32: (i32 1), (i32 1), (i32 1), (i32 1)], __device: "/job:localhost/replica:0/task:0/device:CPU:0"} : $TensorHandle<Float>
+// CHECK: [[A:%.*]] = graph_op "Conv2D"(%0 : $TensorHandle<Float>, %1 : $TensorHandle<Float>) {T$dtype: i32 1, strides: [$Int32: (i32 1), (i32 2), (i32 3), (i32 4)], use_cudnn_on_gpu: i1 -1, padding: "SAME", explicit_paddings: [$Int32: ], data_format: "NHWC", dilations: [$Int32: (i32 1), (i32 1), (i32 1), (i32 1)], __device: "/job:localhost/replica:0/task:0/device:CPU:0"} : $TensorHandle<Float>
 // CHECK-NEXT:  return [[A]] : $TensorHandle<Float>
 // CHECK-NEXT:}
 

branches/rxwei-patch-1/test/TensorFlowRuntime/collective.swift

@@ -25,7 +25,8 @@ CollectiveTests.testAllBackends("ConfigTest") {
 CollectiveTests.testAllBackends("SingletonGroup") {
   let x = Tensor<Float>(1.0)
   let t = Raw.collectiveReduce(x, groupSize: 1, groupKey: 1, instanceKey: 1,
-                               mergeOp: .add, finalOp: .id, subdivOffsets: [0])
+                               mergeOp: .add, finalOp: .id, subdivOffsets: [0],
+                               waitFor: [])
   _hostOp(t)
   expectEqualWithScalarTensor(1, t)
 }
@@ -76,7 +77,7 @@ CollectiveTests.testAllBackends("GroupWithSize2_threads") {
   _runOnNDevices(2) { i in
     withDevice(.cpu, UInt(i)) {
       let t = Raw.collectiveReduce(x, groupSize: 2, groupKey: 3, instanceKey: 3,
-          mergeOp: .add, finalOp: .id, subdivOffsets: [0])
+          mergeOp: .add, finalOp: .id, subdivOffsets: [0], waitFor: [])
 
       _hostOp(t)
       expectEqualWithScalarTensor(2, t)

branches/rxwei-patch-1/utils/update_checkout/update-checkout-config.json

@@ -240,9 +240,9 @@
                 "swift-xcode-playground-support": "swift-DEVELOPMENT-SNAPSHOT-2018-11-26-a",
                 "ninja": "253e94c1fa511704baeb61cf69995bbf09ba435e",
                 "icu": "release-61-1",
-                "tensorflow": "7818652c950b1b1922efe5f4345886058d0ffba5",
-                "tensorflow-swift-bindings": "c852b63b6ac3c4b53199aab96c021501978b843d",
-                "tensorflow-swift-apis": "8264ac065fa3299cbbefe3eb4ab4d65f0b6faf4f"
+                "tensorflow": "5e8df789cc30098d791475c14a623ec68b50b4ed",
+                "tensorflow-swift-bindings": "0957744551614e433dbabc725cba29ff5ddb91d3",
+                "tensorflow-swift-apis": "18f937191bdc9ddbe5df8f99f0dc64e1a4c0ffab"
             }
         }
     }