merge upstream sandialabs (attempt 2) #34
Merged
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
…well
It fixes build issues with clang 11:
123 In file included from /Users/tristan/src/github.com/BlueBrain/omega_h/src/Omega_h_expr.cpp:4:
>> 124 /Users/tristan/src/github.com/BlueBrain/omega_h/src/Omega_h_expr.hpp:52:34: error: class with destruct
or marked 'final' cannot be inherited from [-Werror,-Wfinal-dtor-non-final-class]
125 virtual ~ExprReader() override final;
126 ^
127 /Users/tristan/src/github.com/BlueBrain/omega_h/src/Omega_h_expr.hpp:47:7: note: mark 'Omega_h::ExprRe
ader' as 'final' to silence this warning
128 class ExprReader : public Reader {
Minor fix: renamed kokkos target
otherwise _Pragma is parsed as something very different... a function declaration
We require users to install HDF5 with CMake, this forces the system to ignore FindHDF5.cmake
this is needed when compiler wrappers are not being used
…ires -rdynamic to be added to link line
make ptr types const to enforce COW semantics
The form barycentric function assumes that the basis from simplex_basis is giving the xi_0 and xi_1 coordinates, but in reality, it is giving the xi_1, and xi_2 coordinates. Thus the resulting coordinates from form_barycentric are rotated.
Currently the field test is working still an issue with parallel version
The rc tags are stored in a new vector of tags. They are converted to "mesh format" and stored in the tags vector as needed for the various adaption processes.
Shouldn't have included c++ features in the original fixes. It ended up causing issues with gcc 7.5.0 and we aren't ready to bump standard version yet.
The original attempt at mergeing sandialabs omega_h failed to bring over the git commit history. However, I had made some important changes to the rc_fields on top of that merge. To bring over the new changes I cherry-picked the commits, but there were a few mistakes that came with the chery-pick results. This commit fixes up all of those issues so that the build compiles and all tests pass.
|
@joshia5 please take a look at this when you get a chance. I fixed the git history issue. All tests are passing on CI and in parallel on my local system. |
joshia5
approved these changes
May 28, 2022
|
@jacobmerson looks good. I think this about covers all that we discussed earlier, merging in now.. |
joshia5
added
update from upstream
tags
|
@joshia5 thanks! |
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.
Somehow my original attempt to merge the upstream Omega_h library in #33 lost the git commit history from sandialabs/Omega_h. I have remerged with sandialabs and all of the commit history is now here. The changes required for the rc_fields to pass the tests after the merge are also included.