Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[ROCm] Update triton rocm branch to release/2.3.x #122493

Merged
merged 4 commits into from Mar 28, 2024
Merged

[ROCm] Update triton rocm branch to release/2.3.x #122493

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3010dd0
Update triton rocm branch to release/2.3.x
jataylo Mar 22, 2024
2bd35e5
Remove ROCM_TRITION_VERSION and update to 2.3.0
jataylo Mar 26, 2024
65996d3
Remove unnecessary ROCm conditionalisation
jataylo Mar 26, 2024
f882600
Skip failing UT
jataylo Mar 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .ci/docker/ci_commit_pins/triton-rocm.txt
View file
Open in desktop
@@ -1 +1 @@
0a22a91d04c2b4a029a69a198eac390089c3e891
d08e16b738ab550c3af51305df624d5c823dc445
9 changes: 3 additions & 6 deletions .github/scripts/build_triton_wheel.py
View file
Open in desktop
Expand Up @@ -10,9 +10,6 @@
SCRIPT_DIR = Path(__file__).parent
REPO_DIR = SCRIPT_DIR.parent.parent

# TODO: Remove me once Triton version is again in sync for vanilla and ROCm
ROCM_TRITION_VERSION = "2.2.0"


def read_triton_pin(rocm_hash: bool = False) -> str:
triton_file = "triton.txt" if not rocm_hash else "triton-rocm.txt"
Expand Down Expand Up @@ -102,7 +99,7 @@ def build_triton(
if release:
ver, rev, patch = version.split(".")
if build_rocm:
check_call(["git", "checkout", "release/2.2.x"], cwd=triton_basedir)
check_call(["git", "checkout", "release/2.3.x"], cwd=triton_basedir)
jataylo marked this conversation as resolved.
Show resolved Hide resolved
else:
check_call(
["git", "checkout", f"release/{ver}.{rev}.x"], cwd=triton_basedir
Expand Down Expand Up @@ -165,7 +162,7 @@ def build_triton(
patch_init_py(
triton_pythondir / "triton" / "__init__.py",
version=f"{version}",
expected_version=ROCM_TRITION_VERSION if build_rocm else None,
expected_version=None,
)

if build_rocm:
Expand All @@ -174,7 +171,7 @@ def build_triton(
triton_pythondir / "setup.py",
name=triton_pkg_name,
version=f"{version}",
expected_version=ROCM_TRITION_VERSION,
expected_version=None,
)
check_call("scripts/amd/setup_rocm_libs.sh", cwd=triton_basedir, shell=True)
print("ROCm libraries setup for triton installation...")
Expand Down