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.

Sign up for GitHub

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

Make small modifications to prototypes/kokkos_poisson #1244

Merged
merged 1 commit into from
Aug 16, 2024
Merged

Make small modifications to prototypes/kokkos_poisson #1244

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 22 additions & 25 deletions prototypes/kokkos_poisson/kokkos_poisson.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@
#include <deal.II/lac/precondition.h>
#include <deal.II/lac/solver_cg.h>

#include <deal.II/matrix_free/cuda_fe_evaluation.h>
#include <deal.II/matrix_free/cuda_matrix_free.h>
#include <deal.II/matrix_free/fe_evaluation.h>
#include <deal.II/matrix_free/matrix_free.h>
#include <deal.II/matrix_free/portable_fe_evaluation.h>
#include <deal.II/matrix_free/portable_matrix_free.h>

#include <deal.II/numerics/data_out.h>
#include <deal.II/numerics/vector_tools.h>
Expand Down Expand Up @@ -116,12 +116,12 @@ class LaplaceOperatorQuad
{
public:
DEAL_II_HOST_DEVICE void
operator()(CUDAWrappers::
FEEvaluation<dim, fe_degree, fe_degree + 1, n_components, Number>
*fe_eval,
const int q_point) const
operator()(
Portable::FEEvaluation<dim, fe_degree, fe_degree + 1, n_components, Number>
*phi,
const int q_point) const
{
fe_eval->submit_gradient(fe_eval->get_gradient(q_point), q_point);
phi->submit_gradient(phi->get_gradient(q_point), q_point);
}
};

Expand All @@ -130,25 +130,23 @@ class LaplaceOperatorLocal
{
public:
DEAL_II_HOST_DEVICE void
operator()(
const unsigned int cell,
const typename CUDAWrappers::MatrixFree<dim, Number>::Data *gpu_data,
CUDAWrappers::SharedData<dim, Number> *shared_data,
const Number *src,
Number *dst) const
operator()(const unsigned int cell,
const typename Portable::MatrixFree<dim, Number>::Data *gpu_data,
Portable::SharedData<dim, Number> *shared_data,
const Number *src,
Number *dst) const
{
(void)cell; // TODO?

CUDAWrappers::
FEEvaluation<dim, fe_degree, fe_degree + 1, n_components, Number>
fe_eval(
/*cell,*/ gpu_data, shared_data);
fe_eval.read_dof_values(src);
fe_eval.evaluate(false, true);
fe_eval.apply_for_each_quad_point(
Portable::FEEvaluation<dim, fe_degree, fe_degree + 1, n_components, Number>
phi(
/*cell,*/ gpu_data, shared_data);
phi.read_dof_values(src);
phi.evaluate(false, true);
phi.apply_for_each_quad_point(
LaplaceOperatorQuad<dim, fe_degree, n_components, Number>());
fe_eval.integrate(false, true);
fe_eval.distribute_local_to_global(dst);
phi.integrate(false, true);
phi.distribute_local_to_global(dst);
}
static const unsigned int n_dofs_1d = fe_degree + 1;
static const unsigned int n_local_dofs = Utilities::pow(fe_degree + 1, dim);
Expand All @@ -174,8 +172,7 @@ class LaplaceOperator<dim,
const AffineConstraints<Number> &constraints,
const Quadrature<1> &quadrature)
{
typename CUDAWrappers::MatrixFree<dim, Number>::AdditionalData
additional_data;
typename Portable::MatrixFree<dim, Number>::AdditionalData additional_data;
additional_data.mapping_update_flags = update_JxW_values | update_gradients;

matrix_free.reinit(
Expand All @@ -198,7 +195,7 @@ class LaplaceOperator<dim,
}

private:
CUDAWrappers::MatrixFree<dim, Number> matrix_free;
Portable::MatrixFree<dim, Number> matrix_free;
};


Expand Down
Loading