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

Basic kokkos #206

Merged
merged 29 commits into from
Jun 22, 2022
Merged

Basic kokkos #206

merged 29 commits into from
Jun 22, 2022

Commits on May 20, 2022

  1. Kokkos: Add git submodule and CMake changes 

    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
    ajpowelsnl committed May 20, 2022
    Configuration menu
    Copy the full SHA
    060bfc4 View commit details
    Browse the repository at this point in the history

  2. Kokkos: Initialize/Finalize Kokkos in Driver 

    co-authored-by: Christian Trott <crtrott@sandia.gov>
co-authored-by: David Zoeller Poliakoff <dzpolia@sandia.gov>
    @ajpowelsnl @crtrott @DavidPoliakoff-backup
    3 people committed May 20, 2022
    Configuration menu
    Copy the full SHA
    8da0e88 View commit details
    Browse the repository at this point in the history

  3. Kokkos: Add basic kernel group variants 

    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
    ajpowelsnl committed May 20, 2022
    Configuration menu
    Copy the full SHA
    2da3277 View commit details
    Browse the repository at this point in the history

  4. Clean up basic kernels and CMakeLists.txt

    @ajpowelsnl
    ajpowelsnl committed May 20, 2022
    Configuration menu
    Copy the full SHA
    a8b4fc5 View commit details
    Browse the repository at this point in the history

  5. Addressing PR comments before merge with RPS develop

    @ajpowelsnl
    ajpowelsnl committed May 20, 2022
    Configuration menu
    Copy the full SHA
    42f1181 View commit details
    Browse the repository at this point in the history

  6. Add DAXPY_ATOMIC, formatting, in REDUCE3, Kokkos::min, Kokkos::max

    @ajpowelsnl
    ajpowelsnl committed May 20, 2022
    Configuration menu
    Copy the full SHA
    a9ed2f7 View commit details
    Browse the repository at this point in the history

  7. DAXPY_ATOMIC: copying files from llnl/develop to restore original fil… 

    …e format

This commit effectively removes clang formatting inappropriately applied to
these files.
    @ajpowelsnl
    ajpowelsnl committed May 20, 2022
    Configuration menu
    Copy the full SHA
    2ba3c9d View commit details
    Browse the repository at this point in the history

  8. Delete code now in KokkosViewUtils.hpp

    @ajpowelsnl
    Amy Powell authored and ajpowelsnl committed May 20, 2022
    Configuration menu
    Copy the full SHA
    f6b8232 View commit details
    Browse the repository at this point in the history

  9. RAJAPerfSuite.hpp 0d8b139: removing RUN_KOKKOS infrastructure in unfo… 

    …rmatted file

This commit effectively reverts clang formatting applied to this file in later commits, thus minimizing changes to the original file.
    @ajpowelsnl
    Amy Powell authored and ajpowelsnl committed May 20, 2022
    Configuration menu
    Copy the full SHA
    800bd44 View commit details
    Browse the repository at this point in the history

  10. RAJAPerfSuite.hpp: rm line 18 to minimize changes

    @ajpowelsnl
    Amy Powell authored and ajpowelsnl committed May 20, 2022
    Configuration menu
    Copy the full SHA
    ff93ba6 View commit details
    Browse the repository at this point in the history

  11. reverting formatting changes

    @ajpowelsnl
    ajpowelsnl committed May 20, 2022
    Configuration menu
    Copy the full SHA
    73dc173 View commit details
    Browse the repository at this point in the history

Commits on May 21, 2022

  1. Restore destructor in DAXPY_ATOMIC.cpp

    @ajpowelsnl
    ajpowelsnl committed May 21, 2022
    Configuration menu
    Copy the full SHA
    c843d99 View commit details
    Browse the repository at this point in the history

Commits on May 25, 2022

  1. Kokkos updates for running with the current RAJA + Kokkos

    @ajpowelsnl
    ajpowelsnl committed May 25, 2022
    Configuration menu
    Copy the full SHA
    422f8d0 View commit details
    Browse the repository at this point in the history

Commits on Jun 1, 2022

  1. Addressing D. Beckingsale PR comments

    @ajpowelsnl
    ajpowelsnl committed Jun 1, 2022
    Configuration menu
    Copy the full SHA
    a0f5c31 View commit details
    Browse the repository at this point in the history

