Skip to content

Commit

Permalink
Merge branch 'main' into ksimpson/update_nvjitlink_test
Browse files Browse the repository at this point in the history
  • Loading branch information
ksimpson-work authored Nov 26, 2024
2 parents a3255c1 + 750d541 commit 2b1353a
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions cuda_core/tests/test_memory.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ def __init__(self, device):
self.device = device

def allocate(self, size, stream=None) -> Buffer:
ptr = handle_return(cuda.cuMemAlloc(size))
ptr = handle_return(driver.cuMemAlloc(size))
return Buffer(ptr=ptr, size=size, mr=self)

def deallocate(self, ptr, size, stream=None):
handle_return(cuda.cuMemFree(ptr))
handle_return(driver.cuMemFree(ptr))

@property
def is_device_accessible(self) -> bool:
Expand Down
2 changes: 1 addition & 1 deletion cuda_core/tests/test_stream.py
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ def test_stream_context(init_cuda):
context = stream.context
assert context is not None

def test_stream_from_foreign_stream():
def test_stream_from_foreign_stream(init_cuda):
device = Device()
other_stream = device.create_stream(options=StreamOptions())
stream = device.create_stream(obj=other_stream)
Expand Down

0 comments on commit 2b1353a

Please sign in to comment.