Skip to content

[Backport branch/3.3.x] Support DLPack inclusion for both <dlpack/dlpack.h> and <dlpack.h> #7910

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
github-actions wants to merge 1 commit into
base: branch/3.3.x
Choose a base branch
from
Open

[Backport branch/3.3.x] Support DLPack inclusion for both <dlpack/dlpack.h> and <dlpack.h> #7910

Show file tree
Hide file tree
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
6 changes: 5 additions & 1 deletion libcudacxx/include/cuda/__internal/dlpack.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,11 @@

#if _CCCL_HAS_DLPACK()

# include <dlpack/dlpack.h>
# if __has_include(<dlpack/dlpack.h>)
# include <dlpack/dlpack.h>
# elif __has_include(<dlpack.h>)
# include <dlpack.h>
# endif

# define _CCCL_DLPACK_AT_LEAST(_MAJOR, _MINOR) \
(DLPACK_MAJOR_VERSION > (_MAJOR) || (DLPACK_MAJOR_VERSION == (_MAJOR) && DLPACK_MINOR_VERSION >= (_MINOR)))
Expand Down
3 changes: 2 additions & 1 deletion libcudacxx/include/cuda/std/__internal/features.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,8 @@

// Third party libraries

#if __has_include(<dlpack/dlpack.h>) && !_CCCL_COMPILER(NVRTC) && !defined(CCCL_DISABLE_DLPACK)
#if (__has_include(<dlpack/dlpack.h>) || __has_include(<dlpack.h>)) && \
!_CCCL_COMPILER(NVRTC) && !defined(CCCL_DISABLE_DLPACK)
# define _CCCL_HAS_DLPACK() 1
#else // ^^^ has dlpack ^^^ / vvv no dlpack vvv
# define _CCCL_HAS_DLPACK() 0
Expand Down
Loading