From 343afb698f3630b6999d525a56bbd8d357e33f28 Mon Sep 17 00:00:00 2001 From: peixuanzuo Date: Tue, 17 Oct 2023 04:28:42 +0000 Subject: [PATCH] update ck patch --- cmake/external/composable_kernel.cmake | 2 +- .../composable_kernel/Fix_Clang_Build.patch | 22 ------------------- 2 files changed, 1 insertion(+), 23 deletions(-) diff --git a/cmake/external/composable_kernel.cmake b/cmake/external/composable_kernel.cmake index d464fdaa8eb07..b4e6c834c83ab 100644 --- a/cmake/external/composable_kernel.cmake +++ b/cmake/external/composable_kernel.cmake @@ -21,5 +21,5 @@ if(NOT composable_kernel_POPULATED) ${composable_kernel_SOURCE_DIR}/include ${composable_kernel_BINARY_DIR}/include ${composable_kernel_SOURCE_DIR}/library/include) - target_compile_definitions(onnxruntime_composable_kernel_includes INTERFACE __fp32__ __fp16__ __bf16__ __fp8__) + target_compile_definitions(onnxruntime_composable_kernel_includes INTERFACE __fp32__ __fp16__ __bf16__) endif() diff --git a/cmake/patches/composable_kernel/Fix_Clang_Build.patch b/cmake/patches/composable_kernel/Fix_Clang_Build.patch index ea7a2d91ee5ab..02b30af9eef52 100644 --- a/cmake/patches/composable_kernel/Fix_Clang_Build.patch +++ b/cmake/patches/composable_kernel/Fix_Clang_Build.patch @@ -60,28 +60,6 @@ index b09da41a8..fca2bdf69 100644 - LDCONFIG - HEADER_ONLY -) -diff --git a/library/include/ck/library/tensor_operation_instance/gpu/gemm_splitk.hpp b/library/include/ck/library/tensor_operation_instance/gpu/gemm_splitk.hpp -index 4cba0875d..07b0adb42 100644 ---- a/library/include/ck/library/tensor_operation_instance/gpu/gemm_splitk.hpp -+++ b/library/include/ck/library/tensor_operation_instance/gpu/gemm_splitk.hpp -@@ -58,7 +58,7 @@ void add_device_gemm_xdl_splitk_f32_f32_f32_mk_nk_mn_instances( - DeviceGemmSplitK>>& - instances); - #endif --#if(defined(CK_ENABLE_FP16) || defined(CK_ENABLE_FP8)) -+#if(defined(CK_ENABLE_FP16) && defined(CK_ENABLE_FP8)) - void add_device_gemm_xdl_splitk_f8_f16_f16_km_kn_mn_instances( - std::vector>>& -@@ -182,7 +182,7 @@ struct DeviceOperationInstanceFactory< - } - } - #endif --#if(defined(CK_ENABLE_FP16) || defined(CK_ENABLE_FP8)) -+#if(defined(CK_ENABLE_FP16) && defined(CK_ENABLE_FP8)) - else if constexpr(is_same_v && is_same_v && - is_same_v) - { diff --git a/library/src/tensor_operation_instance/gpu/CMakeLists.txt b/library/src/tensor_operation_instance/gpu/CMakeLists.txt index a0478c9f0..1e7782cd4 100644 --- a/library/src/tensor_operation_instance/gpu/CMakeLists.txt