PIN to 2023_11_29

.bazelrc

@@ -526,34 +526,9 @@ build:rbe_linux_cuda --repo_env=TF_TENSORRT_CONFIG_REPO="@sigbuild-r2.16-clang_c
 build:rbe_linux_cuda --repo_env=TF_NCCL_CONFIG_REPO="@sigbuild-r2.16-clang_config_nccl"
 test:rbe_linux_cuda --test_env=LD_LIBRARY_PATH="/usr/local/cuda/lib64:/usr/local/cuda/extras/CUPTI/lib64"
 
-build:rbe_linux_cuda_nvcc --config=cuda
-build:rbe_linux_cuda_nvcc --action_env=TF_NVCC_CLANG="1"
+build:rbe_linux_cuda_nvcc --config=rbe_linux_cuda
 build:rbe_linux_cuda_nvcc --repo_env TF_NCCL_USE_STUB=1
-build:rbe_linux_cuda_nvcc --@xla//xla/python:enable_gpu=true
-build:rbe_linux_cuda_nvcc --@xla//xla/python:jax_cuda_pip_rpaths=true
-build:rbe_linux_cuda_nvcc --define=xla_python_enable_gpu=true
-build:rbe_linux_cuda_nvcc --config=tensorrt
-build:rbe_linux_cuda_nvcc --repo_env=TF_CUDA_COMPUTE_CAPABILITIES="sm_50,sm_60,sm_70,sm_75,compute_80"
-build:rbe_linux_cuda_nvcc --action_env=TF_CUDA_VERSION="12"
-build:rbe_linux_cuda_nvcc --action_env=TF_CUDNN_VERSION="8"
-build:rbe_linux_cuda_nvcc --action_env=CUDA_TOOLKIT_PATH="/usr/local/cuda-12.2"
-build:rbe_linux_cuda_nvcc --action_env=LD_LIBRARY_PATH="/usr/local/cuda/lib64:/usr/local/cuda/extras/CUPTI/lib64"
-build:rbe_linux_cuda_nvcc --crosstool_top="@ubuntu20.04-clang_manylinux2014-cuda12.2-cudnn8.9_config_cuda//crosstool:toolchain"
-build:rbe_linux_cuda_nvcc --config=rbe_linux
-build:rbe_linux_cuda_nvcc --host_crosstool_top="@ubuntu20.04-clang_manylinux2014-cuda12.2-cudnn8.9_config_cuda//crosstool:toolchain"
-build:rbe_linux_cuda_nvcc --extra_toolchains="@ubuntu20.04-clang_manylinux2014-cuda12.2-cudnn8.9_config_cuda//crosstool:toolchain-linux-x86_64"
-build:rbe_linux_cuda_nvcc --extra_execution_platforms="@ubuntu20.04-clang_manylinux2014-cuda12.2-cudnn8.9_config_platform//:platform"
-build:rbe_linux_cuda_nvcc --host_platform="@ubuntu20.04-clang_manylinux2014-cuda12.2-cudnn8.9_config_platform//:platform"
-build:rbe_linux_cuda_nvcc --platforms="@ubuntu20.04-clang_manylinux2014-cuda12.2-cudnn8.9_config_platform//:platform"
-build:rbe_linux_cuda_nvcc --repo_env=TF_PYTHON_CONFIG_REPO="@ubuntu20.04-clang_manylinux2014-cuda12.2-cudnn8.9_config_python3.9"
-build:rbe_linux_cuda_nvcc --python_path="/usr/bin/python3"
-# These you may need to change for your own GCP project.
-common:rbe_linux_cuda_nvcc --remote_instance_name=projects/tensorflow-testing/instances/default_instance
-build:rbe_linux_cuda_nvcc --repo_env=REMOTE_GPU_TESTING=1
-build:rbe_linux_cuda_nvcc --repo_env=TF_CUDA_CONFIG_REPO="@ubuntu20.04-gcc9_manylinux2014-cuda12.2-cudnn8.9_config_cuda"
-build:rbe_linux_cuda_nvcc --repo_env=TF_TENSORRT_CONFIG_REPO="@ubuntu20.04-gcc9_manylinux2014-cuda12.2-cudnn8.9_config_tensorrt"
-build:rbe_linux_cuda_nvcc --repo_env=TF_NCCL_CONFIG_REPO="@ubuntu20.04-gcc9_manylinux2014-cuda12.2-cudnn8.9_config_nccl"
-test:rbe_linux_cuda_nvcc --test_env=LD_LIBRARY_PATH="/usr/local/cuda/lib64:/usr/local/cuda/extras/CUPTI/lib64"
+build:rbe_linux_cuda_nvcc --action_env=TF_NVCC_CLANG="1"
 
 # TODO(kanglan): Remove rbe_win and rbe_win_py3* after b/289091160 is fixed
 build:rbe_win --config=rbe_base

