From 6ad2a5d97b47b028a13af5d439c538afb3936a1c Mon Sep 17 00:00:00 2001
From: Ethan Wee <Ethan.Wee@amd.com>
Date: Thu, 24 Jul 2025 13:44:10 -0700
Subject: [PATCH 1/6] check cmake

---
 .ci/pytorch/build.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.ci/pytorch/build.sh b/.ci/pytorch/build.sh
index 300903e2ff08..f9d49dd97cb9 100755
--- a/.ci/pytorch/build.sh
+++ b/.ci/pytorch/build.sh
@@ -1,7 +1,9 @@
 #!/bin/bash
 
 set -ex
-
+CMAKE=/usr/local/bin/cmake
+[ -x "$CMAKE" ] || CMAKE=/usr/bin/cmake
+cmake() { "$CMAKE" "$@"; }
 # Required environment variable: $BUILD_ENVIRONMENT
 # (This is set by default in the Docker images we build, so you don't
 # need to set it yourself.

From 77b20ed906d3cd53c3089d7ba58897419edb5219 Mon Sep 17 00:00:00 2001
From: Ethan Wee <Ethan.Wee@amd.com>
Date: Thu, 24 Jul 2025 13:53:28 -0700
Subject: [PATCH 2/6] Update build.sh

---
 .ci/pytorch/build.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.ci/pytorch/build.sh b/.ci/pytorch/build.sh
index f9d49dd97cb9..5bbece767b2b 100755
--- a/.ci/pytorch/build.sh
+++ b/.ci/pytorch/build.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 
 set -ex
+export PATH=/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:$PATH
 CMAKE=/usr/local/bin/cmake
 [ -x "$CMAKE" ] || CMAKE=/usr/bin/cmake
 cmake() { "$CMAKE" "$@"; }

From 8f11edd6124a622c6a4e88e7acb55847f8c75513 Mon Sep 17 00:00:00 2001
From: ethanwee1 <ethanwee@amd.com>
Date: Fri, 25 Jul 2025 14:26:58 +0000
Subject: [PATCH 3/6] upgrade cmake to 3.31.4

---
 requirements.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/requirements.txt b/requirements.txt
index 699f5a535670..4bfb810ec07e 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -18,4 +18,5 @@ setuptools==69.5.1 ; python_version >= "3.12"
 packaging==24.1
 optree==0.9.1 ; python_version < "3.12"
 optree==0.10.0 ; python_version >= "3.12"
+cmake==3.31.4
 lark==0.12.0

From 43c9279600cf93a9fe94ac9a35ce5213e3a1a06f Mon Sep 17 00:00:00 2001
From: ethanwee1 <ethanwee@amd.com>
Date: Fri, 25 Jul 2025 15:56:52 +0000
Subject: [PATCH 4/6] change in build.sh

---
 .ci/docker/build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.ci/docker/build.sh b/.ci/docker/build.sh
index f0e6496ae693..4ae233eb1cf8 100755
--- a/.ci/docker/build.sh
+++ b/.ci/docker/build.sh
@@ -84,7 +84,7 @@ elif [[ "$image" == *linter* ]]; then
 fi
 
 # CMake 3.18 is needed to support CUDA17 language variant
-CMAKE_VERSION=3.18.5
+CMAKE_VERSION=3.31.4
 
 _UCX_COMMIT=00bcc6bb18fc282eb160623b4c0d300147f579af
 _UCC_COMMIT=7cb07a76ccedad7e56ceb136b865eb9319c258ea

From 74ff9a1682906e2b01a1e2d06eeff75060a18932 Mon Sep 17 00:00:00 2001
From: Ethan Wee <Ethan.Wee@amd.com>
Date: Fri, 25 Jul 2025 10:06:06 -0700
Subject: [PATCH 5/6] Update install_cmake.sh

---
 .ci/docker/common/install_cmake.sh | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.ci/docker/common/install_cmake.sh b/.ci/docker/common/install_cmake.sh
index 3563e91433b5..a54e40a82e59 100755
--- a/.ci/docker/common/install_cmake.sh
+++ b/.ci/docker/common/install_cmake.sh
@@ -25,7 +25,5 @@ file="cmake-${CMAKE_VERSION}-Linux-x86_64.tar.gz"
 
 # Download and install specific CMake version in /usr/local
 pushd /tmp
-curl -Os --retry 3 "https://cmake.org/files/${path}/${file}"
-tar -C /usr/local --strip-components 1 --no-same-owner -zxf cmake-*.tar.gz
-rm -f cmake-*.tar.gz
+pip install cmake==3.31.4
 popd

From f2fd38b703f80d8e64c043490fa483290adf68d8 Mon Sep 17 00:00:00 2001
From: Ethan Wee <Ethan.Wee@amd.com>
Date: Tue, 5 Aug 2025 10:15:19 -0700
Subject: [PATCH 6/6] Update build.sh

---
 .ci/pytorch/build.sh | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.ci/pytorch/build.sh b/.ci/pytorch/build.sh
index 5bbece767b2b..5b06a74929c3 100755
--- a/.ci/pytorch/build.sh
+++ b/.ci/pytorch/build.sh
@@ -2,9 +2,6 @@
 
 set -ex
 export PATH=/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:$PATH
-CMAKE=/usr/local/bin/cmake
-[ -x "$CMAKE" ] || CMAKE=/usr/bin/cmake
-cmake() { "$CMAKE" "$@"; }
 # Required environment variable: $BUILD_ENVIRONMENT
 # (This is set by default in the Docker images we build, so you don't
 # need to set it yourself.