Remove references to XRT in build and CI tooling

.bazelrc

@@ -75,9 +75,6 @@ build:tpu --define=with_tpu_support=true
 test:tpu --local_test_jobs=1
 test:cuda --local_test_jobs=1
 
-# Exclude XRT from the build
-build:disable_xrt --define=disable_xrt=true
-
 #########################################################################
 # RBE config options below.
 # Flag to enable remote config

.github/workflows/_build.yml

@@ -20,11 +20,6 @@ on:
         type: string
         description: Whether to build XLA with CUDA
         default: 1
-      disable_xrt:
-        required: false
-        type: string
-        description: Whether to disable XRT in the build
-        default: 0
 
     secrets:
       gcloud-service-key:
@@ -48,7 +43,6 @@ jobs:
       SCCACHE_BUCKET: ossci-compiler-cache-circleci-v2
       GCLOUD_SERVICE_KEY: ${{ secrets.gcloud-service-key }}
       XLA_CUDA: ${{ inputs.cuda }}
-      DISABLE_XRT: ${{ inputs.disable_xrt }}
       BAZEL_JOBS: 16
     steps:
       - name: Setup Linux
@@ -88,7 +82,6 @@ jobs:
         shell: bash
         run: |
           echo "declare -x SCCACHE_BUCKET=${SCCACHE_BUCKET}" | docker exec -i "${pid}" sh -c "cat >> env"
-          echo "declare -x DISABLE_XRT=${DISABLE_XRT}" | docker exec -i "${pid}" sh -c "cat >> xla_env"
           echo "declare -x XLA_CUDA=${XLA_CUDA}" | docker exec -i "${pid}" sh -c "cat >> xla_env"
           echo "declare -x BAZEL_JOBS=${BAZEL_JOBS}" | docker exec -i "${pid}" sh -c "cat >> xla_env"
           echo "declare -x BAZEL_REMOTE_CACHE=1" | docker exec -i "${pid}" sh -c "cat >> xla_env"
@@ -107,13 +100,7 @@ jobs:
         id: upload-docker-image
         shell: bash
         run: |
-          if [[ ${DISABLE_XRT} == 1 ]]; then
-            image_tag_base=latest
-          else
-            image_tag_base=latest-xrt
-          fi
-
-          export COMMIT_DOCKER_IMAGE="${ECR_DOCKER_IMAGE_BASE}:${image_tag_base}-${GITHUB_SHA}"
+          export COMMIT_DOCKER_IMAGE="${ECR_DOCKER_IMAGE_BASE}:latest-${GITHUB_SHA}"
           time docker commit "${pid}" "${COMMIT_DOCKER_IMAGE}"
           time docker push "${COMMIT_DOCKER_IMAGE}"
           echo "docker-image=${COMMIT_DOCKER_IMAGE}" >> "${GITHUB_OUTPUT}"

.github/workflows/_test.yml

@@ -27,11 +27,6 @@ on:
         type: string
         default: 0
         description: Whether to disable PJRT tests
-      disable-xrt:
-        required: false
-        type: string
-        default: 0
-        description: Whether to disable XRT tests
       test-script:
         required: false
         type: string
@@ -67,7 +62,6 @@ jobs:
       WORKDIR: /var/lib/jenkins/workspace
       GCLOUD_SERVICE_KEY: ${{ secrets.gcloud-service-key }}
       USE_COVERAGE: ${{ inputs.collect-coverage && '1' || '0' }}
-      XLA_SKIP_XRT_TESTS: ${{ inputs.disable-xrt }}
       XLA_SKIP_TORCH_OP_TESTS: ${{ inputs.disable-pjrt }}
       XLA_SKIP_MP_OP_TESTS: ${{ inputs.disable-pjrt }}
       RUN_BENCHMARK_TESTS: ${{ matrix.run_benchmark_tests }}
@@ -112,7 +106,7 @@ jobs:
         run: |
           echo "DOCKER_IMAGE: ${DOCKER_IMAGE}"
           docker pull "${DOCKER_IMAGE}"
