-
Notifications
You must be signed in to change notification settings - Fork 708
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
Matrixfree evaluation with FE_RaviartThomasNodal
#13591
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
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 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
1,332 changes: 1,312 additions & 20 deletions
1,332
include/deal.II/matrix_free/evaluation_kernels.h
Large diffs are not rendered by default.
Oops, something went wrong.
125 changes: 125 additions & 0 deletions
125
include/deal.II/matrix_free/evaluation_template_face_factory.templates.h
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,125 @@ | ||
| // --------------------------------------------------------------------- | ||
| // | ||
| // Copyright (C) 2022 by the deal.II authors | ||
| // | ||
| // This file is part of the deal.II library. | ||
| // | ||
| // The deal.II library is free software; you can use it, redistribute | ||
| // it, and/or modify it under the terms of the GNU Lesser General | ||
| // Public License as published by the Free Software Foundation; either | ||
| // version 2.1 of the License, or (at your option) any later version. | ||
| // The full text of the license can be found in the file LICENSE.md at | ||
| // the top level directory of deal.II. | ||
| // | ||
| // --------------------------------------------------------------------- | ||
|
|
||
|
|
||
| #ifndef dealii_matrix_free_evaluation_template_factory_templates_h | ||
| #define dealii_matrix_free_evaluation_template_factory_templates_h | ||
|
|
||
|
|
||
| #include <deal.II/base/config.h> | ||
|
|
||
| #include <deal.II/matrix_free/evaluation_kernels.h> | ||
| #include <deal.II/matrix_free/evaluation_selector.h> | ||
| #include <deal.II/matrix_free/evaluation_template_factory.h> | ||
| #include <deal.II/matrix_free/evaluation_template_factory_internal.h> | ||
|
|
||
| DEAL_II_NAMESPACE_OPEN | ||
|
|
||
| namespace internal | ||
| { | ||
| template <int dim, typename Number> | ||
| void | ||
| FEFaceEvaluationFactory<dim, Number>::evaluate( | ||
| const unsigned int n_components, | ||
| const EvaluationFlags::EvaluationFlags evaluation_flag, | ||
| const Number * values_dofs, | ||
| FEEvaluationData<dim, Number, true> & fe_eval) | ||
| { | ||
| instantiation_helper_run<1, | ||
| FEFaceEvaluationImplEvaluateSelector<dim, Number>>( | ||
| fe_eval.get_shape_info().data[0].fe_degree, | ||
| fe_eval.get_shape_info().data[0].n_q_points_1d, | ||
| n_components, | ||
| evaluation_flag, | ||
| values_dofs, | ||
| fe_eval); | ||
| } | ||
|
|
||
|
|
||
|
|
||
| template <int dim, typename Number> | ||
| void | ||
| FEFaceEvaluationFactory<dim, Number>::integrate( | ||
| const unsigned int n_components, | ||
| const EvaluationFlags::EvaluationFlags integration_flag, | ||
| Number * values_dofs, | ||
| FEEvaluationData<dim, Number, true> & fe_eval) | ||
| { | ||
| instantiation_helper_run< | ||
| 1, | ||
| FEFaceEvaluationImplIntegrateSelector<dim, Number>>( | ||
| fe_eval.get_shape_info().data[0].fe_degree, | ||
| fe_eval.get_shape_info().data[0].n_q_points_1d, | ||
| n_components, | ||
| integration_flag, | ||
| values_dofs, | ||
| fe_eval); | ||
| } | ||
|
|
||
|
|
||
|
|
||
| template <int dim, typename Number, typename VectorizedArrayType> | ||
| void | ||
| FEFaceEvaluationGatherFactory<dim, Number, VectorizedArrayType>::evaluate( | ||
| const unsigned int n_components, | ||
| const EvaluationFlags::EvaluationFlags evaluation_flag, | ||
| const Number * src_ptr, | ||
| const std::vector<ArrayView<const Number>> * sm_ptr, | ||
| FEEvaluationData<dim, VectorizedArrayType, true> &fe_eval) | ||
| { | ||
| instantiation_helper_run< | ||
| 1, | ||
| FEFaceEvaluationImplGatherEvaluateSelector<dim, | ||
| Number, | ||
| VectorizedArrayType>>( | ||
| fe_eval.get_shape_info().data[0].fe_degree, | ||
| fe_eval.get_shape_info().data[0].n_q_points_1d, | ||
| n_components, | ||
| evaluation_flag, | ||
| src_ptr, | ||
| sm_ptr, | ||
| fe_eval); | ||
| } | ||
|
|
||
|
|
||
|
|
||
| template <int dim, typename Number, typename VectorizedArrayType> | ||
| void | ||
| FEFaceEvaluationGatherFactory<dim, Number, VectorizedArrayType>::integrate( | ||
| const unsigned int n_components, | ||
| const EvaluationFlags::EvaluationFlags integration_flag, | ||
| Number * dst_ptr, | ||
| const std::vector<ArrayView<const Number>> * sm_ptr, | ||
| FEEvaluationData<dim, VectorizedArrayType, true> &fe_eval) | ||
| { | ||
| instantiation_helper_run< | ||
| 1, | ||
| FEFaceEvaluationImplIntegrateScatterSelector<dim, | ||
| Number, | ||
| VectorizedArrayType>>( | ||
| fe_eval.get_shape_info().data[0].fe_degree, | ||
| fe_eval.get_shape_info().data[0].n_q_points_1d, | ||
| n_components, | ||
| integration_flag, | ||
| dst_ptr, | ||
| sm_ptr, | ||
| fe_eval); | ||
| } | ||
|
|
||
| } // end of namespace internal | ||
|
|
||
| DEAL_II_NAMESPACE_CLOSE | ||
|
|
||
| #endif |
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 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 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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is it so simple to define a C macro? It it wouldn't work just override manually the value of
dealii/include/deal.II/matrix_free/evaluation_template_factory_internal.h
Line 24 in 0a36820
... and we find a solution after we have seen what the benefits are!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
OK. It worked (now I see that you are directly modify the CXX flags)! I'll take another look at the code later today!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It was Martin, just to be clear! I shouldn't take credit here :)
I'll prepare the PR of the Piola for the affine case right away.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Of course, it's still a temporary solution since there will be a point where we will hit this with something else, but for all those build tests building a rather minimal degree should be more than enough, no need to waste disk space and compile time on it. We should probably choose something similar for the MacOS and Linux builds that are done through github's infrastructure.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@kronbichler Why aren't we do it like this in ExaDG? We also have somewhere the possibility if fast evaluation is enabled or not...
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
One could do that as well - the reason why I opted against it up to now was that deal.II compiles considerably more code than ExaDG does, as it repeats the instantiations also for narrower SIMD (ExaDG picks only the widest version), and that makes deal.II libraries considerably fatter. The other question is whether ExaDG really needs all instantiations up to 15 with the fast path, or whether 7 or 8 would suffice and then use the slower path afterwards.