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

Resource Integration #89

Open
wants to merge 136 commits into
base: develop
Choose a base branch
from
Open

Commits on Sep 25, 2019

  1. adding camp submodule

    mdavis36 committed Sep 25, 2019
    Configuration menu
    Copy the full SHA
    808172d View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    ee604ad View commit details
    Browse the repository at this point in the history

Commits on Sep 26, 2019

  1. Configuration menu
    Copy the full SHA
    756b5db View commit details
    Browse the repository at this point in the history

Commits on Sep 27, 2019

  1. Configuration menu
    Copy the full SHA
    71f6f6e View commit details
    Browse the repository at this point in the history

Commits on Oct 4, 2019

  1. Configuration menu
    Copy the full SHA
    c87454c View commit details
    Browse the repository at this point in the history

Commits on Oct 7, 2019

  1. Configuration menu
    Copy the full SHA
    a34f1e7 View commit details
    Browse the repository at this point in the history

Commits on Oct 8, 2019

  1. Configuration menu
    Copy the full SHA
    98a56fc View commit details
    Browse the repository at this point in the history

Commits on Oct 9, 2019

  1. Configuration menu
    Copy the full SHA
    877c4cd View commit details
    Browse the repository at this point in the history

Commits on Oct 10, 2019

  1. Single memory transfer

    mdavis36 committed Oct 10, 2019
    Configuration menu
    Copy the full SHA
    d7f3e44 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    2c44762 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    fac090e View commit details
    Browse the repository at this point in the history

Commits on Oct 17, 2019

  1. switching to forall loop

    mdavis36 committed Oct 17, 2019
    Configuration menu
    Copy the full SHA
    61ef0ab View commit details
    Browse the repository at this point in the history
  2. trying to print

    mdavis36 committed Oct 17, 2019
    Configuration menu
    Copy the full SHA
    9fe6a04 View commit details
    Browse the repository at this point in the history

Commits on Oct 18, 2019

  1. Configuration menu
    Copy the full SHA
    1ef9f9d View commit details
    Browse the repository at this point in the history
  2. Merge branch 'develop' into feature/device-context-integration

    Conflicts:
    	src/tpl/umpire
    	tests/unit/CMakeLists.txt
    davidbeckingsale committed Oct 18, 2019
    Configuration menu
    Copy the full SHA
    9f85364 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    7c20b10 View commit details
    Browse the repository at this point in the history
  4. forcing wait after copy

    mdavis36 committed Oct 18, 2019
    Configuration menu
    Copy the full SHA
    feaaa51 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    b30d107 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    d877248 View commit details
    Browse the repository at this point in the history
  7. Merge branch 'feature/device-context-integration' of github.com:LLNL/…

    …CHAI into feature/device-context-integration
    
    Conflicts:
    	examples/context.cpp
    davidbeckingsale committed Oct 18, 2019
    Configuration menu
    Copy the full SHA
    cc50e35 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    ec14672 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    f073f76 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    0058134 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    2344529 View commit details
    Browse the repository at this point in the history

