Guard against unrecognized pragma with intel compilers #5019
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Force pushed fix for clang-format |
|
Ug, wait, clang-format made a bad conversion, from e.g. pre-clang-format #if defined(__EDG__) && !defined(KOKKOS_COMPILER_INTEL)
#pragma push
#pragma diag_suppress implicit_return_from_non_void_function
#endifto post-clang-format #if defined(__EDG__) && !defined(KOKKOS_COMPILER_INTEL)
#pragma push && !defined(KOKKOS_COMPILER_INTEL)
#pragma diag_suppress implicit_return_from_non_void_function
#endif@dalg24 should I disable the clang-format check around these guards? Not sure why the formatting made this type of change... (sorry for double ping, accidentally posted on the issue first instead of here) |
crtrott
previously requested changes
May 11, 2022
core/src/impl/Kokkos_BitOps.hpp
Outdated
| #if defined(__EDG__) | ||
| #pragma push | ||
| #if defined(__EDG__) && !defined(KOKKOS_COMPILER_INTEL) | ||
| #pragma push && !defined(KOKKOS_COMPILER_INTEL) |
There was a problem hiding this comment.
@crtrott clang-format error, not sure how to prevent it without breaking the clang-format check, any suggestions?
core/src/impl/Kokkos_BitOps.hpp
Outdated
| #pragma diag_suppress implicit_return_from_non_void_function | ||
| #endif | ||
| KOKKOS_FORCEINLINE_FUNCTION | ||
| int int_log2(unsigned i) { | ||
| KOKKOS_IF_ON_DEVICE((return int_log2_device(i);)) | ||
| KOKKOS_IF_ON_HOST((return int_log2_host(i);)) | ||
| } | ||
| #if defined(__EDG__) | ||
| #if defined(__EDG__) && !defined(KOKKOS_COMPILER_INTEL) && \ | ||
| !defined(KOKKOS_COMPILER_INTEL) |
There was a problem hiding this comment.
@crtrott clang-format error, not sure how to prevent it without breaking the clang-format check, any suggestions?
dalg24
approved these changes
May 11, 2022
|
Failed at clang-tidy step due to some apparent Jenkins connectivity issue: @dalg24 is this okay to merge without retesting? |
masterleinad
approved these changes
May 12, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Address issue #5018