Follow-up to #2065: A couple of additional test fixes (#2072)

* Follow-up to #2065: A couple of additional test fixes

* Remove redundant test

* Remove test that NVML devices == CUDA devices

Author: mdboom

cuda_bindings/tests/nvml/test_pynvml.py

@@ -47,7 +47,7 @@ def test_device_get_attributes(mig_handles):
 
     if mig_handles:
         for handle in mig_handles:
-            att = nvml.device_get_attributes(handle)
+            att = nvml.device_get_attributes_v2(handle)
             assert att is not None
     else:
         pytest.skip("No MIG devices found")

cuda_bindings/tests/test_cuda.py

@@ -2,7 +2,6 @@
 # SPDX-License-Identifier: LicenseRef-NVIDIA-SOFTWARE-LICENSE
 
 import ctypes
-import platform
 import shutil
 import textwrap
 
@@ -560,29 +559,6 @@ def test_get_error_name_and_string():
     assert s == b"CUDA_ERROR_INVALID_DEVICE"
 
 
-@pytest.mark.skipif(not callableBinary("nvidia-smi"), reason="Binary existence needed")
-def test_device_get_name(device):
-    # TODO: Refactor this test once we have nvml bindings to avoid the use of subprocess
-    import subprocess
-
-    p = subprocess.check_output(
-        ["nvidia-smi", "--query-gpu=name", "--format=csv,noheader"],  # noqa: S607
-        shell=False,
-        stderr=subprocess.PIPE,
-    )
-
-    delimiter = b"\r\n" if platform.system() == "Windows" else b"\n"
-    expect = p.split(delimiter)
-    size = 64
-    _, got = cuda.cuDeviceGetName(size, device)
-    got = got.split(b"\x00")[0]
-    if any(b"Unable to determine the device handle for" in result for result in expect):
-        # Undeterministic devices get waived
-        pass
-    else:
-        assert any(got in result for result in expect)
-
-
 # TODO: cuStreamGetCaptureInfo_v2
 @pytest.mark.skipif(driverVersionLessThan(11030), reason="Driver too old for cuStreamGetCaptureInfo_v2")
 def test_stream_capture():

cuda_core/tests/system/test_system_system.py

@@ -8,12 +8,11 @@
 import pytest
 
 try:
-    from cuda.bindings import driver, runtime
+    from cuda.bindings import driver
 except ImportError:
     from cuda import cuda as driver
-    from cuda import cudart as runtime
 
-from cuda.core import Device, system
+from cuda.core import system
 from cuda.core._utils.cuda_utils import handle_return
 
 from .conftest import skip_if_nvml_unsupported
@@ -40,15 +39,6 @@ def test_kernel_mode_driver_version():
         assert 0 <= ver_patch[0] <= 99
 
 
-def test_devices():
-    devices = Device.get_all_devices()
-    expected_num_devices = handle_return(runtime.cudaGetDeviceCount())
-    expected_devices = tuple(Device(device_id) for device_id in range(expected_num_devices))
-    assert len(devices) == len(expected_devices), "Number of devices does not match expected value"
-    for device, expected_device in zip(devices, expected_devices):
-        assert device.device_id == expected_device.device_id, "Device ID does not match expected value"
-
-
 def test_kernel_mode_driver_version_requires_nvml():
     if system.CUDA_BINDINGS_NVML_IS_COMPATIBLE:
         pytest.skip("NVML is available, cannot test the error path")