Fix the conflicts happened in the merge of csr-interface-dev and develop#428
Closed
nychiang wants to merge 8 commits intocsr-interface-devfrom
Closed
Fix the conflicts happened in the merge of csr-interface-dev and develop#428nychiang wants to merge 8 commits intocsr-interface-devfrom
nychiang wants to merge 8 commits intocsr-interface-devfrom
Conversation
add sparse examples Co-authored-by: Chiang <chiang7@sephiroth.llnl.gov>
* update MAGMA solver to use new version of magma * Fix lambda capture for pridec ex9 (#400) * Fix lambda captures in pridec ex9 * change cmakelist * Resolve warnings and HIP targets * Correct spock variables script * Update environment modules * Increase time limit, make incline job optional * Add missing modules for ascent CI * Style guide fixes, only std::abs outside RAJA * Fix lambda decls and include limits * Fix calls to abs and fabs Co-authored-by: Nai-Yuan Chiang <chiang7@llnl.gov>
Co-authored-by: Chiang <chiang7@sephiroth.llnl.gov>
* Add interface to cuSolver/KLU linear solver * Fixed warnings, removed double delete guards. Co-authored-by: Katarzyna Swirydowicz <swir617@newell01.pnl.gov> Co-authored-by: Chiang <chiang7@sephiroth.llnl.gov>
Collaborator
|
closing this since I've done the merging manually to better track changes |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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 PR fixes some conflicts introduced between
csr-interface-devanddevelop.The idea is to merge this PR to
csr-interface-devfirst, and latercsr-interface-devcan be merged withdevelopwithout any problem.