Skip to content

tests: fix parametrize patterns rejected by pytest 9.1.0 #2212

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

Draft
leofang wants to merge 1 commit into
base: main
Choose a base branch
from
+13 −9
Draft

tests: fix parametrize patterns rejected by pytest 9.1.0 #2212

Show file tree
Hide file tree
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
20 changes: 12 additions & 8 deletions cuda_bindings/tests/test_nvfatbin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,8 +121,7 @@ def nvcc_smoke(tmpdir) -> str:
return nvcc


@pytest.fixture
def CUBIN(arch):
def _build_cubin(arch):
def CHECK_NVRTC(err):
if err != nvrtc.nvrtcResult.NVRTC_SUCCESS:
raise RuntimeError(repr(err))
Expand All @@ -141,6 +140,11 @@ def CHECK_NVRTC(err):
return cubin


@pytest.fixture
def CUBIN(arch):
return _build_cubin(arch)


# create a valid LTOIR input for testing
@pytest.fixture
def LTOIR(arch):
Expand Down Expand Up @@ -259,11 +263,11 @@ def test_nvfatbin_add_ptx(PTX, arch):
nvfatbin.destroy(handle)


@pytest.mark.parametrize("arch", ["sm_80"], indirect=True)
def test_nvfatbin_add_cubin_ELF_SIZE_MISMATCH(CUBIN, arch):
def test_nvfatbin_add_cubin_ELF_SIZE_MISMATCH():
cubin = _build_cubin("sm_80")
handle = nvfatbin.create([], 0)
with pytest.raises(nvfatbin.nvFatbinError, match="ERROR_ELF_ARCH_MISMATCH"):
nvfatbin.add_cubin(handle, CUBIN, len(CUBIN), "75", "inc")
nvfatbin.add_cubin(handle, cubin, len(cubin), "75", "inc")

nvfatbin.destroy(handle)

Expand All @@ -280,11 +284,11 @@ def test_nvfatbin_add_cubin(CUBIN, arch):
nvfatbin.destroy(handle)


@pytest.mark.parametrize("arch", ["sm_80"], indirect=True)
def test_nvfatbin_add_cubin_ELF_ARCH_MISMATCH(CUBIN, arch):
def test_nvfatbin_add_cubin_ELF_ARCH_MISMATCH():
cubin = _build_cubin("sm_80")
handle = nvfatbin.create([], 0)
with pytest.raises(nvfatbin.nvFatbinError, match="ERROR_ELF_ARCH_MISMATCH"):
nvfatbin.add_cubin(handle, CUBIN, len(CUBIN), "75", "inc")
nvfatbin.add_cubin(handle, cubin, len(cubin), "75", "inc")

nvfatbin.destroy(handle)

Expand Down
2 changes: 1 addition & 1 deletion cuda_core/tests/test_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ def _cpu_array_samples():
return samples


@pytest.mark.parametrize("in_arr,", _cpu_array_samples())
@pytest.mark.parametrize("in_arr", _cpu_array_samples())
class TestViewCPU:
def test_args_viewable_as_strided_memory_cpu(self, in_arr):
@args_viewable_as_strided_memory((0,))
Expand Down