Skip to content
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

Jump to bottom

Set CONSTEXPR_EXCEPT_WIN_CUDA as const while it is not constexpr #43380

Closed
wants to merge 2 commits into from
Closed

Set CONSTEXPR_EXCEPT_WIN_CUDA as const while it is not constexpr #43380

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
39d450b
fix issue 42467
mszhanyi Aug 21, 2020
452f1c8
Merge branch 'master' of https://github.com/mszhanyi/pytorch into zha…
mszhanyi Aug 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions c10/macros/Macros.h
View file
Open in desktop
Expand Up @@ -333,15 +333,15 @@ __host__ __device__

#if defined(__CUDA_ARCH__)
#if defined(_MSC_VER) && defined(__CUDACC__)
#define CONSTEXPR_EXCEPT_WIN_CUDA
#define CONSTEXPR_EXCEPT_WIN_CUDA const
#define C10_HOST_CONSTEXPR_EXCEPT_WIN_CUDA __host__
#else
#define CONSTEXPR_EXCEPT_WIN_CUDA constexpr
#define C10_HOST_CONSTEXPR_EXCEPT_WIN_CUDA __host__
#endif
#else
#if defined(_MSC_VER) && defined(__CUDACC__)
#define CONSTEXPR_EXCEPT_WIN_CUDA
#define CONSTEXPR_EXCEPT_WIN_CUDA const
#define C10_HOST_CONSTEXPR_EXCEPT_WIN_CUDA
#else
#define CONSTEXPR_EXCEPT_WIN_CUDA constexpr
Expand Down