github/ColossalAI
1
0
Fork 0
mirror of https://github.com/hpcaitech/ColossalAI.git synced 2026-04-26 09:42:27 +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

2
extensions/softmax/__init__.py
View File

@@ -1,4 +1,4 @@
from .scaled_masked_softmax_cuda import ScaledMaskedSoftmaxCudaExtension
from .scaled_upper_triangle_masked_softmax_cuda import ScaledUpperTriangleMaskedSoftmaxCudaExtension
__all__ = ['ScaledMaskedSoftmaxCudaExtension', 'ScaledUpperTriangleMaskedSoftmaxCudaExtension']
__all__ = ["ScaledMaskedSoftmaxCudaExtension", "ScaledUpperTriangleMaskedSoftmaxCudaExtension"]