---

yaml
---
r: 311291
b: refs/heads/tensorflow-merge
c: 6ecf965
h: refs/heads/master
i:
  311289: f9b0f08
  311287: fd23282

Author: Mingsheng Hong

[refs]

@@ -1379,7 +1379,7 @@ refs/heads/chase-my-tail: 8bb91443a9e81bbfac92a2621a0af887a1da8dbf
 refs/heads/consider-outer-alternatives: 708bac749ec60a22a79e2eefbe734f9488a7370d
 refs/heads/revert-25740-oops-i-linked-it-again: fdd41aeb682fc488572bdc1cf71b2ff6997ba576
 refs/heads/swift-5.1-branch-06-12-2019: e63b7b2d3b93c48232d386099d0ec525d21d8f8d
-refs/heads/tensorflow-merge: c31f49be3be10c113e0393097977f49de036fbf4
+refs/heads/tensorflow-merge: 6ecf96572ad279394ac6413a6667bc3411bdd048
 refs/heads/update-checkout-sha-info: 5832743c5c2a842976c42a508a4c6dcceefb0aef
 refs/tags/swift-5.1-DEVELOPMENT-SNAPSHOT-2019-06-12-a: 228f0448d9bb909aacbba4afcb7c600a405d15da
 refs/tags/swift-5.1-DEVELOPMENT-SNAPSHOT-2019-06-14-a: 922861a77b5fc2bf46bc917da70ceb15eef76836

branches/tensorflow-merge/stdlib/public/TensorFlow/CompilerRuntime.swift

@@ -82,6 +82,10 @@ public enum _ExecutionMode : Equatable {
 // TODO(hongm): Revisit the longer-term design.
 @_frozen
 public enum _RuntimeConfig {
+  /// When false, tensorflow runtime will be initialized before running any
+  /// tensor program in this process.
+  static public var tensorFlowRuntimeInitialized = false
+
   /// When true, run the entire tensor computation in
   /// _TFCStartTensorComputation(), instead of running it on a separate thread.
   /// - Note: Set to true only for debugging purposes.
@@ -229,8 +233,11 @@ public final class _ExecutionContext {
 
     // Initialize the TF runtime exactly once. Only affects local execution
     // (when _RuntimeConfig.tensorFlowServer is set to "").
-    InitTensorFlowRuntime(_RuntimeConfig.printsDebugLog ? 1 : 0,
-                          _RuntimeConfig.tensorflowVerboseLogLevel)
+    if !_RuntimeConfig.tensorFlowRuntimeInitialized {
+      InitTensorFlowRuntime(_RuntimeConfig.printsDebugLog ? 1 : 0,
+                            _RuntimeConfig.tensorflowVerboseLogLevel)
+      _RuntimeConfig.tensorFlowRuntimeInitialized = true
+    }
 
     guard let opts = TFE_NewContextOptions() else {
       fatalError("ContextOptions object can never be nil.")

branches/tensorflow-merge/test/TensorFlowRuntime/raw_ops.swift

@@ -86,8 +86,4 @@ RawOpsTests.testAllBackends("GreaterEqualOp") {
   testPointwiseBinaryOp(tfOp: Raw.greaterEqual, swiftOp: { $0 >= $1 })
 }
 
-#if CPU && !CUDA
-runAllTestsWithRemoteSession()
-#else
 runAllTests()
-#endif // CPU && !CUDA

branches/tensorflow-merge/test/TensorFlowRuntime/tensor.swift

@@ -508,6 +508,8 @@ func testShapeGetter4() {
 TensorTests.testAllBackends("ShapeGetter4", testShapeGetter4)
 
 #if CPU && !CUDA
+// For now it is sufficient to run remote tests with test cases in this file
+// only. When creating new test files, consider simply calling runAllTests().
 runAllTestsWithRemoteSession()
 #else
 runAllTests()