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.

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

Fix windows build issues which crept in for the CUDA build. #3532

Merged
merged 1 commit into from
Oct 29, 2020

Conversation

crtrott
Copy link
Member

@crtrott crtrott commented Oct 27, 2020

No description provided.

Copy link
Member

@dalg24 dalg24 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I want to make sure I understand the change in core/src/setup/Kokkos_Setup_Cuda.hpp

Everything else looks good to me

@@ -104,7 +104,8 @@
#if !defined(KOKKOS_DISABLE_CUDA_ASM)
#if !defined(KOKKOS_ENABLE_CUDA_ASM)
#define KOKKOS_ENABLE_CUDA_ASM
#if !defined(KOKKOS_DISABLE_CUDA_ASM_ATOMICS)
#if !defined(KOKKOS_DISABLE_CUDA_ASM_ATOMICS) && \
defined(KOKKOS_ENABLE_GNU_ATOMICS)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you elaborate on this change and explain what was wrong?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

CUDA_ASM uses GNU Atomics macros for memory orders and so we can't do this in windows with clang.

@crtrott crtrott merged commit 6fc5396 into kokkos:develop Oct 29, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants