Skip to content

Commit b05da99

Browse files
leonling-llleonling-ll
committed
Resolve conflicts and add lisence header to changed files
1 parent 921edfd commit b05da99

File tree

125 files changed

+186
-63
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

125 files changed

+186
-63
lines changed

‎applications/dual_gemm/collective/xe_dual_gemm_mma.hpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/***************************************************************************************************
22
* Copyright (c) 2024 - 2025 Codeplay Software Ltd. All rights reserved.
3+
* Copyright (C) 2025 Intel Corporation, All rights reserved.
34
* SPDX-License-Identifier: BSD-3-Clause
45
*
56
* Redistribution and use in source and binary forms, with or without

‎applications/flash_attention_v2/collective/xe_flash_attn_decode_epilogue.hpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/***************************************************************************************************
22
* Copyright (c) 2024 - 2025 Codeplay Software Ltd. All rights reserved.
3+
* Copyright (C) 2025 Intel Corporation, All rights reserved.
34
* SPDX-License-Identifier: BSD-3-Clause
45
*
56
* Redistribution and use in source and binary forms, with or without

‎applications/flash_attention_v2/collective/xe_flash_attn_decode_mma.hpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/***************************************************************************************************
22
* Copyright (c) 2024 - 2025 Codeplay Software Ltd. All rights reserved.
3+
* Copyright (C) 2025 Intel Corporation, All rights reserved.
34
* SPDX-License-Identifier: BSD-3-Clause
45
*
56
* Redistribution and use in source and binary forms, with or without

‎applications/flash_attention_v2/collective/xe_flash_attn_decode_softmax_epilogue.hpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/***************************************************************************************************
22
* Copyright (c) 2024 - 2025 Codeplay Software Ltd. All rights reserved.
3+
* Copyright (C) 2025 Intel Corporation, All rights reserved.
34
* SPDX-License-Identifier: BSD-3-Clause
45
*
56
* Redistribution and use in source and binary forms, with or without

‎applications/flash_attention_v2/collective/xe_flash_attn_prefill_epilogue.hpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/***************************************************************************************************
22
* Copyright (c) 2024 - 2025 Codeplay Software Ltd. All rights reserved.
3+
* Copyright (C) 2025 Intel Corporation, All rights reserved.
34
* SPDX-License-Identifier: BSD-3-Clause
45
*
56
* Redistribution and use in source and binary forms, with or without

‎applications/flash_attention_v2/collective/xe_flash_attn_prefill_epilogue_cachedKV.hpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/***************************************************************************************************
22
* Copyright (c) 2024 - 2025 Codeplay Software Ltd. All rights reserved.
3+
* Copyright (C) 2025 Intel Corporation, All rights reserved.
34
* SPDX-License-Identifier: BSD-3-Clause
45
*
56
* Redistribution and use in source and binary forms, with or without

‎applications/flash_attention_v2/collective/xe_flash_attn_prefill_mma.hpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/***************************************************************************************************
22
* Copyright (c) 2024 - 2025 Codeplay Software Ltd. All rights reserved.
3+
* Copyright (C) 2025 Intel Corporation, All rights reserved.
34
* SPDX-License-Identifier: BSD-3-Clause
45
*
56
* Redistribution and use in source and binary forms, with or without

‎applications/flash_attention_v2/collective/xe_flash_attn_prefill_mma_cachedKV.hpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/***************************************************************************************************
22
* Copyright (c) 2024 - 2025 Codeplay Software Ltd. All rights reserved.
3+
* Copyright (C) 2025 Intel Corporation, All rights reserved.
34
* SPDX-License-Identifier: BSD-3-Clause
45
*
56
* Redistribution and use in source and binary forms, with or without

‎applications/flash_attention_v2/collective/xe_flash_attn_prefill_softmax_epilogue.hpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/***************************************************************************************************
22
* Copyright (c) 2024 - 2025 Codeplay Software Ltd. All rights reserved.
3+
* Copyright (C) 2025 Intel Corporation, All rights reserved.
34
* SPDX-License-Identifier: BSD-3-Clause
45
*
56
* Redistribution and use in source and binary forms, with or without

‎applications/flash_attention_v2/kernel/tile_scheduler.hpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/***************************************************************************************************
22
* Copyright (c) 2024 - 2025 Codeplay Software Ltd. All rights reserved.
3+
* Copyright (C) 2025 Intel Corporation, All rights reserved.
34
* SPDX-License-Identifier: BSD-3-Clause
45
*
56
* Redistribution and use in source and binary forms, with or without

0 commit comments

Comments
 (0)