From 14326e1f6c0f3de34cf4c1b44bd26bedf9040cb8 Mon Sep 17 00:00:00 2001 From: Richard Wei Date: Sun, 31 Mar 2019 15:07:21 -0700 Subject: [PATCH 1/7] Update checkout for 'tensorflow/swift-apis' and 'tensorflow/swift-bindings'. * https://github.com/tensorflow/swift-bindings/commit/e47ccceb5213a84100aa73c31bc680a554efb0ca * https://github.com/tensorflow/swift-apis/commit/b64ee8184553ea979a17ee06a5e200cc4d132df0 --- utils/update_checkout/update-checkout-config.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/utils/update_checkout/update-checkout-config.json b/utils/update_checkout/update-checkout-config.json index 0541a57a4d5af..9a91cf87989f4 100644 --- a/utils/update_checkout/update-checkout-config.json +++ b/utils/update_checkout/update-checkout-config.json @@ -241,8 +241,8 @@ "ninja": "253e94c1fa511704baeb61cf69995bbf09ba435e", "icu": "release-61-1", "tensorflow": "7818652c950b1b1922efe5f4345886058d0ffba5", - "tensorflow-swift-bindings": "c852b63b6ac3c4b53199aab96c021501978b843d", - "tensorflow-swift-apis": "8264ac065fa3299cbbefe3eb4ab4d65f0b6faf4f" + "tensorflow-swift-bindings": "e47ccceb5213a84100aa73c31bc680a554efb0ca", + "tensorflow-swift-apis": "b64ee8184553ea979a17ee06a5e200cc4d132df0" } } } From 32430931d1f236093b29c470f9e20cb6611ff3fd Mon Sep 17 00:00:00 2001 From: Richard Wei Date: Sun, 31 Mar 2019 21:11:16 -0700 Subject: [PATCH 2/7] Update update-checkout-config.json --- utils/update_checkout/update-checkout-config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/update_checkout/update-checkout-config.json b/utils/update_checkout/update-checkout-config.json index 9a91cf87989f4..26af8596d4eda 100644 --- a/utils/update_checkout/update-checkout-config.json +++ b/utils/update_checkout/update-checkout-config.json @@ -241,7 +241,7 @@ "ninja": "253e94c1fa511704baeb61cf69995bbf09ba435e", "icu": "release-61-1", "tensorflow": "7818652c950b1b1922efe5f4345886058d0ffba5", - "tensorflow-swift-bindings": "e47ccceb5213a84100aa73c31bc680a554efb0ca", + "tensorflow-swift-bindings": "4df45bf9ba3c0ec2269b3baa6f42668db4f73196", "tensorflow-swift-apis": "b64ee8184553ea979a17ee06a5e200cc4d132df0" } } From 1540a4fa8b97f2c1a9d85cfa70a0df558db7df9f Mon Sep 17 00:00:00 2001 From: Richard Wei Date: Mon, 1 Apr 2019 06:16:46 -0700 Subject: [PATCH 3/7] Update update-checkout-config.json --- utils/update_checkout/update-checkout-config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/update_checkout/update-checkout-config.json b/utils/update_checkout/update-checkout-config.json index 26af8596d4eda..ceae13d56edd6 100644 --- a/utils/update_checkout/update-checkout-config.json +++ b/utils/update_checkout/update-checkout-config.json @@ -241,7 +241,7 @@ "ninja": "253e94c1fa511704baeb61cf69995bbf09ba435e", "icu": "release-61-1", "tensorflow": "7818652c950b1b1922efe5f4345886058d0ffba5", - "tensorflow-swift-bindings": "4df45bf9ba3c0ec2269b3baa6f42668db4f73196", + "tensorflow-swift-bindings": "0957744551614e433dbabc725cba29ff5ddb91d3", "tensorflow-swift-apis": "b64ee8184553ea979a17ee06a5e200cc4d132df0" } } From 4241573b221d97c5725142714cc6c97e7864e697 Mon Sep 17 00:00:00 2001 From: Richard Wei Date: Tue, 2 Apr 2019 05:36:49 -0700 Subject: [PATCH 4/7] Update update-checkout-config.json --- utils/update_checkout/update-checkout-config.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/utils/update_checkout/update-checkout-config.json b/utils/update_checkout/update-checkout-config.json index ceae13d56edd6..6d9049d7cb880 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": "5e8df789cc30098d791475c14a623ec68b50b4ed", "tensorflow-swift-bindings": "0957744551614e433dbabc725cba29ff5ddb91d3", - "tensorflow-swift-apis": "b64ee8184553ea979a17ee06a5e200cc4d132df0" + "tensorflow-swift-apis": "16124b6a5d33ea41f4d9ab0c24b545b2e593c9f5" } } } From 502367a7d96f7b35fc9273f537bd5470b6becb91 Mon Sep 17 00:00:00 2001 From: Richard Wei Date: Wed, 3 Apr 2019 13:10:56 -0700 Subject: [PATCH 5/7] Update update-checkout-config.json --- utils/update_checkout/update-checkout-config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/update_checkout/update-checkout-config.json b/utils/update_checkout/update-checkout-config.json index 6d9049d7cb880..28a7eaf71c5e6 100644 --- a/utils/update_checkout/update-checkout-config.json +++ b/utils/update_checkout/update-checkout-config.json @@ -242,7 +242,7 @@ "icu": "release-61-1", "tensorflow": "5e8df789cc30098d791475c14a623ec68b50b4ed", "tensorflow-swift-bindings": "0957744551614e433dbabc725cba29ff5ddb91d3", - "tensorflow-swift-apis": "16124b6a5d33ea41f4d9ab0c24b545b2e593c9f5" + "tensorflow-swift-apis": "18f937191bdc9ddbe5df8f99f0dc64e1a4c0ffab" } } } From 9f277e7cc17c3ea6641f7fe1950dd80d0b9ca6ed Mon Sep 17 00:00:00 2001 From: Dan Zheng Date: Sat, 6 Apr 2019 07:00:05 -0700 Subject: [PATCH 6/7] Fix tests. Add `explicit_paddings` Conv2D attribute. --- test/TensorFlow/deabstraction_finished.swift | 2 +- test/TensorFlow/no_copy.swift | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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:} From 8a98f6f42106905442a41e974c06d97137670443 Mon Sep 17 00:00:00 2001 From: Richard Wei Date: Sun, 7 Apr 2019 03:30:25 +0100 Subject: [PATCH 7/7] Fix collective test. --- test/TensorFlowRuntime/collective.swift | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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)