From ed619a5885e03e1544270184f0c992e5b949f776 Mon Sep 17 00:00:00 2001 From: Ethan Wee <158101733+ethanwee1@users.noreply.github.com> Date: Fri, 14 Feb 2025 18:46:36 -0800 Subject: [PATCH 01/11] [release/2.6] Enable wheels (#1884) Relates to: https://github.com/ROCm/rocAutomation/pull/660/files https://github.com/ROCm/builder/pull/68 --------- Co-authored-by: Jithun Nair Co-authored-by: Jithun Nair <37884920+jithunnair-amd@users.noreply.github.com> --- .ci/docker/ci_commit_pins/triton.txt | 2 +- .circleci/scripts/binary_populate_env.sh | 46 ------------------------ .github/scripts/build_triton_wheel.py | 7 ++-- CMakeLists.txt | 6 ++-- related_commits | 13 +++++++ third_party/composable_kernel | 2 +- version.txt | 2 +- 7 files changed, 22 insertions(+), 56 deletions(-) diff --git a/.ci/docker/ci_commit_pins/triton.txt b/.ci/docker/ci_commit_pins/triton.txt index c3491fd3c6577..396be2dd54aee 100644 --- a/.ci/docker/ci_commit_pins/triton.txt +++ b/.ci/docker/ci_commit_pins/triton.txt @@ -1 +1 @@ -0d4682f073ded4d1a8260dd4208a43d735ae3a2b +6da9e66008b58a7b8553f96c69021cca0d0028f0 diff --git a/.circleci/scripts/binary_populate_env.sh b/.circleci/scripts/binary_populate_env.sh index 037ba979cb10d..d4ee499352e30 100755 --- a/.circleci/scripts/binary_populate_env.sh +++ b/.circleci/scripts/binary_populate_env.sh @@ -71,52 +71,6 @@ fi export PYTORCH_BUILD_NUMBER=1 -# Set triton version as part of PYTORCH_EXTRA_INSTALL_REQUIREMENTS -TRITON_VERSION=$(cat $PYTORCH_ROOT/.ci/docker/triton_version.txt) - -# Here PYTORCH_EXTRA_INSTALL_REQUIREMENTS is already set for the all the wheel builds hence append TRITON_CONSTRAINT -TRITON_CONSTRAINT="platform_system == 'Linux' and platform_machine == 'x86_64' and python_version != '3.13t'" -if [[ "$PACKAGE_TYPE" =~ .*wheel.* && -n "${PYTORCH_EXTRA_INSTALL_REQUIREMENTS:-}" ]]; then - TRITON_REQUIREMENT="triton==${TRITON_VERSION}; ${TRITON_CONSTRAINT}" - # Only linux Python <= 3.13, not 3.13t are supported wheels for triton - if [[ -n "$PYTORCH_BUILD_VERSION" && "$PYTORCH_BUILD_VERSION" =~ .*dev.* ]]; then - TRITON_SHORTHASH=$(cut -c1-8 $PYTORCH_ROOT/.ci/docker/ci_commit_pins/triton.txt) - TRITON_REQUIREMENT="pytorch-triton==${TRITON_VERSION}+git${TRITON_SHORTHASH}; ${TRITON_CONSTRAINT}" - fi - export PYTORCH_EXTRA_INSTALL_REQUIREMENTS="${PYTORCH_EXTRA_INSTALL_REQUIREMENTS} | ${TRITON_REQUIREMENT}" -fi - -# This part is done in the builder scripts so commenting the duplicate code -: <<'BLOCK_COMMENT' -# Set triton via PYTORCH_EXTRA_INSTALL_REQUIREMENTS for triton rocm package -if [[ "$PACKAGE_TYPE" =~ .*wheel.* && -n "$PYTORCH_BUILD_VERSION" && "$PYTORCH_BUILD_VERSION" =~ .*rocm.* && $(uname) == "Linux" ]]; then - TRITON_REQUIREMENT="pytorch-triton-rocm==${TRITON_VERSION}; ${TRITON_CONSTRAINT}" - if [[ -n "$PYTORCH_BUILD_VERSION" && "$PYTORCH_BUILD_VERSION" =~ .*dev.* ]]; then - TRITON_SHORTHASH=$(cut -c1-8 $PYTORCH_ROOT/.ci/docker/ci_commit_pins/triton.txt) - TRITON_REQUIREMENT="pytorch-triton-rocm==${TRITON_VERSION}+git${TRITON_SHORTHASH}; ${TRITON_CONSTRAINT}" - fi - if [[ -z "${PYTORCH_EXTRA_INSTALL_REQUIREMENTS:-}" ]]; then - export PYTORCH_EXTRA_INSTALL_REQUIREMENTS="${TRITON_REQUIREMENT}" - else - export PYTORCH_EXTRA_INSTALL_REQUIREMENTS="${PYTORCH_EXTRA_INSTALL_REQUIREMENTS} | ${TRITON_REQUIREMENT}" - fi -fi -BLOCK_COMMENT - -# Set triton via PYTORCH_EXTRA_INSTALL_REQUIREMENTS for triton xpu package -if [[ "$PACKAGE_TYPE" =~ .*wheel.* && -n "$PYTORCH_BUILD_VERSION" && "$PYTORCH_BUILD_VERSION" =~ .*xpu.* && $(uname) == "Linux" ]]; then - TRITON_REQUIREMENT="pytorch-triton-xpu==${TRITON_VERSION}; ${TRITON_CONSTRAINT}" - if [[ -n "$PYTORCH_BUILD_VERSION" && "$PYTORCH_BUILD_VERSION" =~ .*dev.* ]]; then - TRITON_SHORTHASH=$(cut -c1-8 $PYTORCH_ROOT/.ci/docker/ci_commit_pins/triton-xpu.txt) - TRITON_REQUIREMENT="pytorch-triton-xpu==${TRITON_VERSION}+git${TRITON_SHORTHASH}; ${TRITON_CONSTRAINT}" - fi - if [[ -z "${PYTORCH_EXTRA_INSTALL_REQUIREMENTS:-}" ]]; then - export PYTORCH_EXTRA_INSTALL_REQUIREMENTS="${TRITON_REQUIREMENT}" - else - export PYTORCH_EXTRA_INSTALL_REQUIREMENTS="${PYTORCH_EXTRA_INSTALL_REQUIREMENTS} | ${TRITON_REQUIREMENT}" - fi -fi - USE_GLOO_WITH_OPENSSL="ON" if [[ "$GPU_ARCH_TYPE" =~ .*aarch64.* ]]; then USE_GLOO_WITH_OPENSSL="OFF" diff --git a/.github/scripts/build_triton_wheel.py b/.github/scripts/build_triton_wheel.py index 8cb0872a89c02..ae39b6a220e74 100644 --- a/.github/scripts/build_triton_wheel.py +++ b/.github/scripts/build_triton_wheel.py @@ -54,7 +54,6 @@ def get_rocm_version() -> str: rocm_version_h = f"{rocm_path}/include/rocm-core/rocm_version.h" if not os.path.isfile(rocm_version_h): rocm_version_h = f"{rocm_path}/include/rocm_version.h" - # The file could be missing due to 1) ROCm version < 5.2, or 2) no ROCm install. if os.path.isfile(rocm_version_h): RE_MAJOR = re.compile(r"#define\s+ROCM_VERSION_MAJOR\s+(\d+)") @@ -88,21 +87,20 @@ def build_triton( if "MAX_JOBS" not in env: max_jobs = os.cpu_count() or 1 env["MAX_JOBS"] = str(max_jobs) - version_suffix = "" if not release: # Nightly binaries include the triton commit hash, i.e. 2.1.0+e6216047b8 # while release build should only include the version, i.e. 2.1.0 rocm_version = get_rocm_version() - version_suffix = f"+rocm{rocm_version}_{commit_hash[:10]}" + version_suffix = f"+rocm{rocm_version}.git{commit_hash[:8]}" version += version_suffix - with TemporaryDirectory() as tmpdir: triton_basedir = Path(tmpdir) / "triton" triton_pythondir = triton_basedir / "python" triton_repo = "https://github.com/openai/triton" if device == "rocm": triton_pkg_name = "pytorch-triton-rocm" + triton_repo = "https://github.com/ROCm/triton" elif device == "xpu": triton_pkg_name = "pytorch-triton-xpu" triton_repo = "https://github.com/intel/intel-xpu-backend-for-triton" @@ -168,6 +166,7 @@ def build_triton( # change built wheel name and version env["TRITON_WHEEL_NAME"] = triton_pkg_name + env["TRITON_WHEEL_VERSION_SUFFIX"] = version_suffix if with_clang_ldd: env["TRITON_BUILD_WITH_CLANG_LLD"] = "1" diff --git a/CMakeLists.txt b/CMakeLists.txt index c0ad29064c802..5ed6a5c4203d7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -54,11 +54,11 @@ set(CMAKE_C_STANDARD # ---[ Utils include(cmake/public/utils.cmake) -# --- [ Check that minimal gcc version is 9.3+ -if(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 9.3) +# --- [ Check that minimal gcc version is 9.2+ +if(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 9.2) message( FATAL_ERROR - "GCC-9.3 or newer is required to compile PyTorch, but found ${CMAKE_CXX_COMPILER_VERSION}" + "GCC-9.2 or newer is required to compile PyTorch, but found ${CMAKE_CXX_COMPILER_VERSION}" ) endif() diff --git a/related_commits b/related_commits index 55de9a3b14e3a..3ee9d912a5b84 100644 --- a/related_commits +++ b/related_commits @@ -1,3 +1,4 @@ +<<<<<<< HEAD ubuntu|pytorch|apex|master|6fc10c371d9ddae5268b2412365716c212eb51e8|https://github.com/ROCm/apex centos|pytorch|apex|master|6fc10c371d9ddae5268b2412365716c212eb51e8|https://github.com/ROCm/apex ubuntu|pytorch|torchvision|main|229d8523bfa9a2696872d76b1cdb6815028f1e03|https://github.com/pytorch/vision @@ -10,3 +11,15 @@ ubuntu|pytorch|torchaudio|main|b6d4675c7aedc53ba04f3f55786aac1de32be6b4|https:// centos|pytorch|torchaudio|main|b6d4675c7aedc53ba04f3f55786aac1de32be6b4|https://github.com/pytorch/audio ubuntu|pytorch|ao|main|6ffe2360a7382c51b9a5a5ab30fb7aeb4b98963d|https://github.com/pytorch/ao centos|pytorch|ao|main|6ffe2360a7382c51b9a5a5ab30fb7aeb4b98963d|https://github.com/pytorch/ao +======= +ubuntu|pytorch|apex|release/1.6.0|31d60e599c2ecbe31d5bcf7e4b873366b8747aea|https://github.com/ROCm/apex +centos|pytorch|apex|release/1.6.0|31d60e599c2ecbe31d5bcf7e4b873366b8747aea|https://github.com/ROCm/apex +ubuntu|pytorch|torchvision|release/0.21|7af698794eded568735f9519593603c1ec889eba|https://github.com/pytorch/vision +centos|pytorch|torchvision|release/0.21|7af698794eded568735f9519593603c1ec889eba|https://github.com/pytorch/vision +ubuntu|pytorch|torchtext|release/0.18.0|9bed85d7a7ae13cf8c28598a88d8e461fe1afcb4|https://github.com/pytorch/text +centos|pytorch|torchtext|release/0.18.0|9bed85d7a7ae13cf8c28598a88d8e461fe1afcb4|https://github.com/pytorch/text +ubuntu|pytorch|torchdata|release/0.10|a4bed25873e071ecb4d4206a47b5326965283ad4|https://github.com/pytorch/data +centos|pytorch|torchdata|release/0.10|a4bed25873e071ecb4d4206a47b5326965283ad4|https://github.com/pytorch/data +ubuntu|pytorch|torchaudio|release/2.6|d8831425203385077a03c1d92cfbbe3bf2106008|https://github.com/pytorch/audio +centos|pytorch|torchaudio|release/2.6|d8831425203385077a03c1d92cfbbe3bf2106008|https://github.com/pytorch/audio +>>>>>>> 93864a85f6... [release/2.6] Enable wheels (#1884) diff --git a/third_party/composable_kernel b/third_party/composable_kernel index 67497a044d450..60c7f66251e41 160000 --- a/third_party/composable_kernel +++ b/third_party/composable_kernel @@ -1 +1 @@ -Subproject commit 67497a044d450fbc0bcb099cfb0aa270cfb0aa6b +Subproject commit 60c7f66251e41951ecb12e7c50975217178c64d2 diff --git a/version.txt b/version.txt index 3d87ca93f8a9b..e70b4523ae7ff 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -2.6.0a0 +2.6.0 From 2ba7d10a64a2ae1147155ef7352a4726782e121b Mon Sep 17 00:00:00 2001 From: Ethan Wee <158101733+ethanwee1@users.noreply.github.com> Date: Mon, 17 Feb 2025 11:39:09 -0800 Subject: [PATCH 02/11] Remove call to setup_rocm_libs.sh --- .github/scripts/build_triton_wheel.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/scripts/build_triton_wheel.py b/.github/scripts/build_triton_wheel.py index ae39b6a220e74..102edb91ab3f7 100644 --- a/.github/scripts/build_triton_wheel.py +++ b/.github/scripts/build_triton_wheel.py @@ -182,8 +182,6 @@ def build_triton( cwd=triton_basedir, shell=True, ) - cur_rocm_ver = get_rocm_version() - check_call(["scripts/amd/setup_rocm_libs.sh", cur_rocm_ver], cwd=triton_basedir) print("ROCm libraries setup for triton installation...") check_call( From 42bbcb03e6d5141a7e7cccd7e1eaf4a9161b3ab0 Mon Sep 17 00:00:00 2001 From: Ethan Wee <158101733+ethanwee1@users.noreply.github.com> Date: Mon, 17 Feb 2025 11:50:02 -0800 Subject: [PATCH 03/11] Revert --- related_commits | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/related_commits b/related_commits index 3ee9d912a5b84..55de9a3b14e3a 100644 --- a/related_commits +++ b/related_commits @@ -1,4 +1,3 @@ -<<<<<<< HEAD ubuntu|pytorch|apex|master|6fc10c371d9ddae5268b2412365716c212eb51e8|https://github.com/ROCm/apex centos|pytorch|apex|master|6fc10c371d9ddae5268b2412365716c212eb51e8|https://github.com/ROCm/apex ubuntu|pytorch|torchvision|main|229d8523bfa9a2696872d76b1cdb6815028f1e03|https://github.com/pytorch/vision @@ -11,15 +10,3 @@ ubuntu|pytorch|torchaudio|main|b6d4675c7aedc53ba04f3f55786aac1de32be6b4|https:// centos|pytorch|torchaudio|main|b6d4675c7aedc53ba04f3f55786aac1de32be6b4|https://github.com/pytorch/audio ubuntu|pytorch|ao|main|6ffe2360a7382c51b9a5a5ab30fb7aeb4b98963d|https://github.com/pytorch/ao centos|pytorch|ao|main|6ffe2360a7382c51b9a5a5ab30fb7aeb4b98963d|https://github.com/pytorch/ao -======= -ubuntu|pytorch|apex|release/1.6.0|31d60e599c2ecbe31d5bcf7e4b873366b8747aea|https://github.com/ROCm/apex -centos|pytorch|apex|release/1.6.0|31d60e599c2ecbe31d5bcf7e4b873366b8747aea|https://github.com/ROCm/apex -ubuntu|pytorch|torchvision|release/0.21|7af698794eded568735f9519593603c1ec889eba|https://github.com/pytorch/vision -centos|pytorch|torchvision|release/0.21|7af698794eded568735f9519593603c1ec889eba|https://github.com/pytorch/vision -ubuntu|pytorch|torchtext|release/0.18.0|9bed85d7a7ae13cf8c28598a88d8e461fe1afcb4|https://github.com/pytorch/text -centos|pytorch|torchtext|release/0.18.0|9bed85d7a7ae13cf8c28598a88d8e461fe1afcb4|https://github.com/pytorch/text -ubuntu|pytorch|torchdata|release/0.10|a4bed25873e071ecb4d4206a47b5326965283ad4|https://github.com/pytorch/data -centos|pytorch|torchdata|release/0.10|a4bed25873e071ecb4d4206a47b5326965283ad4|https://github.com/pytorch/data -ubuntu|pytorch|torchaudio|release/2.6|d8831425203385077a03c1d92cfbbe3bf2106008|https://github.com/pytorch/audio -centos|pytorch|torchaudio|release/2.6|d8831425203385077a03c1d92cfbbe3bf2106008|https://github.com/pytorch/audio ->>>>>>> 93864a85f6... [release/2.6] Enable wheels (#1884) From 8a3ce3e8e0d2718718486ae76895884f0c9d5c4d Mon Sep 17 00:00:00 2001 From: Ethan Wee <158101733+ethanwee1@users.noreply.github.com> Date: Mon, 17 Feb 2025 11:54:34 -0800 Subject: [PATCH 04/11] Revert --- version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.txt b/version.txt index e70b4523ae7ff..3d87ca93f8a9b 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -2.6.0 +2.6.0a0 From cefa2b0b7ed28498ee979c8c0a2fa1ccf66d607e Mon Sep 17 00:00:00 2001 From: Ethan Wee <158101733+ethanwee1@users.noreply.github.com> Date: Mon, 17 Feb 2025 11:55:12 -0800 Subject: [PATCH 05/11] revert --- .ci/docker/ci_commit_pins/triton.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/docker/ci_commit_pins/triton.txt b/.ci/docker/ci_commit_pins/triton.txt index 396be2dd54aee..c3491fd3c6577 100644 --- a/.ci/docker/ci_commit_pins/triton.txt +++ b/.ci/docker/ci_commit_pins/triton.txt @@ -1 +1 @@ -6da9e66008b58a7b8553f96c69021cca0d0028f0 +0d4682f073ded4d1a8260dd4208a43d735ae3a2b From 973ea0ae23cb84948aefecb3435f6e07e97e92f4 Mon Sep 17 00:00:00 2001 From: Ethan Wee <158101733+ethanwee1@users.noreply.github.com> Date: Mon, 17 Feb 2025 12:04:41 -0800 Subject: [PATCH 06/11] Lint --- .github/scripts/build_triton_wheel.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/scripts/build_triton_wheel.py b/.github/scripts/build_triton_wheel.py index 102edb91ab3f7..281b73357e74f 100644 --- a/.github/scripts/build_triton_wheel.py +++ b/.github/scripts/build_triton_wheel.py @@ -54,6 +54,7 @@ def get_rocm_version() -> str: rocm_version_h = f"{rocm_path}/include/rocm-core/rocm_version.h" if not os.path.isfile(rocm_version_h): rocm_version_h = f"{rocm_path}/include/rocm_version.h" + # The file could be missing due to 1) ROCm version < 5.2, or 2) no ROCm install. if os.path.isfile(rocm_version_h): RE_MAJOR = re.compile(r"#define\s+ROCM_VERSION_MAJOR\s+(\d+)") @@ -87,6 +88,7 @@ def build_triton( if "MAX_JOBS" not in env: max_jobs = os.cpu_count() or 1 env["MAX_JOBS"] = str(max_jobs) + version_suffix = "" if not release: # Nightly binaries include the triton commit hash, i.e. 2.1.0+e6216047b8 @@ -94,13 +96,13 @@ def build_triton( rocm_version = get_rocm_version() version_suffix = f"+rocm{rocm_version}.git{commit_hash[:8]}" version += version_suffix + with TemporaryDirectory() as tmpdir: triton_basedir = Path(tmpdir) / "triton" triton_pythondir = triton_basedir / "python" triton_repo = "https://github.com/openai/triton" if device == "rocm": triton_pkg_name = "pytorch-triton-rocm" - triton_repo = "https://github.com/ROCm/triton" elif device == "xpu": triton_pkg_name = "pytorch-triton-xpu" triton_repo = "https://github.com/intel/intel-xpu-backend-for-triton" From 1bc24445ee8efe0a7f668883ba32e20124e8d025 Mon Sep 17 00:00:00 2001 From: ethanwee1 Date: Mon, 17 Feb 2025 20:14:45 +0000 Subject: [PATCH 07/11] Reverting back to original CK commit which has hneg fix --- third_party/composable_kernel | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/third_party/composable_kernel b/third_party/composable_kernel index 60c7f66251e41..67497a044d450 160000 --- a/third_party/composable_kernel +++ b/third_party/composable_kernel @@ -1 +1 @@ -Subproject commit 60c7f66251e41951ecb12e7c50975217178c64d2 +Subproject commit 67497a044d450fbc0bcb099cfb0aa270cfb0aa6b From aea2ee324d38cca5dac6a784507e43348878b526 Mon Sep 17 00:00:00 2001 From: ethanwee1 Date: Mon, 17 Feb 2025 20:20:36 +0000 Subject: [PATCH 08/11] lint --- .github/scripts/build_triton_wheel.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/scripts/build_triton_wheel.py b/.github/scripts/build_triton_wheel.py index 281b73357e74f..7a700de23daa2 100644 --- a/.github/scripts/build_triton_wheel.py +++ b/.github/scripts/build_triton_wheel.py @@ -54,7 +54,7 @@ def get_rocm_version() -> str: rocm_version_h = f"{rocm_path}/include/rocm-core/rocm_version.h" if not os.path.isfile(rocm_version_h): rocm_version_h = f"{rocm_path}/include/rocm_version.h" - + # The file could be missing due to 1) ROCm version < 5.2, or 2) no ROCm install. if os.path.isfile(rocm_version_h): RE_MAJOR = re.compile(r"#define\s+ROCM_VERSION_MAJOR\s+(\d+)") @@ -88,7 +88,7 @@ def build_triton( if "MAX_JOBS" not in env: max_jobs = os.cpu_count() or 1 env["MAX_JOBS"] = str(max_jobs) - + version_suffix = "" if not release: # Nightly binaries include the triton commit hash, i.e. 2.1.0+e6216047b8 @@ -96,7 +96,7 @@ def build_triton( rocm_version = get_rocm_version() version_suffix = f"+rocm{rocm_version}.git{commit_hash[:8]}" version += version_suffix - + with TemporaryDirectory() as tmpdir: triton_basedir = Path(tmpdir) / "triton" triton_pythondir = triton_basedir / "python" From e944fea2ff54427757e6d6179783bf7e2ab03d66 Mon Sep 17 00:00:00 2001 From: Ethan Wee <158101733+ethanwee1@users.noreply.github.com> Date: Mon, 17 Feb 2025 18:07:29 -0800 Subject: [PATCH 09/11] lint and change from + to . for trition version as it violates pep --- .github/scripts/build_triton_wheel.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/scripts/build_triton_wheel.py b/.github/scripts/build_triton_wheel.py index 7a700de23daa2..48217005b3157 100644 --- a/.github/scripts/build_triton_wheel.py +++ b/.github/scripts/build_triton_wheel.py @@ -54,7 +54,7 @@ def get_rocm_version() -> str: rocm_version_h = f"{rocm_path}/include/rocm-core/rocm_version.h" if not os.path.isfile(rocm_version_h): rocm_version_h = f"{rocm_path}/include/rocm_version.h" - + # The file could be missing due to 1) ROCm version < 5.2, or 2) no ROCm install. if os.path.isfile(rocm_version_h): RE_MAJOR = re.compile(r"#define\s+ROCM_VERSION_MAJOR\s+(\d+)") @@ -94,7 +94,7 @@ def build_triton( # Nightly binaries include the triton commit hash, i.e. 2.1.0+e6216047b8 # while release build should only include the version, i.e. 2.1.0 rocm_version = get_rocm_version() - version_suffix = f"+rocm{rocm_version}.git{commit_hash[:8]}" + version_suffix = f".rocm{rocm_version}.git{commit_hash[:8]}" version += version_suffix with TemporaryDirectory() as tmpdir: From f4d8ca0a3a46a2869f0931e49b5604ef9fb3e9fd Mon Sep 17 00:00:00 2001 From: Ethan Wee <158101733+ethanwee1@users.noreply.github.com> Date: Thu, 20 Feb 2025 10:36:07 -0800 Subject: [PATCH 10/11] use same triton commit as release/2.6 --- .ci/docker/ci_commit_pins/triton.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/docker/ci_commit_pins/triton.txt b/.ci/docker/ci_commit_pins/triton.txt index c3491fd3c6577..396be2dd54aee 100644 --- a/.ci/docker/ci_commit_pins/triton.txt +++ b/.ci/docker/ci_commit_pins/triton.txt @@ -1 +1 @@ -0d4682f073ded4d1a8260dd4208a43d735ae3a2b +6da9e66008b58a7b8553f96c69021cca0d0028f0 From b5065c4e84b592179ab2fb32c5ea99d6c463d950 Mon Sep 17 00:00:00 2001 From: Ethan Wee <158101733+ethanwee1@users.noreply.github.com> Date: Thu, 20 Feb 2025 10:52:02 -0800 Subject: [PATCH 11/11] Change to rocm/triton repo and make wheel name changes --- .github/scripts/build_triton_wheel.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/scripts/build_triton_wheel.py b/.github/scripts/build_triton_wheel.py index 48217005b3157..30af2064a7877 100644 --- a/.github/scripts/build_triton_wheel.py +++ b/.github/scripts/build_triton_wheel.py @@ -94,7 +94,7 @@ def build_triton( # Nightly binaries include the triton commit hash, i.e. 2.1.0+e6216047b8 # while release build should only include the version, i.e. 2.1.0 rocm_version = get_rocm_version() - version_suffix = f".rocm{rocm_version}.git{commit_hash[:8]}" + version_suffix = f"+rocm{rocm_version}.git{commit_hash[:8]}" version += version_suffix with TemporaryDirectory() as tmpdir: @@ -103,6 +103,7 @@ def build_triton( triton_repo = "https://github.com/openai/triton" if device == "rocm": triton_pkg_name = "pytorch-triton-rocm" + triton_repo = "https://github.com/ROCm/triton" elif device == "xpu": triton_pkg_name = "pytorch-triton-xpu" triton_repo = "https://github.com/intel/intel-xpu-backend-for-triton"