diff --git a/ggml/src/ggml-cuda/fattn-tile.cu b/ggml/src/ggml-cuda/fattn-tile.cu index 88b71bc529ab..8bebf8bf402f 100644 --- a/ggml/src/ggml-cuda/fattn-tile.cu +++ b/ggml/src/ggml-cuda/fattn-tile.cu @@ -38,6 +38,8 @@ void ggml_cuda_flash_attn_ext_tile(ggml_backend_cuda_context & ctx, ggml_tensor GGML_ASSERT(V->ne[0] == K->ne[0]); ggml_cuda_flash_attn_ext_tile_case<256, 256>(ctx, dst); } break; +#ifndef GGML_USE_HIP + // D>=576 tile kernels exceed HIP local memory limit (67584 > 65536) case 576: { GGML_ASSERT(V->ne[0] == 512); ggml_cuda_flash_attn_ext_tile_case<576, 512>(ctx, dst); @@ -46,6 +48,7 @@ void ggml_cuda_flash_attn_ext_tile(ggml_backend_cuda_context & ctx, ggml_tensor GGML_ASSERT(V->ne[0] == 512); ggml_cuda_flash_attn_ext_tile_case<640, 512>(ctx, dst); } break; +#endif default: { GGML_ABORT("Unsupported head size"); } break; diff --git a/ggml/src/ggml-hip/CMakeLists.txt b/ggml/src/ggml-hip/CMakeLists.txt index cf9f0b1730f3..168d69b992af 100644 --- a/ggml/src/ggml-hip/CMakeLists.txt +++ b/ggml/src/ggml-hip/CMakeLists.txt @@ -83,7 +83,16 @@ else() ../ggml-cuda/template-instances/fattn-vec-instance-q8_0-turbo3_0.cu ../ggml-cuda/template-instances/fattn-vec-instance-turbo2_0-turbo2_0.cu ../ggml-cuda/template-instances/fattn-vec-instance-turbo2_0-q8_0.cu - ../ggml-cuda/template-instances/fattn-vec-instance-q8_0-turbo2_0.cu) + ../ggml-cuda/template-instances/fattn-vec-instance-q8_0-turbo2_0.cu + ../ggml-cuda/template-instances/fattn-vec-instance-turbo3_0-turbo2_0.cu + ../ggml-cuda/template-instances/fattn-vec-instance-turbo2_0-turbo3_0.cu + ../ggml-cuda/template-instances/fattn-vec-instance-turbo4_0-turbo4_0.cu + ../ggml-cuda/template-instances/fattn-vec-instance-turbo4_0-q8_0.cu + ../ggml-cuda/template-instances/fattn-vec-instance-q8_0-turbo4_0.cu + ../ggml-cuda/template-instances/fattn-vec-instance-turbo4_0-turbo3_0.cu + ../ggml-cuda/template-instances/fattn-vec-instance-turbo3_0-turbo4_0.cu + ../ggml-cuda/template-instances/fattn-vec-instance-turbo4_0-turbo2_0.cu + ../ggml-cuda/template-instances/fattn-vec-instance-turbo2_0-turbo4_0.cu) endif() ggml_add_backend_library(ggml-hip