Skip to content

GitLab

Commit 18d6a3d6 authored by ltqin's avatar ltqin
Browse files

fix conflict

parents d3e87f86 45b52f13
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 0 deletions
example/32_batched_gemm_scale_softmax_gemm/CMakeLists.txt
View file @ 18d6a3d6
......@@ -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)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment