From c770ca2812e28680db98d077542c369ec1d9dd05 Mon Sep 17 00:00:00 2001 From: jiachengjason Date: Fri, 7 Nov 2025 12:35:14 -0500 Subject: [PATCH] clean up merge conflicts --- ggml/src/ggml-cuda/mmq.cuh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/ggml/src/ggml-cuda/mmq.cuh b/ggml/src/ggml-cuda/mmq.cuh index 6c258cf70f..a49451c391 100644 --- a/ggml/src/ggml-cuda/mmq.cuh +++ b/ggml/src/ggml-cuda/mmq.cuh @@ -3024,13 +3024,9 @@ static __device__ __forceinline__ void mmq_write_back_mma( const int i0 = (threadIdx.y / ntx) * (ntx*tile_C::I); #if defined(TURING_MMA_AVAILABLE) || defined(AMD_MFMA_AVAILABLE) || defined(AMD_WMMA_AVAILABLE) static_assert(nwarps*tile_C::I == mmq_y, "nwarps*tile_C::I != mmq_y"); -<<<<<<< HEAD #else GGML_UNUSED(nwarps); -#endif // defined(AMD_MFMA_AVAILABLE) || defined(TURING_MMA_AVAILABLE) -======= #endif // defined(AMD_MFMA_AVAILABLE) || defined(TURING_MMA_AVAILABLE) || defined(AMD_WMMA_AVAILABLE) ->>>>>>> 1912f816 (first commit naive test to enable mmq for RDNA4) #pragma unroll for (int j0 = 0; j0 < mmq_x; j0 += ntx*tile_C::J) {