From aa56abcca4b5264b9baef7b0a71f9f33d5557ea5 Mon Sep 17 00:00:00 2001
From: Bhavya Bahl <bbahl@google.com>
Date: Tue, 10 Dec 2024 14:21:30 -0800
Subject: [PATCH] Update torch_xla wheels to have the suffix +cxx11 instead of
 .cxx11 (#8472)

---
 README.md                                      |  5 +++++
 infra/ansible/roles/build_srcs/tasks/main.yaml | 14 +++++++++-----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 488a361dca8d..91de9872f7f2 100644
--- a/README.md
+++ b/README.md
@@ -212,6 +212,11 @@ pip3 install torch==2.6.0.dev20241028+cpu.cxx11.abi --index-url https://download
 pip3 install https://storage.googleapis.com/pytorch-xla-releases/wheels/tpuvm/torch_xla-2.6.0.dev20241028.cxx11-cp310-cp310-linux_x86_64.whl
 ```
 
+**As of 12/11/2024, the torch_xla C++11 ABI wheel is named differently and can be installed as follows:**
+```
+pip3 install https://storage.googleapis.com/pytorch-xla-releases/wheels/tpuvm/torch_xla-2.6.0.dev20241211+cxx11-cp310-cp310-linux_x86_64.whl
+```
+
 The torch wheel version `2.6.0.dev20241028+cpu.cxx11.abi` can be found at https://download.pytorch.org/whl/nightly/torch/.
 
 <details>
diff --git a/infra/ansible/roles/build_srcs/tasks/main.yaml b/infra/ansible/roles/build_srcs/tasks/main.yaml
index f3117cabecce..1d92b49a3bbf 100644
--- a/infra/ansible/roles/build_srcs/tasks/main.yaml
+++ b/infra/ansible/roles/build_srcs/tasks/main.yaml
@@ -144,13 +144,17 @@
     #
     # we want to rename it to
     #
-    # torch_xla-2.5.0.dev20240819.cxx11-cp310-cp310-linux_x86_64.whl
-    # torch_xla-2.4.0.cxx11-cp311-cp311-manylinux_2_28_x86_64.whl
+    # torch_xla-2.5.0.dev20240819+cxx11-cp310-cp310-linux_x86_64.whl
+    # torch_xla-2.4.0+cxx11-cp311-cp311-manylinux_2_28_x86_64.whl
     # torch-2.5.0+libtpu.cxx11-cp310-cp310-linux_x86_64.whl
-    # torch-2.5.0.cxx11-cp311-cp311-linux_x86_64.whl
+    # torch-2.5.0+cxx11-cp311-cp311-linux_x86_64.whl
     #
-    # essentially adding .cxx11 before the -cp39, -cp310, -cp311 etc identifiers.
-    rename -v "s/^(.+?)(-cp\d+)/\1.cxx11\2/" *.whl
+    # essentially adding +cxx11 before the -cp39, -cp310, -cp311 etc identifiers.
+    if [[ "$f" == *"+libtpu"* ]]; then
+      rename -v "s/^(.+?)(-cp\d+)/\1.cxx11\2/" *.whl
+    else
+      rename -v "s/^(.+?)(-cp\d+)/\1+cxx11\2/" *.whl
+    fi
   args:
     executable: /bin/bash
     chdir: "/tmp/staging-wheels"