bug fixes and test updates

Author: leofang

cuda_core/cuda/core/experimental/_memoryview.pyx

@@ -177,11 +177,11 @@ cdef StridedMemoryView view_as_dlpack(obj, stream_ptr, view=None):
     cdef object capsule
     try:
         capsule = obj.__dlpack__(
-            stream=stream_ptr,
+            stream=int(stream_ptr) if stream_ptr else None,
             max_version=(DLPACK_MAJOR_VERSION, DLPACK_MINOR_VERSION))
     except TypeError:
         capsule = obj.__dlpack__(
-            stream=stream_ptr)
+            stream=int(stream_ptr) if stream_ptr else None)
 
     cdef void* data = NULL
     if cpython.PyCapsule_IsValid(

cuda_core/tests/example_tests/test_basic_examples.py

@@ -13,6 +13,7 @@
 
 import pytest
 
+from cuda.core.experimental import Device
 from .utils import run_example
 
 samples_path = os.path.join(os.path.dirname(__file__), "..", "..", "examples")
@@ -23,3 +24,5 @@
 class TestExamples:
     def test_example(self, example, deinit_cuda):
         run_example(samples_path, example)
+        if Device().device_id != 0:
+            Device(0).set_current()

cuda_core/tests/test_stream.py

@@ -11,6 +11,7 @@
 from cuda.core.experimental import Device, Stream, StreamOptions
 from cuda.core.experimental._event import Event
 from cuda.core.experimental._stream import LEGACY_DEFAULT_STREAM, PER_THREAD_DEFAULT_STREAM, default_stream
+from cuda.core.experimental._utils import driver
 
 
 def test_stream_init():
@@ -26,7 +27,7 @@ def test_stream_init_with_options(init_cuda):
 
 def test_stream_handle(init_cuda):
     stream = Device().create_stream(options=StreamOptions())
-    assert isinstance(stream.handle, int)
+    assert isinstance(stream.handle, driver.CUstream)
 
 
 def test_stream_is_nonblocking(init_cuda):
@@ -90,7 +91,8 @@ def test_stream_from_foreign_stream(init_cuda):
     device = Device()
     other_stream = device.create_stream(options=StreamOptions())
     stream = device.create_stream(obj=other_stream)
-    assert other_stream.handle == stream.handle
+    # convert to int to work around NVIDIA/cuda-python#465
+    assert int(other_stream.handle) == int(stream.handle)
     device = stream.device
     assert isinstance(device, Device)
     context = stream.context