Commits on Oct 21, 2019

  1. Removing camp submodule

    mdavis36 committed Oct 21, 2019
    Configuration menu
    Copy the full SHA
    3de01e2 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    52b4599 View commit details
    Browse the repository at this point in the history
  3. Merge branch 'feature/device-context-integration' of github.com:LLNL/…

    …CHAI into feature/device-context-integration
    davidbeckingsale committed Oct 21, 2019
    Configuration menu
    Copy the full SHA
    26f8d0d View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    73d3557 View commit details
    Browse the repository at this point in the history
  5. Merge branch 'feature/device-context-integration' of https://github.c…

    …om/llnl/CHAI into feature/device-context-integration
    mdavis36 committed Oct 21, 2019
    Configuration menu
    Copy the full SHA
    10b2db0 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    94cb802 View commit details
    Browse the repository at this point in the history
  7. Merge branch 'feature/device-context-integration' of github.com:LLNL/…

    …CHAI into feature/device-context-integration
    
    Conflicts:
    	examples/context-simple.cpp
    davidbeckingsale committed Oct 21, 2019
    Configuration menu
    Copy the full SHA
    e169b4c View commit details
    Browse the repository at this point in the history
  8. Namespace change for tests

    mdavis36 committed Oct 21, 2019
    Configuration menu
    Copy the full SHA
    ba87903 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    99919f7 View commit details
    Browse the repository at this point in the history
  10. Fixing Non Cuda build tests.

    mdavis36 committed Oct 21, 2019
    Configuration menu
    Copy the full SHA
    b1ed7ac View commit details
    Browse the repository at this point in the history
  11. Fixing no context gpu call

    mdavis36 committed Oct 21, 2019
    Configuration menu
    Copy the full SHA
    33172ef View commit details
    Browse the repository at this point in the history
  12. updating umpire

    mdavis36 committed Oct 21, 2019
    Configuration menu
    Copy the full SHA
    6ecb678 View commit details
    Browse the repository at this point in the history
  13. Dependent context example.

    mdavis36 committed Oct 21, 2019
    Configuration menu
    Copy the full SHA
    7d85179 View commit details
    Browse the repository at this point in the history

Commits on Oct 22, 2019

  1. Configuration menu
    Copy the full SHA
    cab2435 View commit details
    Browse the repository at this point in the history
  2. Fixing all example prints.

    mdavis36 committed Oct 22, 2019
    Configuration menu
    Copy the full SHA
    eeb9b82 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    de9f7b6 View commit details
    Browse the repository at this point in the history

Commits on Oct 23, 2019

  1. Reducing example array size.

    mdavis36 committed Oct 23, 2019
    Configuration menu
    Copy the full SHA
    5897d64 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    4f0aebc View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    1b95c0f View commit details
    Browse the repository at this point in the history

Commits on Oct 24, 2019

  1. Configuration menu
    Copy the full SHA
    2f2e578 View commit details
    Browse the repository at this point in the history
  2. Updating umpire

    mdavis36 committed Oct 24, 2019
    Configuration menu
    Copy the full SHA
    2365e1e View commit details
    Browse the repository at this point in the history
  3. Updating Umpire

    mdavis36 committed Oct 24, 2019
    Configuration menu
    Copy the full SHA
    5d16eff View commit details
    Browse the repository at this point in the history

Commits on Oct 25, 2019

  1. Configuration menu
    Copy the full SHA
    b3ced7a View commit details
    Browse the repository at this point in the history

Commits on Dec 11, 2019

  1. Configuration menu
    Copy the full SHA
    5926b9e View commit details
    Browse the repository at this point in the history

Commits on Jan 8, 2020

  1. Configuration menu
    Copy the full SHA
    9b72e0b View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    1de6885 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    2001912 View commit details
    Browse the repository at this point in the history
  4. Enqueuing waits on stream

    mdavis36 committed Jan 8, 2020
    Configuration menu
    Copy the full SHA
    27eadce View commit details
    Browse the repository at this point in the history

Commits on Jan 9, 2020

  1. Merge remote-tracking branch 'origin/develop' into feature/multi-reco…

    …urce-per-array
    
    Conflicts:
    	.gitmodules
    	cmake/thirdparty/SetupChaiThirdparty.cmake
    	tests/integration/CMakeLists.txt
    mdavis36 committed Jan 9, 2020
    Configuration menu
    Copy the full SHA
    a5ca2b5 View commit details
    Browse the repository at this point in the history

Commits on Jan 15, 2020

  1. Configuration menu
    Copy the full SHA
    7e2ffb5 View commit details
    Browse the repository at this point in the history

Commits on Jan 29, 2020

  1. Merge branch 'develop' into feature/device-context-integration

    Conflicts:
    	.gitmodules
    	cmake/thirdparty/SetupChaiThirdparty.cmake
    	tests/integration/CMakeLists.txt
    	tests/unit/CMakeLists.txt
    mdavis36 committed Jan 29, 2020
    Configuration menu
    Copy the full SHA
    99ba12d View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    521505e View commit details
    Browse the repository at this point in the history
  3. Merge branch 'feature/device-context-integration' into feature/multi-…

    …recource-per-array
    
    Conflicts:
    	tests/integration/CMakeLists.txt
    mdavis36 committed Jan 29, 2020
    Configuration menu
    Copy the full SHA
    131a986 View commit details
    Browse the repository at this point in the history

