Skip to content

Commit af12564

Browse files
xinyazhangdnikolaev-amd
authored andcommitted
Use AOTriton 0.9.2b gfx950 specialized package stored in compute-artifactory (#50)
* Use AOTriton 0.9.2b gfx950 specialized package stored in compute-artifactory * Enable gfx950 SDPA UTs. * Bump AOTriton 0.9.2b gfx950 specalized version to move gfx950 out of experimental. (cherry picked from commit 67a9fb25f1664a185c01abb9195e9b798ed1f54a)
1 parent 95499a6 commit af12564

File tree

2 files changed

+12
-18
lines changed

2 files changed

+12
-18
lines changed

cmake/External/aotriton.cmake

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,22 +22,16 @@ if(NOT __AOTRITON_INCLUDED)
2222
# Replaces .ci/docker/aotriton_version.txt
2323
# Note packages information may have versions skipped (due to no ABI breaks)
2424
# But they must be listed from lower version to higher version
25-
set(__AOTRITON_VER "0.9.2b")
25+
set(__AOTRITON_VER "0.9.2b_607fcc616f")
2626
set(__AOTRITON_MANYLINUX_LIST
27-
"manylinux_2_28" # rocm6.2
28-
"manylinux_2_28" # rocm6.3
29-
"manylinux_2_28" # rocm6.4
27+
"manylinux_2_35" # rocm6.5 on Ubuntu 22.04
3028
)
3129
set(__AOTRITON_ROCM_LIST
32-
"rocm6.2"
33-
"rocm6.3"
34-
"rocm6.4"
30+
"rocm6.5"
3531
)
36-
set(__AOTRITON_CI_COMMIT "b388d223d8c7213545603e00f6f3148c54d1f525")
32+
set(__AOTRITON_CI_COMMIT "607fcc616ff6836c2fcc9ad0fd37e528191d36fe")
3733
set(__AOTRITON_SHA256_LIST
38-
"08d84f96f4c984179f80f517c0431c7511ee26bb0ce9bd05a827573ddd78cc79" # rocm6.2
39-
"9094d59717e7e6eace9126ca100dd0e86510f07fc6c3a349569fc4e2d9056604" # rocm6.3
40-
"41190202c2736d5ff75b13a3abc0fb52ebfbb67226cf85dc3de7699c7000db44" # rocm6.4
34+
"6318ccd92c4eb943241ba5c4c72f07f9ceec4f26e3913d3cf346d9c98cfd4d22" # rocm6.5
4135
)
4236
set(__AOTRITON_Z "gz")
4337

@@ -98,8 +92,8 @@ if(NOT __AOTRITON_INCLUDED)
9892
"${__AOTRITON_VER}-${__AOTRITON_MANYLINUX}"
9993
"_${__AOTRITON_ARCH}-rocm${__AOTRITON_ROCM}"
10094
"-shared.tar.${__AOTRITON_Z}")
101-
string(CONCAT __AOTRITON_URL "https://github.com/ROCm/aotriton/releases/download/"
102-
"${__AOTRITON_VER}/${__AOTRITON_FILE}")
95+
string(CONCAT __AOTRITON_URL "https://compute-artifactory.amd.com/artifactory/rocm-generic-local/aotriton/"
96+
"${__AOTRITON_FILE}")
10397
ExternalProject_Add(aotriton_external
10498
URL "${__AOTRITON_URL}"
10599
URL_HASH SHA256=${__AOTRITON_SHA256}

torch/testing/_internal/common_cuda.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,23 +49,23 @@ def evaluate_gfx_arch_within(arch_list):
4949
return any(arch in effective_arch for arch in arch_list)
5050

5151
def CDNA2OrLater():
52-
return evaluate_gfx_arch_within(["gfx90a", "gfx942"])
52+
return evaluate_gfx_arch_within(["gfx90a", "gfx942", "gfx950"])
5353

5454
def evaluate_platform_supports_flash_attention():
5555
if TEST_WITH_ROCM:
56-
arch_list = ["gfx90a", "gfx942", "gfx1100"]
56+
arch_list = ["gfx90a", "gfx942", "gfx1100", "gfx950"]
5757
if os.environ.get("TORCH_ROCM_AOTRITON_ENABLE_EXPERIMENTAL", "0") != "0":
58-
arch_list += ["gfx1201", "gfx950"]
58+
arch_list += ["gfx1201"]
5959
return evaluate_gfx_arch_within(arch_list)
6060
if TEST_CUDA:
6161
return not IS_WINDOWS and SM80OrLater
6262
return False
6363

6464
def evaluate_platform_supports_efficient_attention():
6565
if TEST_WITH_ROCM:
66-
arch_list = ["gfx90a", "gfx942", "gfx1100"]
66+
arch_list = ["gfx90a", "gfx942", "gfx1100", "gfx950"]
6767
if os.environ.get("TORCH_ROCM_AOTRITON_ENABLE_EXPERIMENTAL", "0") != "0":
68-
arch_list += ["gfx1201", "gfx950"]
68+
arch_list += ["gfx1201"]
6969
return evaluate_gfx_arch_within(arch_list)
7070
if TEST_CUDA:
7171
return True

0 commit comments

Comments
 (0)