Skip to content

Commit 2359c09

Browse files
committed
Revert musa: Upgrade MUSA SDK version to rc4.0.1 and use mudnn::Unary
1 parent b7578a4 commit 2359c09

File tree

4 files changed

+2
-136
lines changed

4 files changed

+2
-136
lines changed

ggml/src/ggml-cuda/cpy.cu

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
#include "cpy.cuh"
22
#include "dequantize.cuh"
3-
#ifdef GGML_USE_MUSA
4-
#include "ggml-musa/mudnn.cuh"
5-
#endif // GGML_USE_MUSA
63

74
typedef void (*cpy_kernel_t)(const char * cx, char * cdst);
85

@@ -675,14 +672,7 @@ void ggml_cuda_cpy(ggml_backend_cuda_context & ctx, const ggml_tensor * src0, gg
675672
#endif
676673
if (src0->type == src1->type && ggml_is_contiguous(src0) && ggml_is_contiguous(src1)) {
677674
GGML_ASSERT(ggml_nbytes(src0) == ggml_nbytes(src1));
678-
#ifdef GGML_USE_MUSA
679-
if (src0->type == GGML_TYPE_F32 || src0->type == GGML_TYPE_F16) {
680-
CUDA_CHECK(mudnnMemcpyAsync(ctx, src1, src0));
681-
} else
682-
#endif // GGML_USE_MUSA
683-
{
684-
CUDA_CHECK(cudaMemcpyAsync(src1_ddc, src0_ddc, ggml_nbytes(src0), cudaMemcpyDeviceToDevice, main_stream));
685-
}
675+
CUDA_CHECK(cudaMemcpyAsync(src1_ddc, src0_ddc, ggml_nbytes(src0), cudaMemcpyDeviceToDevice, main_stream));
686676
} else if (src0->type == GGML_TYPE_F32 && src1->type == GGML_TYPE_F32) {
687677
ggml_cpy_f32_f32_cuda (src0_ddc, src1_ddc, ne, ne00, ne01, ne02, nb00, nb01, nb02, nb03, ne10, ne11, ne12, nb10, nb11, nb12, nb13, main_stream, dest_ptrs_d, graph_cpynode_index);
688678
} else if (src0->type == GGML_TYPE_F32 && src1->type == GGML_TYPE_BF16) {

ggml/src/ggml-cuda/fattn-mma-f16.cuh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -414,7 +414,7 @@ static __device__ __forceinline__ void flash_attn_ext_f16_iter(
414414
GGML_UNUSED(stride_mask); GGML_UNUSED(jt); GGML_UNUSED(tile_K);
415415
GGML_UNUSED(tile_V); GGML_UNUSED(tile_mask); GGML_UNUSED(Q_B);
416416
GGML_UNUSED(VKQ_C); GGML_UNUSED(KQ_max); GGML_UNUSED(KQ_rowsum);
417-
GGML_UNUSED(kb0); GGML_UNUSED(tile_Q);
417+
GGML_UNUSED(kb0);
418418
NO_DEVICE_CODE;
419419
#endif // NEW_MMA_AVAILABLE
420420
}

ggml/src/ggml-musa/mudnn.cu

Lines changed: 0 additions & 112 deletions
This file was deleted.

ggml/src/ggml-musa/mudnn.cuh

Lines changed: 0 additions & 12 deletions
This file was deleted.

0 commit comments

Comments
 (0)