Commits on Jan 30, 2020

  1. Configuration menu
    Copy the full SHA
    abc8d71 View commit details
    Browse the repository at this point in the history

Commits on Feb 3, 2020

  1. Adding ActiveResourceManager Container class for handling multiple re…

    …sources per ManagedArray
    mdavis36 committed Feb 3, 2020
    Configuration menu
    Copy the full SHA
    5430629 View commit details
    Browse the repository at this point in the history

Commits on Feb 5, 2020

  1. Updating Umpire

    mdavis36 committed Feb 5, 2020
    Configuration menu
    Copy the full SHA
    fbc00a2 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    9b07d5d View commit details
    Browse the repository at this point in the history
  3. Merge branch 'feature/device-context-integration' into feature/multi-…

    …recource-per-array
    
    Conflicts:
    	src/chai/ArrayManager.cpp
    	src/chai/ManagedArray.inl
    	src/chai/PointerRecord.hpp
    mdavis36 committed Feb 5, 2020
    Configuration menu
    Copy the full SHA
    91524d2 View commit details
    Browse the repository at this point in the history

Commits on Feb 19, 2020

  1. Bumping umpire

    mdavis36 committed Feb 19, 2020
    Configuration menu
    Copy the full SHA
    1a7148d View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    72cfa72 View commit details
    Browse the repository at this point in the history

Commits on Apr 6, 2020

  1. Merge branch 'develop' into feature/device-context-integration

    Conflicts:
    	src/chai/ArrayManager.cpp
    mdavis36 committed Apr 6, 2020
    Configuration menu
    Copy the full SHA
    a30e67d View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    bdb7465 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    f20b59d View commit details
    Browse the repository at this point in the history

Commits on May 26, 2020

  1. Configuration menu
    Copy the full SHA
    6d14af0 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    1a39b70 View commit details
    Browse the repository at this point in the history

Commits on Jun 4, 2020

  1. Trying to unify CHAI move

    mdavis36 committed Jun 4, 2020
    Configuration menu
    Copy the full SHA
    9305308 View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2020

  1. Configuration menu
    Copy the full SHA
    f41551e View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    00ef5e5 View commit details
    Browse the repository at this point in the history
  3. More debug statements

    mdavis36 committed Jun 5, 2020
    Configuration menu
    Copy the full SHA
    bc0177f View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    13095be View commit details
    Browse the repository at this point in the history

Commits on Jun 8, 2020

  1. Configuration menu
    Copy the full SHA
    6d73a40 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    d76456b View commit details
    Browse the repository at this point in the history

Commits on Jun 11, 2020

  1. Configuration menu
    Copy the full SHA
    b1047b8 View commit details
    Browse the repository at this point in the history

Commits on Jun 29, 2020

  1. Configuration menu
    Copy the full SHA
    f0186d4 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    8f63be9 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    44101f5 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    467b43c View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    234025b View commit details
    Browse the repository at this point in the history
  6. Adding Resource tests.

    mdavis36 committed Jun 29, 2020
    Configuration menu
    Copy the full SHA
    0ca9c6e View commit details
    Browse the repository at this point in the history

Commits on Jul 13, 2020

  1. Re-run tests.

    mdavis36 committed Jul 13, 2020
    Configuration menu
    Copy the full SHA
    1c9f650 View commit details
    Browse the repository at this point in the history

Commits on Aug 4, 2020

  1. Merge branch 'develop' into feature/device-context-integration

    Conflicts:
    	src/chai/ArrayManager.cpp
    mdavis36 committed Aug 4, 2020
    Configuration menu
    Copy the full SHA
    6373598 View commit details
    Browse the repository at this point in the history

Commits on Aug 6, 2020

  1. Configuration menu
    Copy the full SHA
    1914a31 View commit details
    Browse the repository at this point in the history
  2. Pointing Umpire to v3.0.0.

    mdavis36 committed Aug 6, 2020
    Configuration menu
    Copy the full SHA
    1385bdd View commit details
    Browse the repository at this point in the history

