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

C++14 Workaround issue #349 #357

Merged
merged 2 commits into from
Jan 29, 2019
Merged

C++14 Workaround issue #349 #357

merged 2 commits into from
Jan 29, 2019

Conversation

crtrott
Copy link
Member

@crtrott crtrott commented Dec 11, 2018

Fixes C++14 build issues.

@@ -46,6 +46,14 @@

#include<Kokkos_Core.hpp>

#ifdef KOKKOS_ENABLE_CXX14
Copy link
Contributor

Choose a reason for hiding this comment

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

This is not a blocker, but one-liners are nice:

#if defined(KOKKOS_ENABLE_CXX14) && defined(KOKKOS_COMPILER_GNU) && KOKKOS_COMPILER_GNU <= 720
#  define KOKKOS_IMPL_BATCHED_GEMM_GCC_CXX14_WORKAROUND
#endif 

Copy link
Contributor

@kyungjoo-kim kyungjoo-kim left a comment

Choose a reason for hiding this comment

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

Looks good to me and I will test on white.

@srajama1
Copy link
Contributor

@kyungjoo-kim Were you able to test this on white. It would be nice to merge this in.

Kokkos::parallel_for(Kokkos::ThreadVectorRange(team,blockDim_i), [&] (const int i) {
#ifdef KOKKOS_IMPL_BATCHED_GEMM_GCC_CXX14_WORKAROUND
const int idx_j = offset_j+j;
#endif
Copy link
Contributor

Choose a reason for hiding this comment

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

It probably necessary to pu int idx_j = offset_j + j with #else.

Copy link
Contributor

Choose a reason for hiding this comment

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

Oh... sorry... I just saw that the idx_j is defined on the above.

@kyungjoo-kim
Copy link
Contributor

It is okay with white. Plz, merge this PR.

@srajama1
Copy link
Contributor

@kyungjoo-kim Thank you !

@srajama1 srajama1 merged commit 342651f into develop Jan 29, 2019
@ndellingwood ndellingwood deleted the issue-349 branch October 29, 2020 16:05
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