fix conflict

18d6a3d6 · ltqin · d3e87f86 · 45b52f13 · 18d6a3d6
Commit 18d6a3d6 authored Mar 02, 2023 by ltqin
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

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

No files found.
--- a/example/32_batched_gemm_scale_softmax_gemm/CMakeLists.txt
+++ b/example/32_batched_gemm_scale_softmax_gemm/CMakeLists.txt
@@ -9,8 +9,12 @@ add_example_executable(example_grouped_multihead_attention_forward_fp16 grouped_
 add_example_executable(example_batched_multihead_attention_forward_fp16 batched_multihead_attention_forward_fp16.cpp)
 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)
+<<<<<<< HEAD
 add_example_executable(example_batched_multihead_attention_backward_pt2 batched_multihead_attention_backward_pt2.cpp)
+=======
+>>>>>>> 45b52f1304010413b7c31b36bb89d34df9e040ee
 add_example_executable(example_batched_multihead_attention_backward_pt1 batched_multihead_attention_backward_pt1.cpp)
+add_example_executable(example_batched_multihead_attention_backward_pt2 batched_multihead_attention_backward_pt2.cpp)
 add_example_executable(example_batched_multihead_attention_train_fp16 batched_multihead_attention_train_fp16.cpp)
 add_custom_target(example_gemm_scale_softmax_gemm)