Commits on Aug 7, 2020

  1. Configuration menu
    Copy the full SHA
    5e11b4d View commit details
    Browse the repository at this point in the history
  2. Removing include vector.

    mdavis36 authored Aug 7, 2020
    Configuration menu
    Copy the full SHA
    99c74d0 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    44a04a4 View commit details
    Browse the repository at this point in the history

Commits on Aug 11, 2020

  1. Configuration menu
    Copy the full SHA
    71f8c45 View commit details
    Browse the repository at this point in the history

Commits on Sep 1, 2020

  1. Configuration menu
    Copy the full SHA
    bd3f511 View commit details
    Browse the repository at this point in the history

Commits on Sep 22, 2020

  1. Merge branch 'feature/device-context-integration' into feature/multi-…

    …recource-per-array
    
    Conflicts:
    	examples/resource-multi-array.cpp
    	src/chai/ArrayManager.cpp
    	src/chai/PointerRecord.hpp
    mdavis36 committed Sep 22, 2020
    Configuration menu
    Copy the full SHA
    6270fa4 View commit details
    Browse the repository at this point in the history
  2. Merge branch 'develop' into feature/device-context-integration

    Conflicts:
    	src/chai/ManagedArray.hpp
    	src/chai/ManagedArray.inl
    	tests/integration/managed_array_tests.cpp
    mdavis36 committed Sep 22, 2020
    Configuration menu
    Copy the full SHA
    ecd991f View commit details
    Browse the repository at this point in the history
  3. Merge pull request #93 from LLNL/feature/multi-recource-per-array

    Feature/multi resource per array
    davidbeckingsale authored Sep 22, 2020
    Configuration menu
    Copy the full SHA
    bc99917 View commit details
    Browse the repository at this point in the history

Commits on Nov 23, 2021

  1. merging submodules etc

    Kristi Belcher committed Nov 23, 2021
    Configuration menu
    Copy the full SHA
    db37733 View commit details
    Browse the repository at this point in the history

Commits on Dec 9, 2021

  1. Configuration menu
    Copy the full SHA
    d66b267 View commit details
    Browse the repository at this point in the history

Commits on Dec 14, 2021

  1. Configuration menu
    Copy the full SHA
    6f3cf8b View commit details
    Browse the repository at this point in the history
  2. Merge branch 'feature/device-context-integration' of https://github.c…

    …om/LLNL/CHAI into feature/device-context-integration
    kab163 committed Dec 14, 2021
    Configuration menu
    Copy the full SHA
    0a34106 View commit details
    Browse the repository at this point in the history
  3. changing version of camp in CI

    kab163 committed Dec 14, 2021
    Configuration menu
    Copy the full SHA
    8246998 View commit details
    Browse the repository at this point in the history

Commits on Dec 15, 2021

  1. trying to fix camp in CI...

    kab163 committed Dec 15, 2021
    Configuration menu
    Copy the full SHA
    e001520 View commit details
    Browse the repository at this point in the history
  2. updating from develop

    kab163 committed Dec 15, 2021
    Configuration menu
    Copy the full SHA
    c3b06bb View commit details
    Browse the repository at this point in the history

Commits on Dec 16, 2021

  1. Configuration menu
    Copy the full SHA
    0f4cea7 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    103d537 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    2188b12 View commit details
    Browse the repository at this point in the history

Commits on Jul 5, 2022

  1. resolving conflicts to merge

    kab163 committed Jul 5, 2022
    Configuration menu
    Copy the full SHA
    ac7167d View commit details
    Browse the repository at this point in the history

Commits on Nov 17, 2022

  1. Configuration menu
    Copy the full SHA
    d53c05f View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    54c1f1e View commit details
    Browse the repository at this point in the history
  3. Stylistic fixes

    adayton1 committed Nov 17, 2022
    Configuration menu
    Copy the full SHA
    cb5d1e3 View commit details
    Browse the repository at this point in the history
  4. Clean up in unit tests

    adayton1 committed Nov 17, 2022
    Configuration menu
    Copy the full SHA
    74a4117 View commit details
    Browse the repository at this point in the history
  5. Document parameter

    adayton1 committed Nov 17, 2022
    Configuration menu
    Copy the full SHA
    60d254d View commit details
    Browse the repository at this point in the history