.bazelversion

@@ -1,2 +1,2 @@
-6.1.0
+6.4.0
 # NOTE: Update Bazel version in tensorflow/tools/ci_build/release/common.sh.oss

.kokoro/jax/build.sh

@@ -74,7 +74,6 @@ build_and_test_on_rbe_gpu() {
   # Runs non-multiaccelerator tests with one GPU apiece.
   # It appears --run_under needs an absolute path.
 
-  # TODO(ddunleavy): reenable `LaxTest.testBitcastConvertType`
   bazel \
     test \
     --verbose_failures=true \
@@ -87,7 +86,7 @@ build_and_test_on_rbe_gpu() {
     --test_output=errors \
     --test_env=JAX_SKIP_SLOW_TESTS=1 \
     --test_env=TF_CPP_MIN_LOG_LEVEL=0 \
-    --test_env=JAX_EXCLUDE_TEST_TARGETS="PmapTest.testSizeOverflow|LaxTest.testBitcastConvertType" \
+    --test_env=JAX_EXCLUDE_TEST_TARGETS="PmapTest.testSizeOverflow" \
     --test_tag_filters=-multiaccelerator \
     -- //tests:gpu_tests //tests:backend_independent_tests
 }

.kokoro/linux/build.sh

@@ -26,10 +26,6 @@ function is_linux_gpu_job() {
   [[ "$KOKORO_JOB_NAME" =~ tensorflow/xla/linux/.*gpu.* ]]
 }
 
-function is_use_nvcc() {
-  [[ "${USE_NVCC:-}" == "true" ]]
-}
-
 # Pull the container (in case it was updated since the instance started) and
 # store its SHA in the Sponge log.
 docker pull "$DOCKER_IMAGE"
@@ -54,11 +50,7 @@ if is_linux_gpu_job ; then
     TAGS_FILTER="$TAGS_FILTER,gpu,requires-gpu-nvidia,-no_gpu"
     ADDITIONAL_FLAGS="$ADDITIONAL_FLAGS --run_under=//tools/ci_build/gpu_build:parallel_gpu_execute"
     RC_FILE="/usertools/gpu.bazelrc"
-    if is_use_nvcc ; then
-      RBE_CONFIG="rbe_linux_cuda_nvcc"
-    else
-      RBE_CONFIG="rbe_linux_cuda"
-    fi
+    RBE_CONFIG="rbe_linux_cuda_nvcc"
     echo "***NOTE: nvidia-smi lists the highest CUDA version the driver supports, which may be different than the version of CUDA actually used!!***"
     nvidia-smi
 else

third_party/llvm/generated.patch

@@ -1 +1,12 @@
 Auto generated patch. Do not edit or delete it, even if empty.
+diff -ruN --strip-trailing-cr a/utils/bazel/llvm-project-overlay/libc/BUILD.bazel b/utils/bazel/llvm-project-overlay/libc/BUILD.bazel
+--- a/utils/bazel/llvm-project-overlay/libc/BUILD.bazel
++++ b/utils/bazel/llvm-project-overlay/libc/BUILD.bazel
+@@ -594,6 +594,7 @@
+     name = "__support_bit",
+     hdrs = ["src/__support/bit.h"],
+     deps = [
++        ":__support_cpp_type_traits",
+         ":__support_macros_attributes",
+     ],
+ )

