From 3bf7e1ae488174aa6b29cc3f2c216785dd161af8 Mon Sep 17 00:00:00 2001 From: Vladimir Belitskiy Date: Wed, 7 Aug 2024 15:11:52 -0700 Subject: [PATCH] Set up a new Windows presubmit, and have it use the pycpp.sh script. PiperOrigin-RevId: 660554802 --- .bazelrc | 18 +++++++++++++++--- third_party/tsl/.bazelrc | 18 +++++++++++++++--- 2 files changed, 30 insertions(+), 6 deletions(-) diff --git a/.bazelrc b/.bazelrc index 11783a8012ddb..edb4659a8cf4c 100644 --- a/.bazelrc +++ b/.bazelrc @@ -573,6 +573,9 @@ build:rbe_win_clang --compiler=clang-cl build:rbe_win_clang --linkopt=/FORCE:MULTIPLE build:rbe_win_clang --host_linkopt=/FORCE:MULTIPLE +# TODO(belitskiy): Rename `rbe_win_clang` to this, once done switching presubmits. +build:rbe_windows_x86_cpu --config=rbe_win_clang + # END TF REMOTE BUILD EXECUTION OPTIONS # TFLite build configs for generic embedded Linux @@ -787,17 +790,19 @@ test:macos_x86_wheel_test --config=macos_x86_wheel_test_filters -- //tensorflow/ # PYCPP TESTS run a suite of Python and C++ tests to verify general correctness over # the whole TF code base. These are usually run continuously or upon presubmit. -# CPU PYCPP: +# LINUX CPU PYCPP: test:linux_cpu_pycpp_test_filters --test_tag_filters=-no_oss,-oss_excluded,-oss_serial,-gpu,-tpu,-benchmark-test,-v1only test:linux_cpu_pycpp_test_filters --build_tag_filters=-no_oss,-oss_excluded,-oss_serial,-gpu,-tpu,-benchmark-test,-v1only test:linux_cpu_pycpp_test_filters --test_lang_filters=cc,py --test_size_filters=small,medium test:linux_cpu_pycpp_test --config=linux_cpu_pycpp_test_filters -- //tensorflow/... -//tensorflow/compiler/tf2tensorrt/... -//tensorflow/core/tpu/... -//tensorflow/lite/... -//tensorflow/tools/toolchains/... -# CUDA PYCPP: + +# LINUX CUDA PYCPP: test:linux_cuda_pycpp_test_filters --test_tag_filters=-no_oss,-oss_excluded,-oss_serial,-benchmark-test,-v1only,gpu,-no_gpu,-no_gpu_presubmit,-no_cuda11 test:linux_cuda_pycpp_test_filters --build_tag_filters=-no_oss,-oss_excluded,-oss_serial,-benchmark-test,-v1only,gpu,-no_gpu,-no_gpu_presubmit,-no_cuda11 test:linux_cuda_pycpp_test_filters --test_lang_filters=cc,py --test_size_filters=small,medium test:linux_cuda_pycpp_test --config=linux_cuda_pycpp_test_filters -- //tensorflow/... -//tensorflow/compiler/tf2tensorrt/... -//tensorflow/core/tpu/... -//tensorflow/lite/... -//tensorflow/tools/toolchains/... -# ARM64 PYCPP + +# LINUX ARM64 PYCPP # In Linux Arm64 presubmit/continuous build, we cross-compile the binaries on # Linux x86 so that we can use RBE. Since tests still need to run on the single # host Arm64 machine, the build becomes too slow (~30 min) to be a presubmit. @@ -830,6 +835,13 @@ build:macos_x86_pycpp_test --config=macos_x86_pycpp_test_filters -- //tensorflow # CROSS-COMPILE MACOS X86 PYCPP build:cross_compile_macos_x86_pycpp_test --config=macos_x86_pycpp_test build:cross_compile_macos_x86_pycpp_test -//tensorflow/core/kernels:quantized_conv_ops_test -//tensorflow/core/kernels:quantized_matmul_op_test -//tensorflow/python/ops:quantized_conv_ops_test -//tensorflow/tools/graph_transforms:transforms_test -//tensorflow/python/tools:aot_compiled_test +# WINDOWS X86-64 CPU PYCPP +test:windows_x86_cpu_pycpp_test_filters --test_tag_filters=-no_windows,-windows_excluded,-no_oss,-oss_excluded,-gpu,-tpu,-benchmark-test +test:windows_x86_cpu_pycpp_test_filters --build_tag_filters=-no_windows,-windows_excluded,-no_oss,-oss_excluded,-benchmark-test +test:windows_x86_cpu_pycpp_test_filters --test_lang_filters=cc,py --test_size_filters=small,medium --test_timeout="300,450,1200,3600" +test:windows_x86_cpu_pycpp_test_opts --copt=/d2ReducedOptimizeHugeFunctions --host_copt=/d2ReducedOptimizeHugeFunctions --dynamic_mode=off --build_tests_only +test:windows_x86_cpu_pycpp_test --config=windows_x86_cpu_pycpp_test_opts --config=windows_x86_cpu_pycpp_test_filters -- //tensorflow/... -//tensorflow/java/... -//tensorflow/lite/... -//tensorflow/compiler/... + # END TF TEST SUITE OPTIONS # START CROSS-COMPILE CONFIGS diff --git a/third_party/tsl/.bazelrc b/third_party/tsl/.bazelrc index 11783a8012ddb..edb4659a8cf4c 100644 --- a/third_party/tsl/.bazelrc +++ b/third_party/tsl/.bazelrc @@ -573,6 +573,9 @@ build:rbe_win_clang --compiler=clang-cl build:rbe_win_clang --linkopt=/FORCE:MULTIPLE build:rbe_win_clang --host_linkopt=/FORCE:MULTIPLE +# TODO(belitskiy): Rename `rbe_win_clang` to this, once done switching presubmits. +build:rbe_windows_x86_cpu --config=rbe_win_clang + # END TF REMOTE BUILD EXECUTION OPTIONS # TFLite build configs for generic embedded Linux @@ -787,17 +790,19 @@ test:macos_x86_wheel_test --config=macos_x86_wheel_test_filters -- //tensorflow/ # PYCPP TESTS run a suite of Python and C++ tests to verify general correctness over # the whole TF code base. These are usually run continuously or upon presubmit. -# CPU PYCPP: +# LINUX CPU PYCPP: test:linux_cpu_pycpp_test_filters --test_tag_filters=-no_oss,-oss_excluded,-oss_serial,-gpu,-tpu,-benchmark-test,-v1only test:linux_cpu_pycpp_test_filters --build_tag_filters=-no_oss,-oss_excluded,-oss_serial,-gpu,-tpu,-benchmark-test,-v1only test:linux_cpu_pycpp_test_filters --test_lang_filters=cc,py --test_size_filters=small,medium test:linux_cpu_pycpp_test --config=linux_cpu_pycpp_test_filters -- //tensorflow/... -//tensorflow/compiler/tf2tensorrt/... -//tensorflow/core/tpu/... -//tensorflow/lite/... -//tensorflow/tools/toolchains/... -# CUDA PYCPP: + +# LINUX CUDA PYCPP: test:linux_cuda_pycpp_test_filters --test_tag_filters=-no_oss,-oss_excluded,-oss_serial,-benchmark-test,-v1only,gpu,-no_gpu,-no_gpu_presubmit,-no_cuda11 test:linux_cuda_pycpp_test_filters --build_tag_filters=-no_oss,-oss_excluded,-oss_serial,-benchmark-test,-v1only,gpu,-no_gpu,-no_gpu_presubmit,-no_cuda11 test:linux_cuda_pycpp_test_filters --test_lang_filters=cc,py --test_size_filters=small,medium test:linux_cuda_pycpp_test --config=linux_cuda_pycpp_test_filters -- //tensorflow/... -//tensorflow/compiler/tf2tensorrt/... -//tensorflow/core/tpu/... -//tensorflow/lite/... -//tensorflow/tools/toolchains/... -# ARM64 PYCPP + +# LINUX ARM64 PYCPP # In Linux Arm64 presubmit/continuous build, we cross-compile the binaries on # Linux x86 so that we can use RBE. Since tests still need to run on the single # host Arm64 machine, the build becomes too slow (~30 min) to be a presubmit. @@ -830,6 +835,13 @@ build:macos_x86_pycpp_test --config=macos_x86_pycpp_test_filters -- //tensorflow # CROSS-COMPILE MACOS X86 PYCPP build:cross_compile_macos_x86_pycpp_test --config=macos_x86_pycpp_test build:cross_compile_macos_x86_pycpp_test -//tensorflow/core/kernels:quantized_conv_ops_test -//tensorflow/core/kernels:quantized_matmul_op_test -//tensorflow/python/ops:quantized_conv_ops_test -//tensorflow/tools/graph_transforms:transforms_test -//tensorflow/python/tools:aot_compiled_test +# WINDOWS X86-64 CPU PYCPP +test:windows_x86_cpu_pycpp_test_filters --test_tag_filters=-no_windows,-windows_excluded,-no_oss,-oss_excluded,-gpu,-tpu,-benchmark-test +test:windows_x86_cpu_pycpp_test_filters --build_tag_filters=-no_windows,-windows_excluded,-no_oss,-oss_excluded,-benchmark-test +test:windows_x86_cpu_pycpp_test_filters --test_lang_filters=cc,py --test_size_filters=small,medium --test_timeout="300,450,1200,3600" +test:windows_x86_cpu_pycpp_test_opts --copt=/d2ReducedOptimizeHugeFunctions --host_copt=/d2ReducedOptimizeHugeFunctions --dynamic_mode=off --build_tests_only +test:windows_x86_cpu_pycpp_test --config=windows_x86_cpu_pycpp_test_opts --config=windows_x86_cpu_pycpp_test_filters -- //tensorflow/... -//tensorflow/java/... -//tensorflow/lite/... -//tensorflow/compiler/... + # END TF TEST SUITE OPTIONS # START CROSS-COMPILE CONFIGS