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 msvc cuda develop #6659

Merged
merged 6 commits into from
Dec 13, 2023
Merged

Fix msvc cuda develop #6659

merged 6 commits into from
Dec 13, 2023

Conversation

crtrott
Copy link
Member

@crtrott crtrott commented Dec 9, 2023

Various small fixups for MSVC/CUDA build:

  • builtin_unreachable is not defined when using NVCC/MSVC
  • missing include in Kokkos_Serial
  • host/device lambdas in constexpr if branches not supported on NVCC?MSVC
  • some default CTAD not working for some reason with NVCC/MSVC
  • half/bhalf type is_nan/is_finite/is_inf etc. hit some non-working system header intrinsic - I suspect it has something to do with the bit comparison manipulation stuff but didn't investigate much

core/src/Serial/Kokkos_Serial.hpp Outdated Show resolved Hide resolved
(defined(KOKKOS_COMPILER_NVCC) && KOKKOS_COMPILER_NVCC >= 1130)
#if defined KOKKOS_COMPILER_INTEL || \
(defined(KOKKOS_COMPILER_NVCC) && KOKKOS_COMPILER_NVCC >= 1130 && \
!defined(KOKKOS_COMPILER_MSVC))
Copy link
Member

Choose a reason for hiding this comment

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

Consider updating the comment above

@@ -1581,6 +1585,7 @@ struct TestIsFinite {
++e;
Kokkos::printf("failed isfinite(float)\n");
}
#if !(defined(KOKKOS_ENABLE_CUDA) && defined(KOKKOS_COMPILER_MSVC))
Copy link
Member

Choose a reason for hiding this comment

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

What is the deal with commenting out some of the half type tests?. Neither the commit messages nor the description refer to these changes.

Copy link
Member Author

Choose a reason for hiding this comment

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

ah yeah I guess missed that in the message: some random error inside system header files ...

@@ -394,10 +395,12 @@ DEFINE_UNARY_FUNCTION_EVAL(log2, 2);
DEFINE_UNARY_FUNCTION_EVAL(log1p, 2);
#endif

#ifndef KOKKOS_MATHEMATICAL_FUNCTIONS_SKIP_1
#ifndef KOKKOS_MATHEMATICAL_FUNCTIONS_SKIP_2
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 comment about what you did here (on GH). You just randomly moved tests from on exe to the other or was there some reasoning behind it?

Copy link
Member Author

Choose a reason for hiding this comment

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

Monkey do monkey see.

@crtrott crtrott merged commit 1bd9ce7 into kokkos:develop Dec 13, 2023
28 of 29 checks passed
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

4 participants