Skip to content

Commit dc5bf67

Browse files
committed
warpSize is being made non constexpr in ROCm 7.0
Signed-off-by: Gregory Shtrasberg <Gregory.Shtrasberg@amd.com>
1 parent 9c6587b commit dc5bf67

4 files changed

Lines changed: 12 additions & 12 deletions

File tree

csrc/attention/attention_kernels.cuh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@ typedef __hip_bfloat16 __nv_bfloat16;
3333
#include "../quantization/fp8/nvidia/quant_utils.cuh"
3434
#endif
3535

36-
#ifndef USE_ROCM
37-
#define WARP_SIZE 32
36+
#if defined(USE_ROCM) && defined(__GFX9__)
37+
#define WARP_SIZE 64
3838
#else
39-
#define WARP_SIZE warpSize
39+
#define WARP_SIZE 32
4040
#endif
4141

4242
#define MAX(a, b) ((a) > (b) ? (a) : (b))

csrc/attention/paged_attention_v1.cu

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919

2020
#include "attention_kernels.cuh"
2121

22-
#ifndef USE_ROCM
23-
#define WARP_SIZE 32
22+
#if defined(USE_ROCM) && defined(__GFX9__)
23+
#define WARP_SIZE 64
2424
#else
25-
#define WARP_SIZE warpSize
25+
#define WARP_SIZE 32
2626
#endif
2727

2828
#define MAX(a, b) ((a) > (b) ? (a) : (b))

csrc/attention/paged_attention_v2.cu

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919

2020
#include "attention_kernels.cuh"
2121

22-
#ifndef USE_ROCM
23-
#define WARP_SIZE 32
22+
#if defined(USE_ROCM) && defined(__GFX9__)
23+
#define WARP_SIZE 64
2424
#else
25-
#define WARP_SIZE warpSize
25+
#define WARP_SIZE 32
2626
#endif
2727

2828
#define MAX(a, b) ((a) > (b) ? (a) : (b))

csrc/cuda_compat.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
#include <hip/hip_runtime.h>
55
#endif
66

7-
#ifndef USE_ROCM
8-
#define WARP_SIZE 32
7+
#if defined(USE_ROCM) && defined(__GFX9__)
8+
#define WARP_SIZE 64
99
#else
10-
#define WARP_SIZE warpSize
10+
#define WARP_SIZE 32
1111
#endif
1212

1313
#ifndef USE_ROCM

0 commit comments

Comments
 (0)