Skip to content

Commit 3e7da26

Browse files
committed
Revert "musa: handle __hgt2_mask, available starting from MUSA SDK rc4.3.0 (ggml-org#15413)"
This reverts commit 67f09a3.
1 parent 4056f76 commit 3e7da26

File tree

1 file changed

+2
-5
lines changed

1 file changed

+2
-5
lines changed

ggml/src/ggml-cuda/common.cuh

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,6 @@
7878
#define GGML_CUDA_CC_IS_CDNA3(cc) (cc >= GGML_CUDA_CC_CDNA3 && cc < GGML_CUDA_CC_RDNA1)
7979

8080
// Moore Threads
81-
#define MUSART_HMASK 40300 // MUSA rc4.3, min. ver. for half2 -> uint mask comparisons
82-
8381
#define GGML_CUDA_CC_QY1 (GGML_CUDA_CC_OFFSET_MTHREADS + 0x210) // MTT S80, MTT S3000
8482
#define GGML_CUDA_CC_QY2 (GGML_CUDA_CC_OFFSET_MTHREADS + 0x220) // MTT S4000
8583
#define GGML_CUDA_CC_NG (GGML_CUDA_CC_OFFSET_MTHREADS + 0x310) // TBD
@@ -496,14 +494,13 @@ static __device__ __forceinline__ half2 warp_reduce_max(half2 x) {
496494
#endif // !defined(GGML_USE_HIP) && __CUDA_ARCH__ >= GGML_CUDA_CC_PASCAL || defined(GGML_USE_HIP)
497495
}
498496

499-
#if (defined(CUDART_VERSION) && CUDART_VERSION < CUDART_HMASK) || defined(GGML_USE_HIP) || \
500-
(defined(MUSART_VERSION) && MUSART_VERSION < MUSART_HMASK)
497+
#if CUDART_VERSION < CUDART_HMASK
501498
static __device__ __forceinline__ uint32_t __hgt2_mask(const half2 a, const half2 b) {
502499
const uint32_t mask_low = 0x0000FFFF * (float( __low2half(a)) > float( __low2half(b)));
503500
const uint32_t mask_high = 0xFFFF0000 * (float(__high2half(a)) > float(__high2half(b)));
504501
return mask_low | mask_high;
505502
}
506-
#endif // (defined(CUDART_VERSION) && CUDART_VERSION < CUDART_HMASK) || defined(GGML_USE_HIP) || (defined(MUSART_VERSION) && MUSART_VERSION < MUSART_HMASK)
503+
#endif // CUDART_VERSION < CUDART_HMASK
507504

508505
static __device__ __forceinline__ int ggml_cuda_dp4a(const int a, const int b, int c) {
509506
#if defined(GGML_USE_HIP)

0 commit comments

Comments
 (0)