Merge remote-tracking branch 'origin/bug-device-ordinal' into bug-device-ordinal

Author: ksimpson-work

cuda_core/cuda/core/experimental/__init__.py

@@ -4,7 +4,7 @@
 
 from cuda.core.experimental import utils
 from cuda.core.experimental._device import Device
-from cuda.core.experimental._event import EventOptions
+from cuda.core.experimental._event import Event, EventOptions
 from cuda.core.experimental._launcher import LaunchConfig, launch
 from cuda.core.experimental._linker import Linker, LinkerOptions
 from cuda.core.experimental._module import ObjectCode

cuda_core/tests/test_event.py

@@ -6,6 +6,7 @@
 # this software and related documentation outside the terms of the EULA
 # is strictly prohibited.
 
+import os
 import time
 
 import pytest
@@ -37,8 +38,13 @@ def test_timing(init_cuda, enable_timing):
         # We only want to exercise the __sub__ method, this test is not meant
         # to stress-test the CUDA driver or time.sleep().
         delay_ms = delay_seconds * 1000
-        generous_tolerance = 20
-        assert delay_ms <= elapsed_time_ms < delay_ms + generous_tolerance
+        if os.name == "nt":  # noqa: SIM108
+            # For Python <=3.10, the Windows timer resolution is typically limited to 15.6 ms by default.
+            generous_tolerance = 100
+        else:
+            # Most modern Linux kernels have a default timer resolution of 1 ms.
+            generous_tolerance = 20
+        assert delay_ms - generous_tolerance <= elapsed_time_ms < delay_ms + generous_tolerance
     else:
         with pytest.raises(RuntimeError) as e:
             elapsed_time_ms = e2 - e1