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.

Sign up for GitHub

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

Jump to bottom

Deprecate array reductions with pointer return types #4756

Merged
merged 7 commits into from
Feb 10, 2022
Merged

Deprecate array reductions with pointer return types #4756

merged 7 commits into from
Feb 10, 2022

Conversation

masterleinad
Copy link
Contributor

Fixes #4208. Drive-by change fixes the deprecation macro to also work for non-Intel compilers.

@masterleinad
Copy link
Contributor Author

Retest this please.

dalg24
dalg24 reviewed Feb 4, 2022
View reviewed changes
core/unit_test/TestReduce.hpp Outdated
Comment on lines 544 to 553
#if defined(KOKKOS_ENABLE_OPENMPTARGET) && defined(KOKKOS_COMPILER_CLANG) && \
(KOKKOS_COMPILER_CLANG >= 1300)
#if !defined(KOKKOS_ENABLE_OPENMPTARGET) || \
(defined(KOKKOS_COMPILER_CLANG) && (KOKKOS_COMPILER_CLANG >= 1300))
Copy link
Member

Choose a reason for hiding this comment

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

Ugggg. Thanks for fixing.
cc @rgayatri23

@masterleinad
Copy link
Contributor Author

Retest this please.

dalg24
dalg24 reviewed Feb 4, 2022
View reviewed changes
core/unit_test/TestReduce.hpp Outdated Show resolved Hide resolved
core/unit_test/TestReduce.hpp Outdated Show resolved Hide resolved
core/unit_test/TestMDRange.hpp Outdated Show resolved Hide resolved
core/unit_test/TestMDRange.hpp Show resolved Hide resolved
crtrott
crtrott requested changes Feb 4, 2022
View reviewed changes
Copy link
Member

@crtrott crtrott left a comment

Choose a reason for hiding this comment

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

Agree with Damien on running if possible both parallel reduces - or would that make correctness check fail?

@masterleinad
Copy link
Contributor Author

Agree with Damien on running if possible both parallel reduces - or would that make correctness check fail?

If we do that we should also check both reductions.

@masterleinad masterleinad force-pushed the deprecate_array_reduction_with_ptr branch from 7918873 to 8faee19 Compare February 4, 2022 20:37
@masterleinad
Copy link
Contributor Author

Do we want this for 3.6 release (since it deprecated something) or not?

@dalg24
Copy link
Member

dalg24 commented Feb 9, 2022

Fix the SYCL build / retrigger the CI

@masterleinad masterleinad force-pushed the deprecate_array_reduction_with_ptr branch from ef8da07 to 0791f9a Compare February 9, 2022 19:25
@masterleinad masterleinad added the Blocks Promotion Overview issue for release-blocking bugs label Feb 9, 2022
@masterleinad
Copy link
Contributor Author

Fix the SYCL build / retrigger the CI

Done.

@masterleinad
Copy link
Contributor Author

The test failure

[ RUN      ] openmptarget.unique_token_global
4: /var/jenkins/workspace/Kokkos/core/unit_test/TestUniqueToken.hpp:151: Failure
4: Expected equality of these values:
4:   sum
4:     Which is: 9999990
4:   int64_t(N) * R
4:     Which is: 10000000
4: [  FAILED  ] openmptarget.unique_token_global (279 ms)

is clearly unrelated.

@dalg24 dalg24 merged commit 488e7b2 into kokkos:develop Feb 10, 2022
@dalg24 dalg24 removed the Blocks Promotion Overview issue for release-blocking bugs label Feb 10, 2022
@ndellingwood ndellingwood mentioned this pull request Sep 8, 2022
Merged
ndellingwood added a commit to ndellingwood/Trilinos that referenced this pull request Sep 22, 2022
@ndellingwood
zoltan2: compatibility update for array reductions
8d19ae8 
- Replace pointer-type with Kokkos::View for array reductions
- Delete unneeded (duplicate) join overloads with volatile quantifiers

Compatibility update for disabled deprecated code in kokkos
kokkos/kokkos#4756
@ndellingwood ndellingwood mentioned this pull request Sep 22, 2022
Merged
@masterleinad masterleinad deleted the deprecate_array_reduction_with_ptr branch November 11, 2022 14:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dalg24 dalg24 dalg24 left review comments

@PhilMiller PhilMiller PhilMiller approved these changes

@crtrott crtrott crtrott approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@masterleinad @dalg24 @PhilMiller @crtrott