swiftlang · eaplatanios · Apr 19, 2019 · Apr 19, 2019 · Apr 19, 2019 · Apr 19, 2019
diff --git a/README.md b/README.md
@@ -152,8 +152,8 @@ Below is more information about TensorFlow-related build arguments.
     * Default value: None.
 * `tensorflow-swift-apis`: A path to the [tensorflow/swift-apis](https://github.com/tensorflow/swift-apis) deep learning library repository.
     * Default value: `tensorflow-swift-apis` if the [tensorflow/swift-apis](https://github.com/tensorflow/swift-apis) repository is cloned. Otherwise, none.
-* `tensorflow-swift-bindings`: A generated TensorFlow Swift bindings file (`RawOpsGenerated.swift`) obtained from [tensorflow/swift-bindings](https://github.com/tensorflow/swift-bindings).
-    * Default value: `tensorflow-swift-bindings/RawOpsGenerated.swift` if the [tensorflow/swift-bindings](https://github.com/tensorflow/swift-bindings) repository is cloned. Otherwise, none.
+* `tensorflow-swift-bindings`: A path to the [tensorflow/swift-bindings](https://github.com/tensorflow/swift-bindings) repository.
+    * Default value: `tensorflow-swift-bindings` if the [tensorflow/swift-bindings](https://github.com/tensorflow/swift-bindings) repository is cloned. Otherwise, none.
 
 ### Build systems
 

diff --git a/cmake/modules/SwiftSource.cmake b/cmake/modules/SwiftSource.cmake
@@ -240,7 +240,8 @@ function(_compile_swift_files
     # Also, disable it for DifferentiationUnittest because resilience changes
     # the AD code # that gets generated (leading to additional leaks)
     # (see: TF-328)
-    if(NOT "${SWIFTFILE_MODULE_NAME}" STREQUAL "TensorFlow" AND
+    if(NOT "${SWIFTFILE_MODULE_NAME}" STREQUAL "TensorFlowCore" AND
+       NOT "${SWIFTFILE_MODULE_NAME}" STREQUAL "TensorFlow" AND
        NOT "${SWIFTFILE_MODULE_NAME}" STREQUAL "DifferentiationUnittest")
       list(APPEND swift_flags "-Xfrontend" "-enable-resilience")
     endif()

diff --git a/include/swift/AST/ASTContext.h b/include/swift/AST/ASTContext.h
@@ -481,16 +481,16 @@ class ASTContext final {
   CanType getAnyObjectType() const;
 
   // SWIFT_ENABLE_TENSORFLOW
-  /// Retrieve the decl for TensorFlow.TensorHandle iff the TensorFlow module
-  /// has been imported.  Otherwise, this returns null.
+  /// Retrieve the decl for TensorFlowCore.TensorHandle iff the TensorFlowCore 
+  /// module has been imported.  Otherwise, this returns null.
   ClassDecl *getTensorHandleDecl() const;
 
-  /// Retrieve the decl for TensorFlow.TensorShape iff the TensorFlow module
-  /// has been imported.  Otherwise, this returns null.
+  /// Retrieve the decl for TensorFlowCore.TensorShape iff the TensorFlowCore 
+  /// module has been imported.  Otherwise, this returns null.
   StructDecl *getTensorShapeDecl() const;
 
-  /// Retrieve the decl for TensorFlow.TensorDataType iff the TensorFlow module
-  /// has been imported.  Otherwise, this returns null.
+  /// Retrieve the decl for TensorFlowCore.TensorDataType iff the TensorFlowCore
+  /// module has been imported.  Otherwise, this returns null.
   StructDecl *getTensorDataTypeDecl() const;
 
   /// Retrieve the type for Swift._AutoDiffTape.

diff --git a/include/swift/AST/KnownIdentifiers.def b/include/swift/AST/KnownIdentifiers.def
@@ -121,7 +121,7 @@ IDENTIFIER(withArguments)
 IDENTIFIER(withKeywordArguments)
 
 // SWIFT_ENABLE_TENSORFLOW
-IDENTIFIER(TensorFlow)
+IDENTIFIER(TensorFlowCore)
 // KeyPathIterable
 IDENTIFIER(AllKeyPaths)
 IDENTIFIER(allKeyPaths)

diff --git a/lib/AST/ASTContext.cpp b/lib/AST/ASTContext.cpp
@@ -821,14 +821,14 @@ CanType ASTContext::getAnyObjectType() const {
 }
 
 // SWIFT_ENABLE_TENSORFLOW
-/// Retrieve the decl for TensorFlow.TensorHandle iff the TensorFlow module has
-/// been imported.  Otherwise, this returns null.
+/// Retrieve the decl for TensorFlowCore.TensorHandle iff the TensorFlow module 
+/// has been imported.  Otherwise, this returns null.
 ClassDecl *ASTContext::getTensorHandleDecl() const {
   if (getImpl().TensorHandleDecl)
     return getImpl().TensorHandleDecl;
 
   // See if the TensorFlow module was imported.  If not, return null.
-  auto tfModule = getLoadedModule(Id_TensorFlow);
+  auto tfModule = getLoadedModule(Id_TensorFlowCore);
   if (!tfModule)
     return nullptr;
 
@@ -842,14 +842,14 @@ ClassDecl *ASTContext::getTensorHandleDecl() const {
   return nullptr;
 }
 
-/// Retrieve the decl for TensorFlow.TensorShape iff the TensorFlow module has
-/// been imported.  Otherwise, this returns null.
+/// Retrieve the decl for TensorFlowCore.TensorShape iff the TensorFlow module 
+/// has been imported.  Otherwise, this returns null.
 StructDecl *ASTContext::getTensorShapeDecl() const {
   if (getImpl().TensorShapeDecl)
     return getImpl().TensorShapeDecl;
 
   // See if the TensorFlow module was imported.  If not, return null.
-  auto tfModule = getLoadedModule(Id_TensorFlow);
+  auto tfModule = getLoadedModule(Id_TensorFlowCore);
   if (!tfModule)
     return nullptr;
 
@@ -863,14 +863,14 @@ StructDecl *ASTContext::getTensorShapeDecl() const {
   return nullptr;
 }
 
-/// Retrieve the decl for TensorFlow.TensorDataType iff the TensorFlow module has
-/// been imported.  Otherwise, this returns null.
+/// Retrieve the decl for TensorFlowCore.TensorDataType iff the TensorFlow 
+/// module has been imported.  Otherwise, this returns null.
 StructDecl *ASTContext::getTensorDataTypeDecl() const {
   if (getImpl().TensorDataTypeDecl)
     return getImpl().TensorDataTypeDecl;
 
   // See if the TensorFlow module was imported.  If not, return null.
-  auto tfModule = getLoadedModule(Id_TensorFlow);
+  auto tfModule = getLoadedModule(Id_TensorFlowCore);
   if (!tfModule)
     return nullptr;
 
@@ -987,7 +987,7 @@ ProtocolDecl *ASTContext::getProtocol(KnownProtocolKind kind) const {
   case KnownProtocolKind::TensorFlowDataTypeCompatible:
   case KnownProtocolKind::TensorSendableReceivable:
   case KnownProtocolKind::TensorProtocol:
-    M = getLoadedModule(Id_TensorFlow);
+    M = getLoadedModule(Id_TensorFlowCore);
     break;
   default:
     M = getStdlibModule();
@@ -1886,7 +1886,7 @@ ASTContext::getModule(ArrayRef<std::pair<Identifier, SourceLoc>> ModulePath) {
           (ModulePath[0].first == StdlibModuleName ||
            ModulePath[0].first == Id_Foundation ||
            // SWIFT_ENABLE_TENSORFLOW
-           ModulePath[0].first == Id_TensorFlow))
+           ModulePath[0].first == Id_TensorFlowCore))
         recordKnownProtocols(M);
       return M;
     }

diff --git a/lib/IRGen/IRGenSIL.cpp b/lib/IRGen/IRGenSIL.cpp
@@ -2007,7 +2007,7 @@ void IRGenSILFunction::visitGraphOperationInst(GraphOperationInst *i) {
   tf::GraphOperationInfo opInfo(i);
 
   // TODO: As an optimization, do this lookup once per CurSILFn
-  auto tfModule = astCtx.getLoadedModule(astCtx.Id_TensorFlow);
+  auto tfModule = astCtx.getLoadedModule(astCtx.Id_TensorFlowCore);
   assert(tfModule && "could not find TensorFlow module");
   auto inputTensorGroupProto =
       astCtx.getProtocol(KnownProtocolKind::TensorArrayProtocol);

diff --git a/lib/SILOptimizer/Mandatory/TFDeabstraction.cpp b/lib/SILOptimizer/Mandatory/TFDeabstraction.cpp
@@ -2603,7 +2603,7 @@ void TFDeabstractionPass::run() {
   // If the TensorFlow module hasn't been imported by the program, don't do
   // anything.  This avoids impacting compile time for non-TensorFlow using
   // Swift programs by doing extraneous analysis.
-  auto tfModule = ctx.getLoadedModule(ctx.Id_TensorFlow);
+  auto tfModule = ctx.getLoadedModule(ctx.Id_TensorFlowCore);
   if (!tfModule)
     return;
 

diff --git a/lib/SILOptimizer/Mandatory/TFPartition.cpp b/lib/SILOptimizer/Mandatory/TFPartition.cpp
@@ -4478,7 +4478,7 @@ void TFPartition::run() {
   // If the TensorFlow module hasn't been imported by the program, don't do
   // anything.  This avoids impacting compile time for non-TensorFlow using
   // Swift programs by doing extraneous analysis.
-  tfModule = ctx.getLoadedModule(ctx.Id_TensorFlow);
+  tfModule = ctx.getLoadedModule(ctx.Id_TensorFlowCore);
   if (!tfModule)
     return;
 

diff --git a/lib/SILOptimizer/PassManager/Passes.cpp b/lib/SILOptimizer/PassManager/Passes.cpp
@@ -144,7 +144,6 @@ void swift::runSILTFPartitionPass(SILModule &Module) {
   // Verify the module, if required.
   if (Module.getOptions().VerifyAll)
     Module.verify();
-
 }
 
 void swift::runSILOptimizationPassesWithFileSpecification(SILModule &M,

diff --git a/lib/Sema/CSApply.cpp b/lib/Sema/CSApply.cpp
@@ -2424,8 +2424,8 @@ namespace {
       // The result type must conform to TensorGroup or be a tuple of types that
       // conform to TensorGroup.
 
-      auto tfModule = ctx.getLoadedModule(ctx.Id_TensorFlow);
-      assert(tfModule && "could not find TensorFlow module");
+      auto tfModule = ctx.getLoadedModule(ctx.Id_TensorFlowCore);
+      assert(tfModule && "could not find TensorFlowCore module");
       auto tensorGroupProto = ctx.getProtocol(KnownProtocolKind::TensorGroup);
       assert(tensorGroupProto && "could not find TensorGroup protocol");