From 7ea875d816817ebf2aceb7aeff625b80b035e256 Mon Sep 17 00:00:00 2001
From: Huy Do <huydhn@gmail.com>
Date: Thu, 31 Aug 2023 13:35:55 -0700
Subject: [PATCH] [Release-Only] Use the correct triton version for 2.1.0
 release

---
 conda/build_pytorch.sh  | 5 ++---
 manywheel/build_cuda.sh | 8 ++++----
 manywheel/build_rocm.sh | 7 +++----
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/conda/build_pytorch.sh b/conda/build_pytorch.sh
index 6f8eaf502..36592f410 100755
--- a/conda/build_pytorch.sh
+++ b/conda/build_pytorch.sh
@@ -274,9 +274,8 @@ else
         exit 1
     fi
     if [[ "$OSTYPE" != "msys" ]]; then
-        # TODO: Remove me when Triton has a proper release channel
-        TRITON_SHORTHASH=$(cut -c1-10 $pytorch_rootdir/.github/ci_commit_pins/triton.txt)
-        export CONDA_TRITON_CONSTRAINT="    - torchtriton==2.1.0+${TRITON_SHORTHASH}"
+        # Prepare for 2.1.0 release
+        export CONDA_TRITON_CONSTRAINT="    - torchtriton==2.1.0"
     fi
 
     build_string_suffix="cuda${CUDA_VERSION}_cudnn${CUDNN_VERSION}_${build_string_suffix}"
diff --git a/manywheel/build_cuda.sh b/manywheel/build_cuda.sh
index afb4aa811..1f2706435 100644
--- a/manywheel/build_cuda.sh
+++ b/manywheel/build_cuda.sh
@@ -257,14 +257,14 @@ else
     exit 1
 fi
 
-# TODO: Remove me when Triton has a proper release channel
+# Prepare for 2.1.0 release
 if [[ $(uname) == "Linux" ]]; then
-    TRITON_SHORTHASH=$(cut -c1-10 $PYTORCH_ROOT/.github/ci_commit_pins/triton.txt)
+    TRITON_VERSION=$(cat $PYTORCH_ROOT/.ci/docker/triton_version.txt)
 
     if [[ -z "$PYTORCH_EXTRA_INSTALL_REQUIREMENTS" ]]; then
-        export PYTORCH_EXTRA_INSTALL_REQUIREMENTS="pytorch-triton==2.1.0+${TRITON_SHORTHASH}"
+        export PYTORCH_EXTRA_INSTALL_REQUIREMENTS="pytorch-triton==${TRITON_VERSION}"
     else
-        export PYTORCH_EXTRA_INSTALL_REQUIREMENTS="${PYTORCH_EXTRA_INSTALL_REQUIREMENTS} | pytorch-triton==2.1.0+${TRITON_SHORTHASH}"
+        export PYTORCH_EXTRA_INSTALL_REQUIREMENTS="${PYTORCH_EXTRA_INSTALL_REQUIREMENTS} | pytorch-triton==${TRITON_VERSION}"
     fi
 fi
 
diff --git a/manywheel/build_rocm.sh b/manywheel/build_rocm.sh
index 80ebde6f4..1fa2f8f31 100755
--- a/manywheel/build_rocm.sh
+++ b/manywheel/build_rocm.sh
@@ -214,15 +214,14 @@ elif [[ $ROCM_INT -ge 50600 ]]; then
     DEPS_AUX_DSTLIST+=(${RCCL_SHARE_FILES[@]/#/$RCCL_SHARE_DST/})
 fi
 
-# Add triton install dependency
+# Prepare for 2.1.0 release
 if [[ $(uname) == "Linux" ]]; then
-    TRITON_SHORTHASH=$(cut -c1-10 $PYTORCH_ROOT/.ci/docker/ci_commit_pins/triton-rocm.txt)
     TRITON_VERSION=$(cat $PYTORCH_ROOT/.ci/docker/triton_version.txt)
 
     if [[ -z "$PYTORCH_EXTRA_INSTALL_REQUIREMENTS" ]]; then
-        export PYTORCH_EXTRA_INSTALL_REQUIREMENTS="pytorch-triton-rocm==${TRITON_VERSION}+${TRITON_SHORTHASH}"
+        export PYTORCH_EXTRA_INSTALL_REQUIREMENTS="pytorch-triton-rocm==${TRITON_VERSION}"
     else
-        export PYTORCH_EXTRA_INSTALL_REQUIREMENTS="${PYTORCH_EXTRA_INSTALL_REQUIREMENTS} | pytorch-triton-rocm==${TRITON_VERSION}+${TRITON_SHORTHASH}"
+        export PYTORCH_EXTRA_INSTALL_REQUIREMENTS="${PYTORCH_EXTRA_INSTALL_REQUIREMENTS} | pytorch-triton-rocm==${TRITON_VERSION}"
     fi
 fi