Uh oh!
There was an error while loading. Please reload this page.
- Notifications
You must be signed in to change notification settings - Fork 321
Add green context support#1976
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.
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
Merged
Uh oh!
There was an error while loading. Please reload this page.
Merged
Changes from all commits
Commits
Show all changes
16 commits
Select commit
Hold shift + click to select a range
353a382
Implement green context v1 API
leofang b33c381
Refine green context split compatibility
leofang faf0d17
Encode green context handle dependencies
leofang 7c35ef3
Simplify green context view handles
leofang da58b7d
Simplify green context descriptor handling
leofang ac5c0fc
Expand green context test coverage with proper pytest patterns
leofang 12a1467
Lower green context handling to Cython and simplify Context
leofang b6959e4
Add explicit green context model: ctx.create_stream and ctx.resources
leofang 2812c5b
Harden green context stream creation and resource queries
leofang 340506e
Add Stream.resources property
leofang fa254a5
Polish green context API: docs, error handling, simplification
leofang 37ebe2a
Merge remote-tracking branch 'origin/main' into leof/green-ctx-v1
leofang 41cf1de
Address review comments: consolidate context handles, GIL ordering, s…
leofang 9d21b6b
Fix stream registry corruption for owner-backed handles
leofang 4d82262
Merge branch 'main' into leof/green-ctx-v1
leofang d840bdc
Merge branch 'main' into leof/green-ctx-v1
leofang File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading. Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading. Please reload this page.
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -2,18 +2,34 @@ | ||
| # | ||
| # SPDX-License-Identifier: Apache-2.0 | ||
| from __future__ import annotations | ||
| from collections.abc import Sequence | ||
| from dataclasses import dataclass | ||
| from cuda.bindings cimport cydriver | ||
| from cuda.core._device_resources cimport DeviceResources, SMResource, WorkqueueResource | ||
| from cuda.core._device_resources import SMResource, WorkqueueResource | ||
| from cuda.core._resource_handles cimport ( | ||
| ContextHandle, | ||
| GreenCtxHandle, | ||
| as_cu, | ||
| create_context_handle_from_green_ctx, | ||
| get_context_green_ctx, | ||
| get_last_error, | ||
| as_intptr, | ||
| as_py, | ||
| ) | ||
| from cuda.core._stream import Stream, StreamOptions | ||
| from cuda.core._utils.cuda_utils cimport HANDLE_RETURN | ||
| __all__ = ['Context', 'ContextOptions'] | ||
| DeviceResourcesT = Sequence[SMResource | WorkqueueResource] | ||
| cdef class Context: | ||
| """CUDA context wrapper. | ||
| @@ -32,17 +48,88 @@ cdef class Context: | ||
| ctx._device_id = device_id | ||
| return ctx | ||
| @staticmethod | ||
| cdef Context _from_green_ctx(type cls, GreenCtxHandle h_green_ctx, int device_id): | ||
| """Create Context from an owning green context handle.""" | ||
| cdef ContextHandle h_context = create_context_handle_from_green_ctx(h_green_ctx) | ||
| if not h_context: | ||
| HANDLE_RETURN(get_last_error()) | ||
| raise RuntimeError("Failed to create CUDA context view from green context") | ||
| return Context._from_handle(cls, h_context, device_id) | ||
| @property | ||
| def handle(self): | ||
| """Return the underlying CUcontext handle.""" | ||
| if self._h_context.get() == NULL: | ||
| if not self._h_context: | ||
| return None | ||
| if as_cu(self._h_context) == NULL: | ||
| return None | ||
| return as_py(self._h_context) | ||
| @property | ||
| def _handle(self): | ||
| return self.handle | ||
| @property | ||
| def is_green(self) -> bool: | ||
| """True if this context was created from device resources.""" | ||
| if not self._h_context: | ||
| return False | ||
| return get_context_green_ctx(self._h_context).get() != NULL | ||
| @property | ||
| def resources(self) -> DeviceResources: | ||
| """Query the hardware resources provisioned for this context. | ||
| For green contexts, returns the resources this context was created | ||
| with (SM partition, workqueue config). For primary contexts, returns | ||
| the full device resources. | ||
| Raises :class:`RuntimeError` if the context has been closed. | ||
| """ | ||
| if not self._h_context: | ||
| raise RuntimeError("Cannot query resources on a closed context") | ||
| return DeviceResources._init_from_ctx(self._h_context, self._device_id) | ||
| def create_stream(self, options: StreamOptions | None = None): | ||
| """Create a new stream bound to this green context. | ||
| This method is only available on green contexts. For primary | ||
| contexts, use :meth:`Device.create_stream` instead. | ||
| Parameters | ||
| ---------- | ||
| options : :obj:`~_stream.StreamOptions`, optional | ||
| Customizable dataclass for stream creation options. | ||
| Returns | ||
| ------- | ||
| :obj:`~_stream.Stream` | ||
| Newly created stream object. | ||
| """ | ||
| if not self._h_context: | ||
| raise RuntimeError("Cannot create a stream on a closed context") | ||
| if not self.is_green: | ||
| raise RuntimeError( | ||
| "Context.create_stream() is only supported on green contexts. " | ||
| "Use Device.create_stream() for primary contexts." | ||
| ) | ||
| return Stream._init(options=options, device_id=self._device_id, ctx=self) | ||
| cpdef close(self): | ||
| """Release this context wrapper's underlying CUDA handles.""" | ||
| cdef cydriver.CUcontext current_ctx | ||
| if self._h_context and as_cu(self._h_context) != NULL: | ||
| with nogil: | ||
| HANDLE_RETURN(cydriver.cuCtxGetCurrent(¤t_ctx)) | ||
| if current_ctx == as_cu(self._h_context): | ||
| raise RuntimeError( | ||
| "Cannot close a CUDA context while it is current. " | ||
| "Restore a previous context before closing this context." | ||
| ) | ||
leofang marked this conversation as resolved.
Uh oh!There was an error while loading. Please reload this page. | ||
| self._h_context.reset() | ||
| def __eq__(self, other): | ||
| if not isinstance(other, Context): | ||
| return NotImplemented | ||
| @@ -57,9 +144,12 @@ cdef class Context: | ||
| @dataclass | ||
| class ContextOptions: | ||
| cdef class ContextOptions: | ||
| """Options for context creation. | ||
| Currently unused, reserved for future use. | ||
| Attributes | ||
| ---------- | ||
| resources : :obj:`~cuda.core.typing.DeviceResourcesT` | ||
| Device resources used to create a green context. | ||
| """ | ||
| pass # TODO | ||
| resources: DeviceResourcesT | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Uh oh!
There was an error while loading. Please reload this page.
Oops, something went wrong.
Uh oh!
There was an error while loading. Please reload this page.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit: consider putting this in the handle API as
is_green(self._h_context).