@@ -349,26 +349,6 @@ differentiable_programming = lit_config.params.get('differentiable_programming',
349
349
if differentiable_programming is not None :
350
350
config .available_features .add ('differentiable_programming' )
351
351
352
- # SWIFT_ENABLE_TENSORFLOW
353
- swift_tensorflow_test_run_extra_options = ''
354
- swift_tensorflow_extra_options = ''
355
- if 'tensorflow' in config .available_features :
356
- swift_tensorflow_extra_options += (' -ltensorflow' )
357
- swift_tensorflow_path = lit_config .params .get ('swift_tensorflow_path' , None )
358
- if swift_tensorflow_path :
359
- swift_tensorflow_extra_options += (' -L %s' % os .path .abspath (swift_tensorflow_path ))
360
- swift_tensorflow_gpu = lit_config .params .get ('swift_tensorflow_gpu' , None )
361
- # Can use #if on CUDA to selectively disable tests for GPU.
362
- if swift_tensorflow_gpu is not None :
363
- swift_tensorflow_extra_options += ' -DCUDA'
364
- swift_tensorflow_test_run_extra_options += ' --target=gpu'
365
- config .substitutions .append ( ('%filecheck-tensorflow-extra-options' , ' --check-prefix=CHECK-GPU --check-prefix=CHECK' ) )
366
- else :
367
- config .substitutions .append ( ('%filecheck-tensorflow-extra-options' , '' ) )
368
- config .substitutions .append ( ('%swift-tensorflow-extra-options' , swift_tensorflow_extra_options ) )
369
- config .substitutions .append ( ('%swift-tensorflow-test-run-extra-options' , swift_tensorflow_test_run_extra_options ) )
370
- # SWIFT_ENABLE_TENSORFLOW END
371
-
372
352
test_options = os .environ .get ('SWIFT_TEST_OPTIONS' )
373
353
if test_options :
374
354
config .swift_test_options += ' '
@@ -810,13 +790,12 @@ if run_vendor == 'apple':
810
790
811
791
config .target_build_swift = (
812
792
("%s %s %s -F %r -toolchain-stdlib-rpath " +
813
- "-Xlinker -rpath -Xlinker %r %s %s %s %s %s " ) %
793
+ "-Xlinker -rpath -Xlinker %r %s %s %s %s" ) %
814
794
(xcrun_prefix , config .swiftc , target_options ,
815
795
extra_frameworks_dir ,
816
796
"/tmp/swifttest-device/lib" ,
817
797
sdk_overlay_linker_opt , config .swift_test_options ,
818
798
config .swift_driver_test_options ,
819
- swift_tensorflow_extra_options ,
820
799
swift_execution_tests_extra_flags ))
821
800
config .target_run = "unsupported"
822
801
@@ -850,7 +829,6 @@ if run_vendor == 'apple':
850
829
extra_frameworks_dir ,
851
830
sdk_overlay_linker_opt , config .swift_test_options ,
852
831
config .swift_driver_test_options ,
853
- swift_tensorflow_extra_options ,
854
832
swift_execution_tests_extra_flags ))
855
833
# FIXME: allow specification of simulator and version
856
834
#
@@ -881,13 +859,12 @@ if run_vendor == 'apple':
881
859
882
860
config .target_build_swift = (
883
861
("%s %s %s -F %r -toolchain-stdlib-rpath "
884
- + "-Xlinker -rpath -Xlinker %r %s %s %s %s %s "
862
+ + "-Xlinker -rpath -Xlinker %r %s %s %s %s "
885
863
+ "-F %r -Xlinker -rpath -Xlinker %r" )
886
864
% (xcrun_prefix , config .swiftc , target_options ,
887
865
extra_frameworks_dir , extra_frameworks_dir ,
888
866
sdk_overlay_linker_opt , config .swift_test_options ,
889
867
config .swift_driver_test_options ,
890
- swift_tensorflow_extra_options ,
891
868
swift_execution_tests_extra_flags , sourcekitd_framework_dir ,
892
869
sourcekitd_framework_dir ))
893
870
config .target_run = ""
@@ -1185,8 +1162,7 @@ elif run_os == 'linux-androideabi' or run_os == 'linux-android':
1185
1162
android_include_paths_opt , android_link_paths_opt ,
1186
1163
'-use-ld=%s' % config .android_linker_name ,
1187
1164
resource_dir_opt , mcp_opt , config .swift_test_options ,
1188
- config .swift_driver_test_options , swift_tensorflow_extra_options ,
1189
- swift_execution_tests_extra_flags ])
1165
+ config .swift_driver_test_options , swift_execution_tests_extra_flags ])
1190
1166
config .target_codesign = "echo"
1191
1167
config .target_build_swift_dylib = ' ' .join ([
1192
1168
config .target_build_swift ,
@@ -1531,7 +1507,7 @@ if not getattr(config, 'target_run_simple_swift', None):
1531
1507
'%s %s %%s -o %%t/a.out -module-name main && '
1532
1508
'%s %%t/a.out && '
1533
1509
'%s %%t/a.out'
1534
- % (config .target_build_swift , mcp_opt , swift_tensorflow_extra_options , config .target_codesign , config .target_run ))
1510
+ % (config .target_build_swift , mcp_opt , config .target_codesign , config .target_run ))
1535
1511
config .target_run_stdlib_swift = (
1536
1512
'%%empty-directory(%%t) && '
1537
1513
'%s %s %%s -o %%t/a.out -module-name main '
@@ -1558,14 +1534,14 @@ if not getattr(config, 'target_run_simple_swift', None):
1558
1534
'%%line-directive %%t/main.swift -- '
1559
1535
'%s %%t/a.out'
1560
1536
% (config .target_build_swift , mcp_opt , config .target_codesign , config .target_run ))
1561
- # SWIFT_ENABLE_TENSORFLOW
1562
- # TODO: Remove when forward mode AD support is robust.
1563
- config .target_run_simple_swift_forward_mode_differentiation = (
1564
- '%%empty-directory(%%t) && '
1565
- '%s %s % %s -enable-experimental-forward-mode-differentiation -o %%t/a.out %s -module-name main && '
1566
- '%s %%t/a.out &&'
1567
- '%s %%t/a.out'
1568
- % (config .target_build_swift , mcp_opt , swift_tensorflow_extra_options , config .target_codesign , config .target_run ))
1537
+ # SWIFT_ENABLE_TENSORFLOW
1538
+ # TODO: Remove when forward mode AD support is robust.
1539
+ config .target_run_simple_swift_forward_mode_differentiation = (
1540
+ '%%empty-directory(%%t) && '
1541
+ '%s %%s -enable-experimental-forward-mode-differentiation -o %%t/a.out %s -module-name main && '
1542
+ '%s %%t/a.out &&'
1543
+ '%s %%t/a.out'
1544
+ % (config .target_build_swift , mcp_opt , config .target_codesign , config .target_run ))
1569
1545
1570
1546
#
1571
1547
# When changing substitutions, update docs/Testing.md.
@@ -1588,8 +1564,8 @@ config.substitutions.append(('%target-swift-frontend\(mock-sdk:([^)]+)\)',
1588
1564
SubstituteCaptures (r'%s \1 %s' % (subst_target_swift_frontend_mock_sdk ,
1589
1565
subst_target_swift_frontend_mock_sdk_after ))))
1590
1566
config .substitutions .append (('%target-swift-frontend' , config .target_swift_frontend ))
1591
- # SWIFT_ENABLE_TENSORFLOW
1592
- # TODO: Remove when forward mode AD support is robust.
1567
+ # SWIFT_ENABLE_TENSORFLOW
1568
+ # TODO: Remove when forward mode AD support is robust.
1593
1569
config .substitutions .append (('%target_run_simple_swift_forward_mode_differentiation' , config .target_run_simple_swift_forward_mode_differentiation ))
1594
1570
1595
1571
config .substitutions .append (('%target-run-simple-swiftgyb' , config .target_run_simple_swiftgyb ))
0 commit comments