Skip to content

docs: remove merge conflict markers from the cuda.core 1.2.0 release notes #2518

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.

Sign up for GitHub

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

Open
aryanputta wants to merge 1 commit into
base: main
Choose a base branch
from
Open

docs: remove merge conflict markers from the cuda.core 1.2.0 release notes #2518

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions cuda_core/docs/source/release/1.2.0-notes.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ Fixes and enhancements
versions 12.2 or newer.
(`#2352 <https://github.com/NVIDIA/cuda-python/issues/2352>`__)

<<<<<<< HEAD
- The default-stream singletons ``LEGACY_DEFAULT_STREAM`` and
``PER_THREAD_DEFAULT_STREAM`` no longer cache the first context and device
they observe. A default-stream token refers to whatever context is current,
Expand All @@ -34,7 +33,7 @@ Fixes and enhancements
Previously the first query pinned the singleton to one context for the
lifetime of the process, which also kept that context alive.
(`#2485 <https://github.com/NVIDIA/cuda-python/issues/2485>`__)
=======

- :meth:`Linker.which_backend` and constructing a :class:`Linker` no longer
raise ``FunctionNotFoundError`` when an nvJitLink older than 12.3
(12.0–12.2) is installed. These versions do not export the unversioned
Expand All @@ -43,7 +42,6 @@ Fixes and enhancements
(``cuLink``) backend, restoring the pre-0.7.0 behavior.
(`#2409 <https://github.com/NVIDIA/cuda-python/pull/2409>`__,
closes `#2408 <https://github.com/NVIDIA/cuda-python/issues/2408>`__)
>>>>>>> origin/main

Deprecation Notices
-------------------
Expand Down
Loading