Commits on Jun 17, 2022

  1. Build and runtime fix ups with Jason B.

    @ajpowelsnl
    ajpowelsnl committed Jun 17, 2022
    Configuration menu
    Copy the full SHA
    593489b View commit details
    Browse the repository at this point in the history

  2. MULADDSUB-Kokkos.cpp: add guard to fix failing CI

    @ajpowelsnl
    ajpowelsnl committed Jun 17, 2022
    Configuration menu
    Copy the full SHA
    d042c8a View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2022

  1. Update src/RAJAPerfSuiteDriver.cpp 

    Co-authored-by: Jason Burmark <MrBurmark@users.noreply.github.com>
    @ajpowelsnl @MrBurmark
    ajpowelsnl and MrBurmark committed Jun 21, 2022
    Configuration menu
    Copy the full SHA
    eb3fa28 View commit details
    Browse the repository at this point in the history

  2. Addressing Jason B. PR comments

    @ajpowelsnl
    ajpowelsnl committed Jun 21, 2022
    Configuration menu
    Copy the full SHA
    0ee2fce View commit details
    Browse the repository at this point in the history

  3. Merge branch 'basic-kokkos' of github.com:ajpowelsnl/RAJAPerf into ba… 

    …sic-kokkos
    @ajpowelsnl
    ajpowelsnl committed Jun 21, 2022
    Configuration menu
    Copy the full SHA
    4b529c4 View commit details
    Browse the repository at this point in the history

  4. Addressing Jason B. PR requests: re-adding two includes + rm Kokkos_Core 

    header
    @ajpowelsnl
    ajpowelsnl committed Jun 21, 2022
    Configuration menu
    Copy the full SHA
    a9bd651 View commit details
    Browse the repository at this point in the history

  5. RAJAPerfSuite.hpp: addressing final-ish PR comments from Jason B.

    @ajpowelsnl
    ajpowelsnl committed Jun 21, 2022
    Configuration menu
    Copy the full SHA
    f8eef46 View commit details
    Browse the repository at this point in the history

Commits on Jun 22, 2022

  1. Update src/common/RAJAPerfSuite.hpp 

    Accept this change

Co-authored-by: Jason Burmark <MrBurmark@users.noreply.github.com>
    @ajpowelsnl @MrBurmark
    ajpowelsnl and MrBurmark committed Jun 22, 2022
    Configuration menu
    Copy the full SHA
    0407c36 View commit details
    Browse the repository at this point in the history

  2. Update src/common/RAJAPerfSuite.hpp 

    Co-authored-by: Jason Burmark <MrBurmark@users.noreply.github.com>
    @ajpowelsnl @MrBurmark
    ajpowelsnl and MrBurmark committed Jun 22, 2022
    Configuration menu
    Copy the full SHA
    d57a5d9 View commit details
    Browse the repository at this point in the history

  3. Update src/common/RAJAPerfSuite.hpp 

    Suggestion accepted

Co-authored-by: Jason Burmark <MrBurmark@users.noreply.github.com>
    @ajpowelsnl @MrBurmark
    ajpowelsnl and MrBurmark committed Jun 22, 2022
    Configuration menu
    Copy the full SHA
    3e49f7d View commit details
    Browse the repository at this point in the history

  4. Update src/common/RAJAPerfSuite.hpp 

    Suggestion accepted

Co-authored-by: Jason Burmark <MrBurmark@users.noreply.github.com>
    @ajpowelsnl @MrBurmark
    ajpowelsnl and MrBurmark committed Jun 22, 2022
    Configuration menu
    Copy the full SHA
    c28aff3 View commit details
    Browse the repository at this point in the history

  5. Remove extra whitespace

    @MrBurmark
    MrBurmark committed Jun 22, 2022
    Configuration menu
    Copy the full SHA
    8ed1554 View commit details
    Browse the repository at this point in the history

  6. Add back in newline

    @MrBurmark
    MrBurmark committed Jun 22, 2022
    Configuration menu
    Copy the full SHA
    dbbae25 View commit details
    Browse the repository at this point in the history

  7. Remove whitespace change

    @MrBurmark
    MrBurmark committed Jun 22, 2022
    Configuration menu
    Copy the full SHA
    9c2c431 View commit details
    Browse the repository at this point in the history

  8. Remove whitespace change

    @MrBurmark
    MrBurmark committed Jun 22, 2022
    Configuration menu
    Copy the full SHA
    6add081 View commit details
    Browse the repository at this point in the history