-          pid=$(docker run --shm-size=16g ${GPU_FLAG:-} -e USE_COVERAGE -e XLA_SKIP_XRT_TESTS -e XLA_SKIP_TORCH_OP_TESTS -e XLA_SKIP_MP_OP_TESTS -e RUN_BENCHMARK_TESTS -e RUN_CPP_TESTS1 -e RUN_CPP_TESTS2 -e RUN_PYTHON_TESTS -e RUN_XLA_OP_TESTS1 -e RUN_XLA_OP_TESTS2 -e RUN_XLA_OP_TESTS3 -e RUN_TORCH_MP_OP_TESTS -t -d -w "$WORKDIR" "${DOCKER_IMAGE}")
+          pid=$(docker run --shm-size=16g ${GPU_FLAG:-} -e USE_COVERAGE -e XLA_SKIP_TORCH_OP_TESTS -e XLA_SKIP_MP_OP_TESTS -e RUN_BENCHMARK_TESTS -e RUN_CPP_TESTS1 -e RUN_CPP_TESTS2 -e RUN_PYTHON_TESTS -e RUN_XLA_OP_TESTS1 -e RUN_XLA_OP_TESTS2 -e RUN_XLA_OP_TESTS3 -e RUN_TORCH_MP_OP_TESTS -t -d -w "$WORKDIR" "${DOCKER_IMAGE}")
           echo "${GCLOUD_SERVICE_KEY}" | docker exec -i "${pid}" sh -c "cat >> /tmp/pytorch/xla/default_credentials.json"
           echo "pid=${pid}" >> "${GITHUB_ENV}"
       - name: Test

.github/workflows/build_and_test.yml

@@ -36,7 +36,6 @@ jobs:
       docker-image: ${{ needs.build.outputs.docker-image }}
       timeout-minutes: 120
       collect-coverage: false
-      disable-xrt: 1
     secrets:
       gcloud-service-key: ${{ secrets.GCLOUD_SERVICE_KEY }}
 
@@ -49,7 +48,6 @@ jobs:
       runner: linux.8xlarge.nvidia.gpu
       timeout-minutes: 300
       collect-coverage: false  # TODO(yeounoh) separate from CPU coverage metrics
-      disable-xrt: 1
     secrets:
       gcloud-service-key: ${{ secrets.GCLOUD_SERVICE_KEY }}
 

.kokoro/Dockerfile

@@ -6,7 +6,6 @@ RUN apt-get -y install clang time
 RUN pip install pytest
 ARG USE_MKLDNN=0
 ARG SCCACHE_BUCKET=ossci-compiler-cache-circleci-v2
-ARG DISABLE_XRT=1
 ARG XLA_CUDA=0
 ARG BAZEL_REMOTE_CACHE=1
 ARG USE_FBGEMM=0

README.md

@@ -3,10 +3,6 @@
 <b>Current CI status:</b>  ![GitHub Actions
 status](https://github.com/pytorch/xla/actions/workflows/build_and_test.yml/badge.svg)
 
-Note: PyTorch/XLA r2.1 will be the last release with XRT available as a legacy
-runtime. Our main release build will not include XRT, but it will be available
-in a separate package.
-
 PyTorch/XLA is a Python package that uses the [XLA deep learning
 compiler](https://www.tensorflow.org/xla) to connect the [PyTorch deep learning
 framework](https://pytorch.org/) and [Cloud

infra/ansible/config/env.yaml

@@ -32,7 +32,6 @@ build_env:
     XLA_SANDBOX_BUILD: 1
     BAZEL_REMOTE_CACHE: 1
     SILO_NAME: "cache-silo-{{ arch }}-{{ accelerator }}-{{ clang_version }}"
-    DISABLE_XRT: "{{ disable_xrt }}"
     _GLIBCXX_USE_CXX11_ABI: 0
     GIT_VERSIONED_XLA_BUILD: "{{ nightly_release }}"
 

infra/tpu-pytorch/test_triggers.tf

@@ -26,7 +26,6 @@ module "tpu_e2e_tests" {
   ansible_vars = {
     arch            = "amd64"
     accelerator     = "tpu"
-    disable_xrt     = "1"
     pytorch_git_rev = "main"
     # The commit ID associated with the triggered build. Substituted when
     # Cloud Build is triggered.