diff --git a/test/TensorFlow/deabstraction_finished.swift b/test/TensorFlow/deabstraction_finished.swift index bfd0e2867be92..73690abd6e415 100644 --- a/test/TensorFlow/deabstraction_finished.swift +++ b/test/TensorFlow/deabstraction_finished.swift @@ -134,7 +134,7 @@ public func testConvolution(x: Tensor, filter: Tensor) -> Tensor, {{.*}} : $TensorHandle) {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, {{.*}} : $TensorHandle) {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 */ diff --git a/test/TensorFlow/no_copy.swift b/test/TensorFlow/no_copy.swift index 920e97e21f57b..665f9f99bac62 100644 --- a/test/TensorFlow/no_copy.swift +++ b/test/TensorFlow/no_copy.swift @@ -52,7 +52,7 @@ public func testConvolution(x: Tensor, filter: Tensor) -> Tensor, TensorHandle) -> TensorHandle { // CHECK: bb0(%0 : @unowned $TensorHandle, %1 : @unowned $TensorHandle): -// CHECK: [[A:%.*]] = graph_op "Conv2D"(%0 : $TensorHandle, %1 : $TensorHandle) {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 +// CHECK: [[A:%.*]] = graph_op "Conv2D"(%0 : $TensorHandle, %1 : $TensorHandle) {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 // CHECK-NEXT: return [[A]] : $TensorHandle // CHECK-NEXT:} diff --git a/test/TensorFlowRuntime/collective.swift b/test/TensorFlowRuntime/collective.swift index 9d241ea93a174..73f2cbf587e76 100644 --- a/test/TensorFlowRuntime/collective.swift +++ b/test/TensorFlowRuntime/collective.swift @@ -25,7 +25,8 @@ CollectiveTests.testAllBackends("ConfigTest") { CollectiveTests.testAllBackends("SingletonGroup") { let x = Tensor(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) diff --git a/utils/update_checkout/update-checkout-config.json b/utils/update_checkout/update-checkout-config.json index 0541a57a4d5af..28a7eaf71c5e6 100644 --- a/utils/update_checkout/update-checkout-config.json +++ b/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" } } }