github/ColossalAI
1
0
Fork 0
mirror of https://github.com/hpcaitech/ColossalAI.git synced 2025-09-03 01:55:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Fix] resolve conflicts of merging main

Browse Source
This commit is contained in:
Yuanheng
2024-04-08 16:21:47 +08:00
parent 7ebdf48ac5 641b1ee71a
commit ed5ebd1735
451 changed files with 15350 additions and 10694 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
extensions/__init__.py
View File

@@ -1,9 +1,5 @@
from .cpu_adam import CpuAdamArmExtension, CpuAdamX86Extension
from .flash_attention import (
FlashAttentionDaoCudaExtension,
FlashAttentionNpuExtension,
FlashAttentionXformersCudaExtension,
)
from .flash_attention import FlashAttentionDaoCudaExtension, FlashAttentionNpuExtension, FlashAttentionSdpaCudaExtension
from .inference import InferenceOpsCudaExtension
from .layernorm import LayerNormCudaExtension
from .moe import MoeCudaExtension
@@ -20,7 +16,7 @@ ALL_EXTENSIONS = [
ScaledMaskedSoftmaxCudaExtension,
ScaledUpperTriangleMaskedSoftmaxCudaExtension,
FlashAttentionDaoCudaExtension,
FlashAttentionXformersCudaExtension,
FlashAttentionSdpaCudaExtension,
FlashAttentionNpuExtension,
]
@@ -34,6 +30,6 @@ __all__ = [
"ScaledMaskedSoftmaxCudaExtension",
"ScaledUpperTriangleMaskedSoftmaxCudaExtension",
"FlashAttentionDaoCudaExtension",
"FlashAttentionXformersCudaExtension",
"FlashAttentionSdpaCudaExtension",
"FlashAttentionNpuExtension",
]