Skip to content

[kernel] fix kernel import error due to uninstalling triton #4720

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
flybird11111 wants to merge 2 commits into from
Closed

[kernel] fix kernel import error due to uninstalling triton #4720

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
65b8d65
[kenel] fix kernel import error due to uninstalling triton
flybird11111 Sep 14, 2023
92cd7f9
[kenel] fix kernel import error due to uninstalling triton
flybird11111 Sep 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions colossalai/kernel/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,7 @@
from .cuda_native import FusedScaleMaskSoftmax, LayerNorm, MultiHeadAttention
from .triton import llama_context_attn_fwd, bloom_context_attn_fwd
from .triton import softmax
from .triton import copy_kv_cache_to_dest

__all__ = [
"LayerNorm",
"FusedScaleMaskSoftmax",
"MultiHeadAttention",
"llama_context_attn_fwd",
"bloom_context_attn_fwd",
"softmax",
"copy_kv_cache_to_dest",
]
5 changes: 0 additions & 5 deletions colossalai/kernel/triton/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +0,0 @@
from .context_attention import bloom_context_attn_fwd, llama_context_attn_fwd
from .copy_kv_cache_dest import copy_kv_cache_to_dest
from .fused_layernorm import layer_norm
from .rms_norm import rmsnorm_forward
from .softmax import softmax
2 changes: 1 addition & 1 deletion tests/test_infer_ops/triton/test_llama_context_attention.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
import triton
import triton.language as tl

from colossalai.kernel.triton import llama_context_attn_fwd
from colossalai.kernel.triton.context_attention import llama_context_attn_fwd
from tests.test_infer_ops.triton.kernel_utils import torch_context_attention
HAS_TRITON = True
except ImportError:
Expand Down