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

Pr for Basic Kokkos #248

Merged
merged 29 commits into from
Jun 22, 2022
Merged

Pr for Basic Kokkos #248

merged 29 commits into from
Jun 22, 2022

Conversation

MrBurmark
Copy link
Member

PR for #206

  • This PR is a (refactoring, bugfix, feature, something else)
  • It does the following (modify list as needed):
    • Modifies/refactors (class or method) (how?)
    • Fixes (issue number(s))
    • Adds (specific feature) at the request of (project or person)

ajpowelsnl and others added 29 commits May 20, 2022 14:54
@ajpowelsnl
Kokkos: Add git submodule and CMake changes
060bfc4 
co-authored-by: Christian Trott <crtrott@sandia.gov>
co-authored-by: David Zoeller Poliakoff <dzpolia@sandia.gov>

Adds optional Kokkos dependency and Kokkos
as a submodule
@ajpowelsnl @crtrott @DavidPoliakoff-backup
Kokkos: Initialize/Finalize Kokkos in Driver
8da0e88 
co-authored-by: Christian Trott <crtrott@sandia.gov>
co-authored-by: David Zoeller Poliakoff <dzpolia@sandia.gov>
@ajpowelsnl
Kokkos: Add basic kernel group variants
2da3277 
co-authored-by: Christian Trott <crtrott@sandia.gov>
co-authored-by: David Zoeller Poliakoff <dzpolia@sandia.gov>

Note: This makes it so that one only compiles the
basic kernel group when Kokkos is enabled.

This required a few judicous ifdefs in some places in common.
Eventually when the Kokkos variants for all the kernel
groups are merged, those ifdefs are not needed.
@ajpowelsnl
Clean up basic kernels and CMakeLists.txt
a8b4fc5
@ajpowelsnl
Addressing PR comments before merge with RPS develop
42f1181
@ajpowelsnl
Add DAXPY_ATOMIC, formatting, in REDUCE3, Kokkos::min, Kokkos::max
a9ed2f7
@ajpowelsnl
DAXPY_ATOMIC: copying files from llnl/develop to restore original fil…
2ba3c9d 
…e format

This commit effectively removes clang formatting inappropriately applied to
these files.
@ajpowelsnl
Delete code now in KokkosViewUtils.hpp
f6b8232
@ajpowelsnl
RAJAPerfSuite.hpp 0d8b139: removing RUN_KOKKOS infrastructure in unfo…
800bd44 
…rmatted file

This commit effectively reverts clang formatting applied to this file in later commits, thus minimizing changes to the original file.
@ajpowelsnl
RAJAPerfSuite.hpp: rm line 18 to minimize changes
ff93ba6
@ajpowelsnl
reverting formatting changes
73dc173
@ajpowelsnl
Restore destructor in DAXPY_ATOMIC.cpp
c843d99
@ajpowelsnl
Kokkos updates for running with the current RAJA + Kokkos
422f8d0
@ajpowelsnl
Addressing D. Beckingsale PR comments
a0f5c31
@ajpowelsnl
Build and runtime fix ups with Jason B.
593489b
@ajpowelsnl
MULADDSUB-Kokkos.cpp: add guard to fix failing CI
d042c8a
@ajpowelsnl @MrBurmark
Update src/RAJAPerfSuiteDriver.cpp
eb3fa28 
Co-authored-by: Jason Burmark <MrBurmark@users.noreply.github.com>
@ajpowelsnl
Addressing Jason B. PR comments
0ee2fce
@ajpowelsnl
Merge branch 'basic-kokkos' of github.com:ajpowelsnl/RAJAPerf into ba…
4b529c4 
…sic-kokkos
@ajpowelsnl
Addressing Jason B. PR requests: re-adding two includes + rm Kokkos_Core
a9bd651 
header
@ajpowelsnl
RAJAPerfSuite.hpp: addressing final-ish PR comments from Jason B.
f8eef46
@ajpowelsnl @MrBurmark
Update src/common/RAJAPerfSuite.hpp
0407c36 
Accept this change

Co-authored-by: Jason Burmark <MrBurmark@users.noreply.github.com>
@ajpowelsnl @MrBurmark
Update src/common/RAJAPerfSuite.hpp
d57a5d9 
Co-authored-by: Jason Burmark <MrBurmark@users.noreply.github.com>
@ajpowelsnl @MrBurmark
Update src/common/RAJAPerfSuite.hpp
3e49f7d 
Suggestion accepted

Co-authored-by: Jason Burmark <MrBurmark@users.noreply.github.com>
@ajpowelsnl @MrBurmark
Update src/common/RAJAPerfSuite.hpp
c28aff3 
Suggestion accepted

Co-authored-by: Jason Burmark <MrBurmark@users.noreply.github.com>
@MrBurmark
Remove extra whitespace
8ed1554
@MrBurmark
Add back in newline
dbbae25
@MrBurmark
Remove whitespace change
9c2c431
@MrBurmark
Remove whitespace change
6add081
@MrBurmark MrBurmark marked this pull request as ready for review June 22, 2022 14:42
@artv3 artv3 mentioned this pull request Jun 22, 2022
Merged
rhornung67
rhornung67 approved these changes Jun 22, 2022
View reviewed changes
Copy link
Member

@rhornung67 rhornung67 left a comment

Choose a reason for hiding this comment

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

Approving so this can be merged. We will continue to iterate and discuss as this evolves.

@MrBurmark MrBurmark merged commit 7bf4e8c into develop Jun 22, 2022
@MrBurmark MrBurmark deleted the pr-from-fork/206 branch June 22, 2022 21:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@artv3 artv3 artv3 approved these changes

@rhornung67 rhornung67 rhornung67 approved these changes

@rchen20 rchen20 rchen20 approved these changes

@davidbeckingsale davidbeckingsale Awaiting requested review from davidbeckingsale

@kab163 kab163 Awaiting requested review from kab163

@mdavis36 mdavis36 Awaiting requested review from mdavis36

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
5 participants
@MrBurmark @artv3 @rhornung67 @rchen20 @ajpowelsnl