From 738dc43b03a74509e541206b5d96671cbc118e8b Mon Sep 17 00:00:00 2001
From: Yifei Teng <tengyifei@users.noreply.github.com>
Date: Wed, 8 Jan 2025 20:21:31 -0800
Subject: [PATCH] [torch_xla] Test 2.6rc3 wheel against 2.6rc3 tag (#530)

And when we cut the next rc wheel, it will also use the corresponding
tag.
---
 .../tests/pytorch/r2.6/common.libsonnet        | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/dags/legacy_test/tests/pytorch/r2.6/common.libsonnet b/dags/legacy_test/tests/pytorch/r2.6/common.libsonnet
index 8cad9dcc..e63a99e1 100644
--- a/dags/legacy_test/tests/pytorch/r2.6/common.libsonnet
+++ b/dags/legacy_test/tests/pytorch/r2.6/common.libsonnet
@@ -18,13 +18,15 @@ local mixins = import 'templates/mixins.libsonnet';
 local utils = import 'templates/utils.libsonnet';
 local volumes = import 'templates/volumes.libsonnet';
 
+local rcVersion = 'rc3';
+
 {
   local r2_6 = {
     frameworkPrefix: 'pt-2-6',
     tpuSettings+: {
       softwareVersion: 'tpu-ubuntu2204-base',
     },
-    imageTag: 'r2.6.0-rc3_3.10',
+    imageTag: 'r2.6.0-%(rc)s_3.10' % {rc: rcVersion},
   },
   PyTorchTest:: common.PyTorchTest + r2_6 {
     local config = self,
@@ -106,13 +108,13 @@ local volumes = import 'templates/volumes.libsonnet';
         pip install torch==2.6 --index-url https://download.pytorch.org/whl/test/cpu
         # torchvision commit reference: https://github.com/pytorch/pytorch/blob/release/2.6/.github/ci_commit_pins/vision.txt
         pip install --user --no-use-pep517 "git+https://github.com/pytorch/vision.git@d23a6e1664d20707c11781299611436e1f0c104f"
-        pip install https://storage.googleapis.com/pytorch-xla-releases/wheels/tpuvm/torch_xla-2.6.0rc3-cp310-cp310-manylinux_2_28_x86_64.whl
+        pip install https://storage.googleapis.com/pytorch-xla-releases/wheels/tpuvm/torch_xla-2.6.0%(rc)s-cp310-cp310-manylinux_2_28_x86_64.whl
         pip install torch_xla[tpu] -f https://storage.googleapis.com/libtpu-releases/index.html -f https://storage.googleapis.com/libtpu-wheels/index.html
         pip install pillow
         git clone --depth=1 https://github.com/pytorch/pytorch.git
         cd pytorch
-        git clone -b r2.6 https://github.com/pytorch/xla.git
-      |||,
+        git clone -b v2.6.0-%(rc)s https://github.com/pytorch/xla.git
+      ||| % {rc: rcVersion},
     },
     podTemplate+:: {
       spec+: {
@@ -149,16 +151,16 @@ local volumes = import 'templates/volumes.libsonnet';
         pip uninstall -y torch torchvision
         pip install torch==2.6 --index-url https://download.pytorch.org/whl/test/cpu
         pip install --user --no-use-pep517 "git+https://github.com/pytorch/vision.git@d23a6e1664d20707c11781299611436e1f0c104f"
-        pip install https://storage.googleapis.com/pytorch-xla-releases/wheels/tpuvm/torch_xla-2.6.0rc3-cp310-cp310-manylinux_2_28_x86_64.whl
+        pip install https://storage.googleapis.com/pytorch-xla-releases/wheels/tpuvm/torch_xla-2.6.0%(rc)s-cp310-cp310-manylinux_2_28_x86_64.whl
 
         mkdir -p pytorch/xla
-        git clone -b r2.6 https://github.com/pytorch/xla.git pytorch/xla
+        git clone -b v2.6.0-%(rc)s https://github.com/pytorch/xla.git pytorch/xla
 
-        %s
+        %(cmd)s
 
         # Run whatever is in `command` here
         "${@:0}"
-      ||| % config.tpuSettings.tpuVmExports,
+      ||| % {cmd: config.tpuSettings.tpuVmExports, rc: rcVersion},
     ],
     command: [
       'torchrun',