Skip to content

[CI] Rename check_cuda_only() to check_cuda_or_hip(). #3946

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

Merged
Jokeren merged 1 commit into from
May 20, 2024
Merged

[CI] Rename check_cuda_only() to check_cuda_or_hip(). #3946

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 14 additions & 12 deletions python/test/unit/language/test_core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,9 @@ def patch_kernel(template, to_replace):
return kernel


def check_cuda_only(device):
def check_cuda_or_hip(device):
# CUDA and HIP both use pytorch device 'cuda'. Other backends like Intel
# GPU do not.
if device not in ['cuda']:
pytest.skip("Only for cuda")

Expand Down Expand Up @@ -1346,7 +1348,7 @@ def test_atomic_rmw(op, dtype_x_str, mode, sem, device):
if dtype_x_str == 'float16':
pytest.skip("Only test atomic float16 ops on GPU")
else:
check_cuda_only(device)
check_cuda_or_hip(device)
Comment thread
whitneywhtsang marked this conversation as resolved.
Resolved

capability = torch.cuda.get_device_capability()
if capability[0] < 7:
Expand Down Expand Up @@ -3013,7 +3015,7 @@ def test_dot(M, N, K, num_warps, col_a, col_b, epilogue, input_precision, in_dty
if in_dtype == 'bfloat16':
pytest.skip("bfloat16 is not supported in the interpreter")
else:
check_cuda_only(device)
check_cuda_or_hip(device)

capability = torch.cuda.get_device_capability()

Expand Down Expand Up @@ -4218,7 +4220,7 @@ def kernel(X, Y, BLOCK: tl.constexpr):

@pytest.mark.parametrize("num_ctas", num_ctas_list)
def test_inline_asm(num_ctas, device):
check_cuda_only(device)
check_cuda_or_hip(device)

if is_hip():
pytest.skip("test_inline_asm is not supported in HIP")
Expand Down Expand Up @@ -4248,7 +4250,7 @@ def kernel(X, Y, Z, n: tl.constexpr, BLOCK: tl.constexpr):

@pytest.mark.parametrize("num_ctas", num_ctas_list)
def test_inline_asm_packed(num_ctas, device):
check_cuda_only(device)
check_cuda_or_hip(device)

if is_hip():
pytest.skip("test_inline_asm is not supported in HIP")
Expand Down Expand Up @@ -4277,7 +4279,7 @@ def kernel(X, Y, BLOCK: tl.constexpr):

@pytest.mark.parametrize('num_ctas', num_ctas_list)
def test_inline_asm_with_pointers(num_ctas, device):
check_cuda_only(device)
check_cuda_or_hip(device)

if is_hip():
pytest.skip('test_inline_asm is not supported in HIP')
Expand All @@ -4304,7 +4306,7 @@ def kernel(X, Y, BLOCK: tl.constexpr):


def test_inline_asm_multiple_outputs(device):
check_cuda_only(device)
check_cuda_or_hip(device)
if is_hip():
pytest.skip('This test uses PTX inline assembly, so is not compatible with AMD')

Expand Down Expand Up @@ -4351,7 +4353,7 @@ def kernel(A, B, C, D, BLOCK: tl.constexpr):


def test_inline_asm_packed_multiple_outputs(device):
check_cuda_only(device)
check_cuda_or_hip(device)
if is_hip():
pytest.skip('This test uses PTX inline assembly, so is not compatible with AMD')

Expand Down Expand Up @@ -4695,7 +4697,7 @@ def nested_while(data, countPtr):
def test_num_threads(device):
if is_hip():
pytest.skip("test_num_threads is not supported in HIP")
check_cuda_only(device)
check_cuda_or_hip(device)

@triton.jit
def kernel(Out):
Expand All @@ -4712,7 +4714,7 @@ def kernel(Out):
def test_globaltimer(device):
if is_hip():
pytest.skip("test_globaltimer is not supported in HIP")
check_cuda_only(device)
check_cuda_or_hip(device)

@triton.jit
def kernel(Out1, Out2):
Expand All @@ -4733,7 +4735,7 @@ def kernel(Out1, Out2):
def test_smid(device):
if is_hip():
pytest.skip("test_smid is not supported in HIP")
check_cuda_only(device)
check_cuda_or_hip(device)

@triton.jit
def kernel(Out):
Expand Down Expand Up @@ -5086,7 +5088,7 @@ def test_fp8_dot_acc(in_type_str, low_precision_acc, device):
if is_hip():
pytest.skip('test_fp8_dot_acc for HIP currently broken in upstream.')
if not is_interpreter():
check_cuda_only(device)
check_cuda_or_hip(device)
cc = torch.cuda.get_device_capability()
if cc[0] >= 9 and in_type_str == "float8e4b15":
pytest.skip("Dot op does not support fp8e4b15 on CUDA arch >= 90")
Expand Down