Commits on Nov 29, 2022

  1. Fix GPU simulation mode

    adayton1 committed Nov 29, 2022
    Configuration menu
    Copy the full SHA
    0a0c745 View commit details
    Browse the repository at this point in the history

Commits on Mar 29, 2023

  1. Configuration menu
    Copy the full SHA
    13c4e2f View commit details
    Browse the repository at this point in the history

Commits on Apr 14, 2023

  1. Configuration menu
    Copy the full SHA
    cf9a306 View commit details
    Browse the repository at this point in the history
  2. Update to RAJA 2022.10.5

    adayton1 committed Apr 14, 2023
    Configuration menu
    Copy the full SHA
    cc1eee7 View commit details
    Browse the repository at this point in the history
  3. Fix typo

    adayton1 committed Apr 14, 2023
    Configuration menu
    Copy the full SHA
    2bebbf7 View commit details
    Browse the repository at this point in the history
  4. More strict checking

    adayton1 committed Apr 14, 2023
    Configuration menu
    Copy the full SHA
    897f763 View commit details
    Browse the repository at this point in the history
  5. Use default constructor

    adayton1 committed Apr 14, 2023
    Configuration menu
    Copy the full SHA
    2a99083 View commit details
    Browse the repository at this point in the history
  6. Reduce duplicate code

    adayton1 committed Apr 14, 2023
    Configuration menu
    Copy the full SHA
    cd5e8a5 View commit details
    Browse the repository at this point in the history
  7. Documentation and clean up

    adayton1 committed Apr 14, 2023
    Configuration menu
    Copy the full SHA
    3aad2cd View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    79174e2 View commit details
    Browse the repository at this point in the history
  9. Document more functions

    adayton1 committed Apr 14, 2023
    Configuration menu
    Copy the full SHA
    7b0f907 View commit details
    Browse the repository at this point in the history
  10. More clean up

    adayton1 committed Apr 14, 2023
    Configuration menu
    Copy the full SHA
    e606ad7 View commit details
    Browse the repository at this point in the history
  11. More strict checking

    adayton1 committed Apr 14, 2023
    Configuration menu
    Copy the full SHA
    7691033 View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    69a5890 View commit details
    Browse the repository at this point in the history
  13. Remove unnecessary include

    adayton1 committed Apr 14, 2023
    Configuration menu
    Copy the full SHA
    5b7e9df View commit details
    Browse the repository at this point in the history
  14. Clean up

    adayton1 committed Apr 14, 2023
    Configuration menu
    Copy the full SHA
    17478ef View commit details
    Browse the repository at this point in the history
  15. Reuse move implementation

    adayton1 committed Apr 14, 2023
    Configuration menu
    Copy the full SHA
    131654f View commit details
    Browse the repository at this point in the history
  16. Clean up

    adayton1 committed Apr 14, 2023
    Configuration menu
    Copy the full SHA
    4844238 View commit details
    Browse the repository at this point in the history
  17. Clean up move function

    adayton1 committed Apr 14, 2023
    Configuration menu
    Copy the full SHA
    8f4d31a View commit details
    Browse the repository at this point in the history
  18. Clean up

    adayton1 committed Apr 14, 2023
    Configuration menu
    Copy the full SHA
    1b1c735 View commit details
    Browse the repository at this point in the history
  19. Configuration menu
    Copy the full SHA
    e071ca4 View commit details
    Browse the repository at this point in the history

Commits on Apr 24, 2023

  1. Configuration menu
    Copy the full SHA
    87957a5 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    1303255 View commit details
    Browse the repository at this point in the history
  3. Add tests back in

    adayton1 committed Apr 24, 2023
    Configuration menu
    Copy the full SHA
    a24145a View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    67b279d View commit details
    Browse the repository at this point in the history