Skip to content

Commit b049315

Browse files
authored
HIP: disable sync warp shuffel operators from clr amd_warp_sync_functions.h (#15273)
1 parent f4586ee commit b049315

File tree

2 files changed

+1
-2
lines changed

2 files changed

+1
-2
lines changed

ggml/src/ggml-cuda/fattn-wmma-f16.cu

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ namespace wmma = mtmusa::wmma;
1515
namespace wmma = nvcuda::wmma;
1616
#endif // GGML_USE_MUSA
1717
#elif defined(GGML_HIP_ROCWMMA_FATTN) && defined(FP16_MMA_AVAILABLE)
18-
#undef HIP_ENABLE_WARP_SYNC_BUILTINS // conflicts with rocWMMA headers
1918
#include <rocwmma/rocwmma.hpp>
2019
namespace wmma = rocwmma;
2120
#endif // !defined(GGML_USE_HIP)

ggml/src/ggml-cuda/vendors/hip.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#pragma once
22

3-
#define HIP_ENABLE_WARP_SYNC_BUILTINS 1
3+
#define HIP_DISABLE_WARP_SYNC_BUILTINS 1
44
#include <hip/hip_runtime.h>
55
#include <hipblas/hipblas.h>
66
#include <hip/hip_fp16.h>

0 commit comments

Comments
 (0)