third_party/llvm/workspace.bzl

@@ -4,8 +4,8 @@ load("//third_party:repo.bzl", "tf_http_archive")
 
 def repo(name):
     """Imports LLVM."""
-    LLVM_COMMIT = "af7a1453526a88a0e242baf156244aa4ae42ae4b"
-    LLVM_SHA256 = "f9f75e4823c2f09a8141ab4db40ee2c79aef96017782a9338e26621ee547d3d5"
+    LLVM_COMMIT = "f688e0901213726feb9b26cedc61919413cbf59c"
+    LLVM_SHA256 = "b8885c22a9b77f9c91a316b21d71414a7b48dae38513f170da1554002e85b030"
 
     tf_http_archive(
         name = name,

third_party/stablehlo/temporary.patch

@@ -156,127 +156,6 @@ diff --ruN a/stablehlo/stablehlo/CMakeLists.txt b/stablehlo/stablehlo/CMakeLists
  add_subdirectory(integrations)
  add_subdirectory(reference)
  add_subdirectory(tests)
-diff --ruN a/stablehlo/stablehlo/experimental/BUILD b/stablehlo/stablehlo/experimental/BUILD
---- stablehlo/stablehlo/experimental/BUILD
-+++ stablehlo/stablehlo/experimental/BUILD
-@@ -0,0 +1,117 @@
-+load("//third_party/llvm/llvm-project/mlir:tblgen.bzl", "gentbl_cc_library")
-+load("//tensorflow:tensorflow.google.bzl", "get_compatible_with_portable")
-+load("//tensorflow/core/platform:rules_cc.bzl", "cc_library")
-+
-+package(
-+    default_applicable_licenses = ["//third_party/stablehlo:license"],  # copybara:comment
-+    default_visibility = ["//learning/brain/mlir:stablehlo_friends"],
-+    licenses = ["notice"],
-+)
-+
-+filegroup(
-+    name = "stablehlo_experimental_filegroup",
-+    srcs = glob(["**"]),
-+)
-+
-+cc_library(
-+    name = "experimental_base",
-+    srcs = [
-+        "dialect/Base.cpp",
-+    ],
-+    hdrs = [
-+        "dialect/Base.h",
-+    ],
-+    compatible_with = get_compatible_with_portable(),
-+    includes = ["../.."],
-+    deps = [
-+        "//third_party/llvm/llvm-project/llvm:Support",
-+        "//third_party/llvm/llvm-project/mlir:IR",
-+    ],
-+)
-+
-+cc_library(
-+    name = "experimental_stablehlo_ops",
-+    srcs = [
-+        "dialect/StablehloOps.cpp",
-+    ],
-+    hdrs = [
-+        "dialect/StablehloOps.h",
-+    ],
-+    compatible_with = get_compatible_with_portable(),
-+    includes = ["../.."],
-+    deps = [
-+        ":experimental_base",
-+        "//third_party/llvm/llvm-project/llvm:Support",
-+        "//third_party/llvm/llvm-project/mlir:FuncDialect",
-+        "//third_party/llvm/llvm-project/mlir:IR",
-+        "//third_party/llvm/llvm-project/mlir:Support",
-+        "//third_party/stablehlo:stablehlo_ops",
-+    ],
-+)
-+
-+gentbl_cc_library(
-+    name = "experimental_stablehlo_pass_inc_gen",
-+    compatible_with = get_compatible_with_portable(),
-+    tbl_outs = [
-+        (
-+            [
-+                "-gen-pass-decls",
-+            ],
-+            "transforms/Passes.h.inc",
-+        ),
-+    ],
-+    tblgen = "//third_party/llvm/llvm-project/mlir:mlir-tblgen",
-+    td_file = "transforms/Passes.td",
-+    deps = ["//third_party/llvm/llvm-project/mlir:PassBaseTdFiles"],
-+)
-+
-+cc_library(
-+    name = "experimental_stablehlo_passes",
-+    srcs = [
-+        "transforms/StablehloCanonicalizeDynamism.cpp",
-+        "transforms/StablehloRefineShapes.cpp",
-+    ],
-+    hdrs = [
-+        "transforms/Passes.h",
-+    ],
-+    compatible_with = get_compatible_with_portable(),
-+    includes = ["../.."],
-+    deps = [
-+        ":experimental_stablehlo_ops",
-+        ":experimental_stablehlo_pass_inc_gen",
-+        "//third_party/llvm/llvm-project/llvm:Support",
-+        "//third_party/llvm/llvm-project/mlir:FuncDialect",
-+        "//third_party/llvm/llvm-project/mlir:IR",
-+        "//third_party/llvm/llvm-project/mlir:InferTypeOpInterface",
-+        "//third_party/llvm/llvm-project/mlir:Pass",
-+        "//third_party/llvm/llvm-project/mlir:Support",
-+        "//third_party/llvm/llvm-project/mlir:TransformUtils",
-+        "//third_party/llvm/llvm-project/mlir:Transforms",
-+        "//third_party/stablehlo:base",
-+        "//third_party/stablehlo:chlo_ops",
-+        "//third_party/stablehlo:stablehlo_ops",
-+        "//third_party/stablehlo:stablehlo_ops_inc_gen",
-+        "//third_party/stablehlo:stablehlo_type_inference",
-+    ],
-+)
-+
-+cc_binary(
-+    name = "experimental-stablehlo-opt",
-+    srcs = [
-+        "tools/StablehloOptMain.cpp",
-+    ],
-+    compatible_with = get_compatible_with_portable(),
-+    includes = ["../.."],
-+    deps = [
-+        ":experimental_stablehlo_passes",
-+        "//third_party/llvm/llvm-project/mlir:AllExtensions",
-+        "//third_party/llvm/llvm-project/mlir:AllPassesAndDialects",
-+        "//third_party/llvm/llvm-project/mlir:MlirOptLib",
-+        "//third_party/llvm/llvm-project/mlir:TosaDialect",
-+        "//third_party/stablehlo:interpreter_ops",
-+        "//third_party/stablehlo:register",
-+        "//third_party/stablehlo:stablehlo_passes",
-+        "//third_party/stablehlo:test_utils",
-+        "//third_party/stablehlo:tosa_passes",
-+    ],
-+)
 diff --ruN a/stablehlo/stablehlo/experimental/BUILD.bazel b/stablehlo/stablehlo/experimental/BUILD.bazel
 --- stablehlo/stablehlo/experimental/BUILD.bazel
 +++ stablehlo/stablehlo/experimental/BUILD.bazel
@@ -1291,7 +1170,7 @@ diff --ruN a/stablehlo/stablehlo/experimental/dialect/StablehloOps.h b/stablehlo
 diff --ruN a/stablehlo/stablehlo/experimental/tests/BUILD.bazel b/stablehlo/stablehlo/experimental/tests/BUILD.bazel
 --- stablehlo/stablehlo/experimental/tests/BUILD.bazel
 +++ stablehlo/stablehlo/experimental/tests/BUILD.bazel
-@@ -0,0 +1,58 @@
+@@ -0,0 +1,59 @@
 +# Copyright 2023 The StableHLO Authors. All Rights Reserved.
 +#
 +# Licensed under the Apache License, Version 2.0 (the "License");
@@ -1338,6 +1217,7 @@ diff --ruN a/stablehlo/stablehlo/experimental/tests/BUILD.bazel b/stablehlo/stab
 +            "lit.site.cfg.py",
 +            "//:stablehlo-opt",
 +            "//:stablehlo-translate",
++            "//stablehlo/experimental:experimental-stablehlo-opt",
 +            "@llvm-project//llvm:FileCheck",
 +            "@llvm-project//llvm:not",
 +        ] + glob(["%s.bc" % src]),
