Skip to content

Commit 15f3a15

Browse files
zhiqchen-amdLLLLKKKK
authored andcommitted
bugfix for 1328
1 parent 4cb7c69 commit 15f3a15

File tree

5 files changed

+12
-22
lines changed

5 files changed

+12
-22
lines changed

3rdparty/aiter/aiter.patch

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,14 @@
11
--- aiter/jit/optCompilerConfig.json
22
+++ aiter/jit/optCompilerConfig.json
3-
@@ -619,6 +619,7 @@
4-
"verbose": "False",
3+
@@ -699,7 +699,7 @@
54
"hip_clang_path": "os.environ.get('MHA_HIP_CLANG_PATH')",
65
"blob_gen_cmd": [
7-
+ "f'{get_asm_dir()}/fmha_v3_fwd/codegen.py --output_dir {{}}'",
86
"f'{CK_DIR}/example/ck_tile/01_fmha/generate.py -d fwd --receipt 600 --output_dir {{}}'",
9-
"f'{AITER_CSRC_DIR}/cpp_itfs/mha_fwd_generate.py --receipt 3 --output_dir {{}}'"
7+
- "f'{AITER_CSRC_DIR}/cpp_itfs/mha_fwd_generate.py --receipt 3 --output_dir {{}}'"
8+
+ "f'{AITER_CSRC_DIR}/cpp_itfs/mha_fwd_generate.py --receipt 2 --output_dir {{}}'"
109
]
11-
12-
--- csrc/cpp_itfs/mha_fwd_generate.py
13-
+++ csrc/cpp_itfs/mha_fwd_generate.py
14-
@@ -150,7 +150,7 @@ COMBINED_API = """t = fmha_fwd_v3(traits, args, stream_config);
15-
API_MAP = {
16-
1: FMHA_FWD_API.format(F_inner_dispatch=V3_API),
17-
2: FMHA_FWD_API.format(F_inner_dispatch=V2_API),
18-
- 3: FMHA_FWD_API.format(F_inner_dispatch=V2_API) + FMHA_FWD_SPLITKV_API,
19-
+ 3: FMHA_FWD_API.format(F_inner_dispatch=COMBINED_API),
20-
4: FMHA_BATCH_PREFILL_API,
21-
5: FMHA_FWD_API.format(F_inner_dispatch=COMBINED_API)
22-
+ FMHA_FWD_SPLITKV_API
10+
},
11+
"module_mha_varlen_fwd": {
2312

2413
--- csrc/py_itfs_cu/asm_pa.cu
2514
+++ csrc/py_itfs_cu/asm_pa.cu
@@ -89,6 +78,7 @@
8978
from . import mla
9079
+from . import paged_attn
9180

81+
9282
--- aiter/ops/gemm_op_a8w8.py
9383
+++ aiter/ops/gemm_op_a8w8.py
9484
@@ -425,9 +425,11 @@

open_source/bazel/arch_select.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ def subscribe_deps():
6565
def whl_deps():
6666
return select({
6767
"@//:using_cuda12": ["torch==2.6.0+cu126"],
68-
"@//:using_rocm": ["pyrsmi", "amdsmi@https://sinian-metrics-platform.oss-cn-hangzhou.aliyuncs.com/kis%2FAMD%2Famd_smi%2Fali%2Famd_smi.tar", "aiter@https://sinian-metrics-platform.oss-cn-hangzhou.aliyuncs.com/kis/AMD/aiter/0.1.6/aiter-0.1.6%2Bgit.329d07ba.date.202511061625-py3-none-any.whl"],
68+
"@//:using_rocm": ["pyrsmi", "amdsmi@https://sinian-metrics-platform.oss-cn-hangzhou.aliyuncs.com/kis%2FAMD%2Famd_smi%2Fali%2Famd_smi.tar", "aiter@https://sinian-metrics-platform.oss-cn-hangzhou.aliyuncs.com/kis/AMD/RTP/aiter-0.1.6%2Bgit.329d07ba.date.202511061023-py3-none-any.whl"],
6969
"//conditions:default": ["torch==2.1.2"],
7070
})
7171

open_source/deps/http.bzl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,9 @@ def http_deps():
6060

6161
http_archive(
6262
name = "aiter",
63-
sha256 = "cf1ac18a72e08f38133cf8891a1484d694b482925f1196dda398fd10c19586f2",
63+
sha256 = "4bd5179c70e5a2c95892db53a83bb50043fa79e5739eb54661ca6d451938963b",
6464
urls = [
65-
"https://sinian-metrics-platform.oss-cn-hangzhou.aliyuncs.com/kis/AMD/aiter/0.1.6/aiter-0.1.6%2Bgit.329d07ba.date.202511061625-py3-none-any.whl",
65+
"https://sinian-metrics-platform.oss-cn-hangzhou.aliyuncs.com/kis/AMD/RTP/aiter-0.1.6%2Bgit.329d07ba.date.202511061023-py3-none-any.whl",
6666
],
6767
type = "zip",
6868
build_file = clean_dep("//:BUILD.aiter"),

open_source/deps/requirements_lock_rocm.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,8 @@ aiosignal==1.3.1 \
114114
--hash=sha256:54cd96e15e1649b75d6c87526a6ff0b6c1b0dd3459f43d9ca11d48c339b68cfc \
115115
--hash=sha256:f8376fb07dd1e86a584e4fcdec80b36b7f81aac666ebc724e2c090300dd83b17
116116
# via aiohttp
117-
aiter @ https://sinian-metrics-platform.oss-cn-hangzhou.aliyuncs.com/kis/AMD/aiter/0.1.6/aiter-0.1.6%2Bgit.329d07ba.date.202511061625-py3-none-any.whl \
118-
--hash=sha256:cf1ac18a72e08f38133cf8891a1484d694b482925f1196dda398fd10c19586f2
117+
aiter @ https://sinian-metrics-platform.oss-cn-hangzhou.aliyuncs.com/kis/AMD/RTP/aiter-0.1.6%2Bgit.329d07ba.date.202511061023-py3-none-any.whl \
118+
--hash=sha256:4bd5179c70e5a2c95892db53a83bb50043fa79e5739eb54661ca6d451938963b
119119
# via -r open_source/deps/requirements_rocm.txt
120120
aliyun-python-sdk-core==2.15.2 \
121121
--hash=sha256:54f66a53e193c61c5e16ea4505a0cab43543f8ad2ef22833f69c4d5e5151c17d

open_source/deps/requirements_rocm.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ https://repo.radeon.com/rocm/manylinux/rocm-rel-6.4.1/torch-2.4.1%2Brocm6.4.1.gi
44
https://repo.radeon.com/rocm/manylinux/rocm-rel-6.4.1/torchvision-0.19.0%2Brocm6.4.1.git4d41ad71-cp310-cp310-linux_x86_64.whl
55
pyrsmi
66
pyyaml
7-
https://sinian-metrics-platform.oss-cn-hangzhou.aliyuncs.com/kis/AMD/aiter/0.1.6/aiter-0.1.6%2Bgit.329d07ba.date.202511061625-py3-none-any.whl
7+
https://sinian-metrics-platform.oss-cn-hangzhou.aliyuncs.com/kis/AMD/RTP/aiter-0.1.6%2Bgit.329d07ba.date.202511061023-py3-none-any.whl
88
https://sinian-metrics-platform.oss-cn-hangzhou.aliyuncs.com/kis%2FAMD%2Famd_smi%2Fali%2Famd_smi.tar

0 commit comments

Comments
 (0)