@@ -294,6 +294,8 @@ build:tpu --define=enable_mlir_bridge=true
294294build:rocm --crosstool_top=@local_config_rocm//crosstool:toolchain
295295build:rocm --define=using_rocm_hipcc=true
296296build:rocm --define=tensorflow_mkldnn_contraction_kernel=0
297+ build:rocm --define=xnn_enable_avxvnniint8=false
298+ build:rocm --define=xnn_enable_avx512fp16=false
297299build:rocm --repo_env TF_NEED_ROCM=1
298300
299301build:rocm_clang_official --config=rocm
@@ -303,6 +305,10 @@ build:rocm_clang_official --linkopt="-fuse-ld=lld"
303305build:rocm_clang_official --host_linkopt="-fuse-ld=lld"
304306
305307build:rocm_ci --config=rocm_clang_official
308+ build:rocm_ci_hermetic --config=rocm_clang_official
309+ build:rocm_ci_hermetic --repo_env="OS=ubuntu_22.04"
310+ build:rocm_ci_hermetic --repo_env="ROCM_VERSION=6.2.0"
311+ build:rocm_ci_hermetic --@local_config_rocm//rocm:use_rocm_hermetic_rpath=True
306312
307313build:sycl --crosstool_top=@local_config_sycl//crosstool:toolchain
308314build:sycl --define=using_sycl=true
@@ -469,22 +475,19 @@ test:win_clang --linkopt=/FORCE:MULTIPLE
469475test:win_clang --host_linkopt=/FORCE:MULTIPLE
470476test:win_clang --action_env=PATHEXT=.COM;.EXE;.BAT;.CMD;.VBS;.VBE;.JS;.JSE;.WSF;.WSH;.MSC;.PY;.PYW
471477
472- # build:windows_x86_cpu --extra_toolchains="//tensorflow/tools/toolchains/win2022/20241118:cc-toolchain-x64_windows-clang-cl"
473- # build:windows_x86_cpu --extra_execution_platforms="//tensorflow/tools/toolchains/win2022:windows_ltsc2022_clang"
474- # build:windows_x86_cpu --host_platform="//tensorflow/tools/toolchains/win2022:windows_ltsc2022_clang"
475- build:windows_x86_cpu --crosstool_top="//tensorflow/tools/toolchains/win2022/20241118:toolchain"
476- build:windows_x86_cpu --extra_toolchains="//tensorflow/tools/toolchains/win2022/20241118:cc-toolchain-x64_windows-clang-cl"
477- build:windows_x86_cpu --extra_execution_platforms="//tensorflow/tools/toolchains/win2022:windows_ltsc2022_clang"
478- build:windows_x86_cpu --host_platform="//tensorflow/tools/toolchains/win2022:windows_ltsc2022_clang"
479- build:windows_x86_cpu --platforms="//tensorflow/tools/toolchains/win2022:windows_ltsc2022_clang"
480- build:windows_x86_cpu --copt=/clang:-Weverything
481- build:windows_x86_cpu --host_copt=/clang:-Weverything
482- build:windows_x86_cpu --compiler=clang-cl
483- build:windows_x86_cpu --linkopt=/FORCE:MULTIPLE
484- build:windows_x86_cpu --host_linkopt=/FORCE:MULTIPLE
485- test:windows_x86_cpu --linkopt=/FORCE:MULTIPLE
486- test:windows_x86_cpu --host_linkopt=/FORCE:MULTIPLE
487- test:windows_x86_cpu --action_env=PATHEXT=.COM;.EXE;.BAT;.CMD;.VBS;.VBE;.JS;.JSE;.WSF;.WSH;.MSC;.PY;.PYW
478+ build:windows_x86_cpu_2022 --crosstool_top="//tensorflow/tools/toolchains/win2022/20241118:toolchain"
479+ build:windows_x86_cpu_2022 --extra_toolchains="//tensorflow/tools/toolchains/win2022/20241118:cc-toolchain-x64_windows-clang-cl"
480+ build:windows_x86_cpu_2022 --extra_execution_platforms="//tensorflow/tools/toolchains/win2022:windows_ltsc2022_clang"
481+ build:windows_x86_cpu_2022 --host_platform="//tensorflow/tools/toolchains/win2022:windows_ltsc2022_clang"
482+ build:windows_x86_cpu_2022 --platforms="//tensorflow/tools/toolchains/win2022:windows_ltsc2022_clang"
483+ build:windows_x86_cpu_2022 --copt=/clang:-Weverything
484+ build:windows_x86_cpu_2022 --host_copt=/clang:-Weverything
485+ build:windows_x86_cpu_2022 --compiler=clang-cl
486+ build:windows_x86_cpu_2022 --linkopt=/FORCE:MULTIPLE
487+ build:windows_x86_cpu_2022 --host_linkopt=/FORCE:MULTIPLE
488+ test:windows_x86_cpu_2022 --linkopt=/FORCE:MULTIPLE
489+ test:windows_x86_cpu_2022 --host_linkopt=/FORCE:MULTIPLE
490+ test:windows_x86_cpu_2022 --action_env=PATHEXT=.COM;.EXE;.BAT;.CMD;.VBS;.VBE;.JS;.JSE;.WSF;.WSH;.MSC;.PY;.PYW
488491
489492# Options to build TensorFlow 1.x or 2.x.
490493# TODO(kanglan): Change v2's define to default behavior
@@ -599,6 +602,7 @@ build:rbe_win_clang --host_linkopt=/FORCE:MULTIPLE
599602
600603# TODO(belitskiy): Rename `rbe_win_clang` to this, once done switching presubmits.
601604build:rbe_windows_x86_cpu --config=rbe_win_clang
605+ build:rbe_windows_x86_cpu_2022 --config=rbe_win_base --config=windows_x86_cpu_2022
602606
603607# END TF REMOTE BUILD EXECUTION OPTIONS
604608
@@ -615,7 +619,6 @@ build:elinux_armhf --copt -mfp16-format=ieee
615619
616620# Load rc file written by ./configure.
617621try-import %workspace%/.tf_configure.bazelrc
618- try-import %workspace%/xla_configure.bazelrc
619622
620623# Load rc file with user-specific options.
621624try-import %workspace%/.bazelrc.user
@@ -756,7 +759,7 @@ build:tf_public_macos_cache_push --config=tf_public_macos_cache --remote_upload_
756759# LIBTENSORFLOW TESTS are for building Libtensorflow archives. These are CUDA/CPU-agnostic.
757760test:linux_libtensorflow_test --config=cuda_wheel -- //tensorflow/tools/lib_package:libtensorflow_test //tensorflow/tools/lib_package:libtensorflow_java_test
758761build:linux_libtensorflow_build --config=cuda_wheel -- //tensorflow/tools/lib_package:libtensorflow.tar.gz //tensorflow/tools/lib_package:libtensorflow_jni.tar.gz //tensorflow/java:libtensorflow.jar //tensorflow/java:libtensorflow-src.jar //tensorflow/tools/lib_package:libtensorflow_proto.zip
759- build:windows_libtensorflow_build --config=cuda_wheel --config=windows_x86_cpu -- //:LICENSE //tensorflow:tensorflow.dll //tensorflow:tensorflow_dll_import_lib //tensorflow/tools/lib_package:clicenses_generate //tensorflow/java:tensorflow_jni.dll //tensorflow/tools/lib_package:jnilicenses_generate
762+ build:windows_libtensorflow_build --config=cuda_wheel --config=windows_x86_cpu_2022 -- //:LICENSE //tensorflow:tensorflow.dll //tensorflow:tensorflow_dll_import_lib //tensorflow/tools/lib_package:clicenses_generate //tensorflow/java:tensorflow_jni.dll //tensorflow/tools/lib_package:jnilicenses_generate
760763
761764# PYTHON TESTS run a suite of Python tests intended for verifying that the Python wheel
762765# will work properly. These are usually run Nightly or upon Release.
@@ -790,6 +793,8 @@ test:windows_x86_cpu_wheel_test_filters --test_tag_filters=-no_windows,-windows_
790793test:windows_x86_cpu_wheel_test_filters --build_tag_filters=-no_windows,-windows_excluded,-no_oss,-oss_excluded,-benchmark-test
791794test:windows_x86_cpu_wheel_test_filters --test_lang_filters=cc,py --test_size_filters=small,medium --test_timeout="300,450,1200,3600"
792795test:windows_x86_cpu_wheel_test --build_tests_only --config=windows_x86_cpu_pycpp_test_filters -- //tensorflow/... -//tensorflow/java/... -//tensorflow/lite/... -//tensorflow/compiler/...
796+ # TODO(belitskiy): Get rid of once 2019 is shut down
797+ test:windows_x86_cpu_2022_wheel_test --config=windows_x86_cpu_wheel_test
793798
794799# PYCPP TESTS run a suite of Python and C++ tests to verify general correctness over
795800# the whole TF code base. These are usually run continuously or upon presubmit.
@@ -846,6 +851,7 @@ test:windows_x86_cpu_pycpp_test_filters --build_tag_filters=-no_windows,-windows
846851test:windows_x86_cpu_pycpp_test_filters --test_lang_filters=cc,py --test_size_filters=small,medium --test_timeout="300,450,1200,3600"
847852test:windows_x86_cpu_pycpp_test_opts --config=windows_x86_cpu_pycpp_test_build_opts --build_tests_only
848853test: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/...
854+ test:windows_x86_cpu_2022_pycpp_test --config=windows_x86_cpu_pycpp_test
849855
850856# END TF TEST SUITE OPTIONS
851857
@@ -915,6 +921,3 @@ build:rbe_cross_compile_macos_x86 --jobs=100
915921test:rbe_cross_compile_macos_x86 --jobs=100
916922# END MACOS CROSS-COMPILE CONFIGS
917923# END CROSS-COMPILE CONFIGS
918-
919- # Try to load the XLA warnings config if available
920- try-import %workspace%/warnings.bazelrc
0 commit comments