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

Use consistent types in Kokkos_OpenMPTarget_Parallel.hpp #3703

Merged
merged 3 commits into from
Jan 12, 2021

Conversation

masterleinad
Copy link
Contributor

Fixes #3702. I checked that all other backends follow this convention.

@dalg24
Copy link
Member

dalg24 commented Jan 6, 2021

Do you think you can come up with a compile-only test that would catch the issue?

@masterleinad masterleinad force-pushed the fix_threadrange_ompt_types branch 2 times, most recently from df94387 to 94c7c63 Compare January 6, 2021 14:56
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.

Looks good besides the Impl:: namespace issue with OpenMPTarget

@masterleinad
Copy link
Contributor Author

masterleinad commented Jan 6, 2021

https://cloud.cees.ornl.gov/jenkins-ci/blue/organizations/jenkins/Kokkos/detail/Kokkos/3991/pipeline/42/#step-167-log-1192

Apparently, TeamPolicy parallel_for test needs some more TLC. So I disabled it again but it at least compiles which should be sufficient for this pull request.
Enabled again.

league_size) {}
: m_flags(
Kokkos::view_alloc(Kokkos::WithoutInitializing, "flags"),
#ifdef KOKKOS_ENABLE_OPENMPTARGET
Copy link
Member

Choose a reason for hiding this comment

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

Is that a FIXME?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Let's ask @rgayatri23 if this restriction is considered to be permanent or not.

Copy link
Contributor

Choose a reason for hiding this comment

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

Hopefully the restriction of needing at-least 32 threads per team is not permanent. We should probably add a FIXME_OPENMPTARGET everywhere we do this so that in the future if we can avoid this restriction, we can easily track these changes.

@@ -65,6 +65,8 @@ TEST(TEST_CATEGORY, team_for) {
1000);
}

// FIXME_OPENMPTARGET wrong results
#ifndef KOKKOS_ENABLE_OPENMPTARGET
TEST(TEST_CATEGORY, team_reduce) {
TestTeamPolicy<TEST_EXECSPACE,
Kokkos::Schedule<Kokkos::Static> >::test_reduce(0);
Copy link
Contributor

Choose a reason for hiding this comment

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

Is there a reason why OpenMPTarget has a different problem size?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

What do you mean? For me, this test just gives wrong results so I disabled it for now.

Copy link
Contributor

Choose a reason for hiding this comment

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

Oh Ok. I saw test_reduce(0) and test_reduce(1000), so assumed that the OPENMPTARGET backend is doing something different.

@rgayatri23
Copy link
Contributor

LGTM

@dalg24
Copy link
Member

dalg24 commented Jan 6, 2021

Please cleanup history (the enable test, disable and reenable at least) and I'll approve

@masterleinad
Copy link
Contributor Author

Please cleanup history (the enable test, disable and reenable at least) and I'll approve

Done.

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