Merge pull request swiftlang#33156 from compnerd/swift-apis

build: remove tensorflow-swift-apis from the master branch

Author: compnerd

utils/build-script

@@ -220,7 +220,6 @@ def validate_arguments(toolchain, args):
         'build_indexstoredb',
         'build_playgroundsupport',
         'build_sourcekitlsp',
-        'build_tensorflow_swift_apis',
         'build_toolchainbenchmarks',
         'build_swift_inspect',
         'tsan_libdispatch_test',
@@ -273,7 +272,6 @@ def apply_default_arguments(toolchain, args):
         args.build_foundation or
         args.build_indexstoredb or
         args.build_sourcekitlsp or
-        args.build_tensorflow_swift_apis or
         args.cmake_generator == 'Ninja'
     )
     if ninja_required and toolchain.ninja is None:
@@ -889,8 +887,6 @@ class BuildScriptInvocation(object):
             product_classes.append(products.IndexStoreDB)
         if self.args.build_playgroundsupport:
             product_classes.append(products.PlaygroundSupport)
-        if self.args.build_tensorflow_swift_apis:
-            product_classes.append(products.TensorFlowSwiftAPIs)
         if self.args.build_sourcekitlsp:
             product_classes.append(products.SourceKitLSP)
         if self.args.build_toolchainbenchmarks:

utils/build_swift/build_swift/driver_arguments.py

@@ -633,12 +633,6 @@ def create_argument_parser():
            store_true('install_playgroundsupport'),
            help='install playground support')
 
-    option('--tensorflow-swift-apis', store_true('build_tensorflow_swift_apis'),
-           help='build TensorFlow Swift APIs')
-    option('--install-tensorflow-swift-apis',
-           store_true('install_tensorflow_swift_apis'),
-           help='install TensorFlow Swift APIs')
-
     option('--build-ninja', toggle_true,
            help='build the Ninja tool')
 

utils/build_swift/tests/expected_options.py

@@ -90,7 +90,6 @@
     'build_swiftpm': False,
     'build_swift_driver': False,
     'build_swiftsyntax': False,
-    'build_tensorflow_swift_apis': False,
     'build_libparser_only': False,
     'build_skstresstester': False,
     'build_swiftformat': False,
@@ -107,7 +106,6 @@
     'install_sourcekitlsp': False,
     'install_skstresstester': False,
     'install_swiftevolve': False,
-    'install_tensorflow_swift_apis': False,
     'build_toolchainbenchmarks': False,
     'build_tvos': True,
     'build_tvos_device': False,
@@ -467,9 +465,6 @@ class BuildScriptImplOption(_BaseOption):
     SetTrueOption('--playgroundsupport', dest='build_playgroundsupport'),
     SetTrueOption('--install-playgroundsupport',
                   dest='install_playgroundsupport'),
-    SetTrueOption('--tensorflow-swift-apis', dest='build_tensorflow_swift_apis'),
-    SetTrueOption('--install-tensorflow-swift-apis',
-                  dest='install_tensorflow_swift_apis'),
     SetTrueOption('--skip-build'),
     SetTrueOption('--swiftpm', dest='build_swiftpm'),
     SetTrueOption('--swift-driver', dest='build_swift_driver'),

utils/swift_build_support/swift_build_support/products/__init__.py

@@ -31,7 +31,6 @@
 from .swiftinspect import SwiftInspect
 from .swiftpm import SwiftPM
 from .swiftsyntax import SwiftSyntax
-from .tensorflow import TensorFlowSwiftAPIs
 from .tsan_libdispatch import TSanLibDispatch
 from .xctest import XCTest
 
@@ -52,7 +51,6 @@
     'SwiftInspect',
     'SwiftPM',
     'SwiftDriver',
-    'TensorFlowSwiftAPIs',
     'XCTest',
     'SwiftSyntax',
     'SKStressTester',

utils/swift_build_support/swift_build_support/products/tensorflow.py

@@ -43,9 +43,6 @@
             "remote": { "id": "KitWare/CMake" },
             "platforms": [ "Linux" ]
         },
-        "tensorflow-swift-apis": {
-            "remote": { "id": "tensorflow/swift-apis" }
-        },
        "indexstore-db": {
             "remote": { "id": "apple/indexstore-db" } },
         "sourcekit-lsp": {
@@ -81,8 +78,7 @@
                 "cmake": "v3.16.5",
                 "indexstore-db": "master",
                 "sourcekit-lsp": "master",
-                "swift-format": "master",
-                "tensorflow-swift-apis": "master"
+                "swift-format": "master"
             }
         },
         "next" : {
@@ -112,8 +108,7 @@
                 "cmake": "v3.16.5",
                 "indexstore-db": "master",
                 "sourcekit-lsp": "master",
-                "swift-format": "master",
-                "tensorflow-swift-apis": "master"
+                "swift-format": "master"
             }
         },
        "swift-3.0-branch" : {
@@ -309,8 +304,7 @@
                 "cmake": "v3.16.5",
                 "indexstore-db": "release/5.3",
                 "sourcekit-lsp": "release/5.3",
-                "swift-format": "master",
-                "tensorflow-swift-apis": "master"
+                "swift-format": "master"
             }
         },
        "master-rebranch": {