Merge pull request #29819 from compnerd/swift-apis

build: add an option to optionally build tensorflow-swift-apis

Author: compnerd

utils/build-script

@@ -220,6 +220,7 @@ def validate_arguments(toolchain, args):
         'build_playgroundsupport',
         'build_pythonkit',
         'build_sourcekitlsp',
+        'build_tensorflow_swift_apis',
         'build_toolchainbenchmarks',
         'tsan_libdispatch_test',
     ]
@@ -268,9 +269,13 @@ def default_stdlib_deployment_targets(args):
 def apply_default_arguments(toolchain, args):
     # Infer if ninja is required
     ninja_required = (
-        args.cmake_generator == 'Ninja' or args.build_foundation or
-        args.build_pythonkit or args.build_sourcekitlsp or
-        args.build_indexstoredb)
+        args.build_foundation or
+        args.build_indexstoredb or
+        args.build_pythonkit or
+        args.build_sourcekitlsp or
+        args.build_tensorflow_swift_apis or
+        args.cmake_generator == 'Ninja'
+    )
     if ninja_required and toolchain.ninja is None:
         args.build_ninja = True
 
@@ -820,6 +825,8 @@ class BuildScriptInvocation(object):
             product_classes.append(products.PlaygroundSupport)
         if self.args.build_pythonkit:
             product_classes.append(products.PythonKit)
+        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

@@ -605,6 +605,12 @@ def create_argument_parser():
     option('--pythonkit', store_true('build_pythonkit'),
            help='build PythonKit')
 
+    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

@@ -86,6 +86,7 @@
     'build_swift_stdlib_unittest_extra': False,
     'build_swiftpm': False,
     'build_swiftsyntax': False,
+    'build_tensorflow_swift_apis': False,
     'build_libparser_only': False,
     'build_skstresstester': False,
     'build_swiftevolve': False,
@@ -99,6 +100,7 @@
     'install_sourcekitlsp': False,
     'install_skstresstester': False,
     'install_swiftevolve': False,
+    'install_tensorflow_swift_apis': False,
     'build_toolchainbenchmarks': False,
     'build_tvos': True,
     'build_tvos_device': False,
@@ -455,6 +457,9 @@ class BuildScriptImplOption(_BaseOption):
                   dest='install_playgroundsupport'),
     SetTrueOption('--install-pythonkit', dest='install_pythonkit'),
     SetTrueOption('--test-pythonkit', dest='test_pythonkit'),
+    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('--swiftsyntax', dest='build_swiftsyntax'),

utils/swift_build_support/swift_build_support/products/__init__.py

@@ -29,6 +29,7 @@
 from .swiftevolve import SwiftEvolve
 from .swiftpm import SwiftPM
 from .swiftsyntax import SwiftSyntax
+from .tensorflow import TensorFlowSwiftAPIs
 from .tsan_libdispatch import TSanLibDispatch
 from .xctest import XCTest
 
@@ -47,6 +48,7 @@
     'PythonKit',
     'Swift',
     'SwiftPM',
+    'TensorFlowSwiftAPIs',
     'XCTest',
     'SwiftSyntax',
     'SKStressTester',

utils/swift_build_support/swift_build_support/products/tensorflow.py

@@ -0,0 +1,60 @@
+# swift_build_support/products/tensorflow.py --------------------*- python -*-
+#
+# This source file is part of the Swift.org open source project
+#
+# Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
+# Licensed under Apache License v2.0 with Runtime Library Exception
+#
+# See https://swift.org/LICENSE.txt for license information
+# See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+#
+# ----------------------------------------------------------------------------
+
+from . import product
+from .. import shell
+
+
+class TensorFlowSwiftAPIs(product.Product):
+    @classmethod
+    def product_source_name(cls):
+        return "tensorflow-swift-apis"
+
+    @classmethod
+    def is_build_script_impl_product(cls):
+        return False
+
+    def should_build(self, host_target):
+        return self.args.build_tensorflow_swift_apis
+
+    def build(self, host_target):
+        shell.call([
+            self.toolchain.cmake,
+            '-G', 'Ninja',
+            '-D', 'BUILD_SHARED_LIBS=YES',
+            '-D', 'CMAKE_INSTALL_PREFIX={}/usr'.format(
+                self.args.install_destdir),
+            '-D', 'CMAKE_MAKE_PROGRAM={}'.format(self.toolchain.ninja),
+            '-D', 'CMAKE_Swift_COMPILER={}'.format(self.toolchain.swiftc),
+            '-B', self.build_dir,
+            '-S', self.source_dir,
+        ])
+        shell.call([
+            self.toolchain.cmake,
+            '--build', self.build_dir,
+        ])
+
+    def should_test(self, host_target):
+        return False
+
+    def test(self, host_target):
+        pass
+
+    def should_install(self, host_target):
+        return self.args.install_tensorflow_swift_apis
+
+    def install(self, host_target):
+        shell.call([
+            self.toolchain.cmake,
+            '--build', self.build_dir,
+            '--target', 'install',
+        ])

utils/update_checkout/update-checkout-config.json

@@ -39,6 +39,9 @@
         "pythonkit": {
             "remote": { "id": "pvieito/PythonKit" }
         },
+        "tensorflow-swift-apis": {
+            "remote": { "id": "tensorflow/swift-apis" }
+        },
        "indexstore-db": {
             "remote": { "id": "apple/indexstore-db" } },
         "sourcekit-lsp": {
@@ -72,7 +75,8 @@
                 "indexstore-db": "master",
                 "sourcekit-lsp": "master",
                 "swift-format": "master",
-                "pythonkit": "master"
+                "pythonkit": "master",
+                "tensorflow-swift-apis": "master"
             }
         },
         "next" : {