update CMakeLists.txt

24bf4051 · danyao12 · 66052232 · 24bf4051
Commit 24bf4051 authored Feb 13, 2023 by danyao12
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 5 deletions

example/32_batched_gemm_scale_softmax_gemm/CMakeLists.txt example/32_batched_gemm_scale_softmax_gemm/CMakeLists.txt +0 -5

No files found.
--- a/example/32_batched_gemm_scale_softmax_gemm/CMakeLists.txt
+++ b/example/32_batched_gemm_scale_softmax_gemm/CMakeLists.txt
@@ -10,12 +10,7 @@ add_example_executable(example_batched_multihead_attention_forward_fp16 batched_
 add_example_executable(example_grouped_multihead_attention_forward_bf16 grouped_multihead_attention_forward_bf16.cpp)
 add_example_executable(example_batched_multihead_attention_forward_bf16 batched_multihead_attention_forward_bf16.cpp)
 add_example_executable(example_batched_multihead_attention_backward_fp16 batched_multihead_attention_backward_fp16.cpp)
-<<<<<<< HEAD
 add_example_executable(example_batched_multihead_attention_backward_pt1_fp16 batched_multihead_attention_backward_pt1_fp16.cpp)
-add_example_executable(example_batched_multihead_attention_backward_fp16_dropout batched_multihead_attention_backward_fp16_dropout.cpp)
-=======
-
->>>>>>> attn-bwd-dropout

 add_custom_target(example_gemm_scale_softmax_gemm)
 add_dependencies(example_gemm_scale_softmax_gemm example_batched_gemm_scale_softmax_gemm_xdl_fp16)