@@ -2509,7 +2389,7 @@ diff --ruN a/stablehlo/stablehlo/experimental/transforms/StablehloCanonicalizeDy
 diff --ruN a/stablehlo/stablehlo/experimental/transforms/StablehloRefineShapes.cpp b/stablehlo/stablehlo/experimental/transforms/StablehloRefineShapes.cpp
 --- stablehlo/stablehlo/experimental/transforms/StablehloRefineShapes.cpp
 +++ stablehlo/stablehlo/experimental/transforms/StablehloRefineShapes.cpp
-@@ -0,0 +1,1293 @@
+@@ -0,0 +1,1308 @@
 +/* Copyright 2022 The StableHLO Authors.
 +Licensed under the Apache License, Version 2.0 (the "License");
 +you may not use this file except in compliance with the License.
@@ -2818,6 +2698,20 @@ diff --ruN a/stablehlo/stablehlo/experimental/transforms/StablehloRefineShapes.c
 +  }
 +};
 +
++struct EvalOrOpPattern : public OpRewritePattern<OrOp> {
++  using OpRewritePattern::OpRewritePattern;
++  LogicalResult matchAndRewrite(OrOp op,
++                                PatternRewriter& rewriter) const override {
++    auto resultType = op.getType();
++    if (!resultType.getElementType().isInteger(1))
++      return rewriter.notifyMatchFailure(op, "expected boolean element type");
++
++    return evalElementwise(rewriter, op, [&](APSInt lhsInt, APSInt rhsInt) {
++      return getAPSInt(resultType.getElementType(), lhsInt != 0 || rhsInt != 0);
++    });
++  }
++};
++
 +struct EvalRemOpPattern : public OpRewritePattern<RemOp> {
 +  using OpRewritePattern::OpRewritePattern;
 +  LogicalResult matchAndRewrite(RemOp op,
@@ -3764,6 +3658,7 @@ diff --ruN a/stablehlo/stablehlo/experimental/transforms/StablehloRefineShapes.c
 +    patterns.add<EvalMaxOpPattern>(&getContext());
 +    patterns.add<EvalMinOpPattern>(&getContext());
 +    patterns.add<EvalMulOpPattern>(&getContext());
++    patterns.add<EvalOrOpPattern>(&getContext());
 +    patterns.add<EvalRemOpPattern>(&getContext());
 +    patterns.add<EvalReshapeOpPattern>(&getContext());
 +    patterns.add<EvalSelectOpPattern>(&getContext());
@@ -3803,4 +3698,59 @@ diff --ruN a/stablehlo/stablehlo/experimental/transforms/StablehloRefineShapes.c
 +}  // namespace experimental
 +}  // namespace stablehlo
 +}  // namespace mlir
+diff --ruN a/stablehlo/stablehlo/tests/stablehlo_refine_shapes.mlir b/stablehlo/stablehlo/tests/stablehlo_refine_shapes.mlir
+--- stablehlo/stablehlo/tests/stablehlo_refine_shapes.mlir
++++ stablehlo/stablehlo/tests/stablehlo_refine_shapes.mlir
+@@ -340,6 +340,19 @@
+   %1 = stablehlo.constant dense<2> : tensor<i64>
+   %2 = stablehlo.multiply %0, %1 : tensor<i64>
+   func.return %2 : tensor<i64>
++}
++
++// -----
++
++// CHECK-LABEL: func @eval_or
++func.func @eval_or() -> tensor<i1> {
++  // CHECK-NOT: stablehlo.or
++  // CHECK: [[RESULT:%.*]] = stablehlo.constant dense<true> : tensor<i1>
++  // CHECK: return [[RESULT]]
++  %0 = stablehlo.constant dense<true> : tensor<i1>
++  %1 = stablehlo.constant dense<false> : tensor<i1>
++  %2 = stablehlo.or %0, %1 : tensor<i1>
++  func.return %2 : tensor<i1>
+ }
+
+ // -----
+diff --ruN a/stablehlo/stablehlo/transforms/StablehloRefineShapes.cpp b/stablehlo/stablehlo/transforms/StablehloRefineShapes.cpp
+--- stablehlo/stablehlo/transforms/StablehloRefineShapes.cpp
++++ stablehlo/stablehlo/transforms/StablehloRefineShapes.cpp
+@@ -304,6 +304,20 @@
+   }
+ };
+
++struct EvalOrOpPattern : public OpRewritePattern<OrOp> {
++  using OpRewritePattern::OpRewritePattern;
++  LogicalResult matchAndRewrite(OrOp op,
++                                PatternRewriter& rewriter) const override {
++    auto resultType = op.getType();
++    if (!resultType.getElementType().isInteger(1))
++      return rewriter.notifyMatchFailure(op, "expected boolean element type");
++
++    return evalElementwise(rewriter, op, [&](APSInt lhsInt, APSInt rhsInt) {
++      return getAPSInt(resultType.getElementType(), lhsInt != 0 || rhsInt != 0);
++    });
++  }
++};
++
+ struct EvalRemOpPattern : public OpRewritePattern<RemOp> {
+   using OpRewritePattern::OpRewritePattern;
+   LogicalResult matchAndRewrite(RemOp op,
+@@ -1165,6 +1179,7 @@
+     patterns.add<EvalMaxOpPattern>(&getContext());
+     patterns.add<EvalMinOpPattern>(&getContext());
+     patterns.add<EvalMulOpPattern>(&getContext());
++    patterns.add<EvalOrOpPattern>(&getContext());
+     patterns.add<EvalRemOpPattern>(&getContext());
+     patterns.add<EvalReshapeOpPattern>(&getContext());
+     patterns.add<EvalSelectOpPattern>(&getContext());
 

third_party/stablehlo/workspace.bzl

@@ -4,8 +4,8 @@ load("//third_party:repo.bzl", "tf_http_archive", "tf_mirror_urls")
 
 def repo():
     # LINT.IfChange
-    STABLEHLO_COMMIT = "e3276cd896751bfbebd7b18112f81547fbc2bc9c"
-    STABLEHLO_SHA256 = "948d0265a9ea4214ecfa854564793b08161d693e9cfbd73686f2df9e38034ada"
+    STABLEHLO_COMMIT = "83f095e7217c897f1eccac5652600ceb944cb0e0"
+    STABLEHLO_SHA256 = "00e442f7e9c8a52a1ac774ce997f8b5a99d12450c4dfe1594df816dcbad5126f"
     # LINT.ThenChange(Google-internal path)
 
     tf_http_archive(

third_party/tsl/.bazelrc

@@ -526,34 +526,9 @@ build:rbe_linux_cuda --repo_env=TF_TENSORRT_CONFIG_REPO="@sigbuild-r2.16-clang_c
 build:rbe_linux_cuda --repo_env=TF_NCCL_CONFIG_REPO="@sigbuild-r2.16-clang_config_nccl"
 test:rbe_linux_cuda --test_env=LD_LIBRARY_PATH="/usr/local/cuda/lib64:/usr/local/cuda/extras/CUPTI/lib64"
 
-build:rbe_linux_cuda_nvcc --config=cuda
-build:rbe_linux_cuda_nvcc --action_env=TF_NVCC_CLANG="1"
+build:rbe_linux_cuda_nvcc --config=rbe_linux_cuda
 build:rbe_linux_cuda_nvcc --repo_env TF_NCCL_USE_STUB=1
-build:rbe_linux_cuda_nvcc --@xla//xla/python:enable_gpu=true
-build:rbe_linux_cuda_nvcc --@xla//xla/python:jax_cuda_pip_rpaths=true
-build:rbe_linux_cuda_nvcc --define=xla_python_enable_gpu=true
-build:rbe_linux_cuda_nvcc --config=tensorrt
-build:rbe_linux_cuda_nvcc --repo_env=TF_CUDA_COMPUTE_CAPABILITIES="sm_50,sm_60,sm_70,sm_75,compute_80"
-build:rbe_linux_cuda_nvcc --action_env=TF_CUDA_VERSION="12"
-build:rbe_linux_cuda_nvcc --action_env=TF_CUDNN_VERSION="8"
-build:rbe_linux_cuda_nvcc --action_env=CUDA_TOOLKIT_PATH="/usr/local/cuda-12.2"
-build:rbe_linux_cuda_nvcc --action_env=LD_LIBRARY_PATH="/usr/local/cuda/lib64:/usr/local/cuda/extras/CUPTI/lib64"
-build:rbe_linux_cuda_nvcc --crosstool_top="@ubuntu20.04-clang_manylinux2014-cuda12.2-cudnn8.9_config_cuda//crosstool:toolchain"
-build:rbe_linux_cuda_nvcc --config=rbe_linux
-build:rbe_linux_cuda_nvcc --host_crosstool_top="@ubuntu20.04-clang_manylinux2014-cuda12.2-cudnn8.9_config_cuda//crosstool:toolchain"
-build:rbe_linux_cuda_nvcc --extra_toolchains="@ubuntu20.04-clang_manylinux2014-cuda12.2-cudnn8.9_config_cuda//crosstool:toolchain-linux-x86_64"
-build:rbe_linux_cuda_nvcc --extra_execution_platforms="@ubuntu20.04-clang_manylinux2014-cuda12.2-cudnn8.9_config_platform//:platform"
-build:rbe_linux_cuda_nvcc --host_platform="@ubuntu20.04-clang_manylinux2014-cuda12.2-cudnn8.9_config_platform//:platform"
-build:rbe_linux_cuda_nvcc --platforms="@ubuntu20.04-clang_manylinux2014-cuda12.2-cudnn8.9_config_platform//:platform"
-build:rbe_linux_cuda_nvcc --repo_env=TF_PYTHON_CONFIG_REPO="@ubuntu20.04-clang_manylinux2014-cuda12.2-cudnn8.9_config_python3.9"
-build:rbe_linux_cuda_nvcc --python_path="/usr/bin/python3"
-# These you may need to change for your own GCP project.
-common:rbe_linux_cuda_nvcc --remote_instance_name=projects/tensorflow-testing/instances/default_instance
-build:rbe_linux_cuda_nvcc --repo_env=REMOTE_GPU_TESTING=1
-build:rbe_linux_cuda_nvcc --repo_env=TF_CUDA_CONFIG_REPO="@ubuntu20.04-gcc9_manylinux2014-cuda12.2-cudnn8.9_config_cuda"
-build:rbe_linux_cuda_nvcc --repo_env=TF_TENSORRT_CONFIG_REPO="@ubuntu20.04-gcc9_manylinux2014-cuda12.2-cudnn8.9_config_tensorrt"
-build:rbe_linux_cuda_nvcc --repo_env=TF_NCCL_CONFIG_REPO="@ubuntu20.04-gcc9_manylinux2014-cuda12.2-cudnn8.9_config_nccl"
-test:rbe_linux_cuda_nvcc --test_env=LD_LIBRARY_PATH="/usr/local/cuda/lib64:/usr/local/cuda/extras/CUPTI/lib64"
+build:rbe_linux_cuda_nvcc --action_env=TF_NVCC_CLANG="1"
 
 # TODO(kanglan): Remove rbe_win and rbe_win_py3* after b/289091160 is fixed
 build:rbe_win --config=rbe_base