Numerics Support (#1127)

* build: always enable swift-numerics

This is now possible to build on all platforms, just always enable it.

* build: link against swift-numerics

When building against the stock toolchain, explicitly link against swift
numerics.

Author: compnerd

CMakeLists.txt

@@ -29,16 +29,14 @@ option(USE_BUNDLED_CTENSORFLOW
   "Use the CTensorFlow module bundled in the active Swift toolchain" OFF)
 option(ENABLE_PYTHON_SUPPORT
   "Enable Python interop using PythonKit" ON)
-
-# FIXME: disable swift-numerics on Darwin as `-force-autoload-symbol` and
-# `-incremental` do not play well together on Darwin.
-if(CMAKE_SYSTEM_NAME STREQUAL Darwin)
-  set(ENABLE_SWIFT_NUMERICS_default NO)
-else()
-  set(ENABLE_SWIFT_NUMERICS_default YES)
-endif()
 option(ENABLE_SWIFT_NUMERICS
-  "Enable integrating swift-numerics" ${ENABLE_SWIFT_NUMERICS_default})
+  "Enable integrating swift-numerics" YES)
+
+include(CMakeDependentOption)
+cmake_dependent_option(TENSORFLOW_USE_STANDARD_TOOLCHAIN
+  "Experimental support to use a standard toolchain" OFF
+  "ENABLE_SWIFT_NUMERICS"
+  NO)
 
 if(ENABLE_SWIFT_NUMERICS)
   include(ExternalProject)

Sources/TensorFlow/CMakeLists.txt

@@ -97,6 +97,7 @@ target_link_libraries(TensorFlow PUBLIC
   CTensorFlow
   $<$<NOT:$<PLATFORM_ID:Darwin>>:dispatch>
   $<$<NOT:$<PLATFORM_ID:Darwin>>:Foundation>
+  $<$<AND:$<BOOL:${ENABLE_SWIFT_NUMERICS}>,$<BOOL:${TENSORFLOW_USE_STANDARD_TOOLCHAIN}>>:Numerics>
   Tensor)
 if(ENABLE_PYTHON_SUPPORT)
   target_link_libraries(TensorFlow PUBLIC

Sources/x10/CMakeLists.txt

@@ -13,6 +13,7 @@ add_library(x10_optimizers_optimizer SHARED
 set_target_properties(x10_optimizers_optimizer PROPERTIES
   INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_Swift_MODULE_DIRECTORY})
 target_link_libraries(x10_optimizers_optimizer PUBLIC
+  $<$<AND:$<BOOL:${ENABLE_SWIFT_NUMERICS}>,$<BOOL:${TENSORFLOW_USE_STANDARD_TOOLCHAIN}>>:Numerics>
   x10_optimizers_tensor_visitor_plan
   TensorFlow)