Extract and use get_gpu() (kokkos/kokkos#3040, trilinos/Trilinos#6840) #3061
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This fixes the tests KokkosCore_UnitTest_DefaultInit_<x>_MPI_1 that fail when running with ctest GPU allocation feature that fail becuase they don't run on GPU device 0 (see kokkos#3040). Note: Since get_ctest_gpu() returns 0 if CTest has not provided anything, it is safe to always call it. This new function get_gpu() should really be unit tested on its own.
…s#3040, trilinos/Trilinos#6840) This seems to also fix the KokkosCore_UnitTest_DefaultInit_<x>_MPI_1 tests that where failing when running with ctest GPU allocation feature that fail because they don't run on GPU device 0 (see kokkos#3040).
|
Can one of the admins verify this patch? |
Codecov Report
@@ Coverage Diff @@
## develop #3061 +/- ##
=========================================
- Coverage 82.6% 82.4% -0.3%
=========================================
Files 122 122
Lines 8074 8095 +21
=========================================
- Hits 6674 6673 -1
- Misses 1400 1422 +22
Continue to review full report at Codecov.
|
crtrott
approved these changes
May 24, 2020
masterleinad
approved these changes
May 27, 2020
|
OK to test |
|
Retest this please. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is the matching PR for the develop branch that got accidentally merged to the 'master' branch in PR #3048 to address #3040 . (Somehow the branch in PR #3048 got rebased on top of 'master' so it can't be directly merged to 'develop'. Actually, it could but it depends on how the Kokkos release process works if that is okay or not.)
In any case, these should be identical pathes to the commits 5d085fd..7c0f967 so it should not be problem when merging 'develop' into 'master'. (In fact, I just tried it locally and the merge from this branch into 'master' went just fine.)
We will see these three commits having two copies each but those are the breaks at this point.
WARNING: If this PR is not merged, then changes to these files on 'develop' may cause merge conflicts when merging from 'develop' to 'master'. These commits in this branch ensure that will not be a problem.