Skip to content

Commit

Permalink
Update to use Kokkos MDRangePolicy instead of RangePolicy.
Browse files Browse the repository at this point in the history
  • Loading branch information
@pkestene
pkestene committed Aug 7, 2023
1 parent 4a95443 commit 0780d5b
Showing 1 changed file with 44 additions and 59 deletions.
103 changes: 44 additions & 59 deletions src/HydroRunFunctors.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,27 +21,26 @@ class ComputeDtFunctor : public HydroBaseFunctor
static void
apply(HydroParams params, DataArray Udata, real_t & invDt)
{
const int ijsize = params.isize * params.jsize;
ComputeDtFunctor computeDtFunctor(params, Udata);
Kokkos::Max<real_t> reducer(invDt);
Kokkos::parallel_reduce(
"Computedt", Kokkos::RangePolicy<>(0, ijsize), computeDtFunctor, reducer);
"Computedt",
Kokkos::MDRangePolicy<Kokkos::Rank<2>>({ 0, 0 }, { params.isize, params.jsize }),
computeDtFunctor,
reducer);
}

/* this is a reduce (max) functor */
KOKKOS_INLINE_FUNCTION
void
operator()(const int & index, real_t & invDt) const
operator()(const int & i, const int & j, real_t & invDt) const
{
const int isize = params.isize;
const int jsize = params.jsize;
const int ghostWidth = params.ghostWidth;
const real_t dx = params.dx;
const real_t dy = params.dy;

int i, j;
index2coord(index, i, j, isize, jsize);

if (j >= ghostWidth && j < jsize - ghostWidth && i >= ghostWidth && i < isize - ghostWidth)
{

Expand Down Expand Up @@ -86,23 +85,21 @@ class ConvertToPrimitivesFunctor : public HydroBaseFunctor
static void
apply(HydroParams params, DataArray Udata, DataArray Qdata)
{
const int ijsize = params.isize * params.jsize;
ConvertToPrimitivesFunctor convertToPrimitivesFunctor(params, Udata, Qdata);
Kokkos::parallel_for(
"ConvertToPrimitives", Kokkos::RangePolicy<>(0, ijsize), convertToPrimitivesFunctor);
"ConvertToPrimitives",
Kokkos::MDRangePolicy<Kokkos::Rank<2>>({ 0, 0 }, { params.isize, params.jsize }),
convertToPrimitivesFunctor);
}

KOKKOS_INLINE_FUNCTION
void
operator()(const int & index) const
operator()(const int & i, const int & j) const
{
const int isize = params.isize;
const int jsize = params.jsize;
// const int ghostWidth = params.ghostWidth;

int i, j;
index2coord(index, i, j, isize, jsize);

if (j >= 0 && j < jsize && i >= 0 && i < isize)
{

Expand Down Expand Up @@ -424,22 +421,21 @@ class ComputeAndStoreFluxesFunctor : public HydroBaseFunctor
real_t dtdx,
real_t dtdy)
{
const int ijsize = params.isize * params.jsize;
ComputeAndStoreFluxesFunctor functor(params, Qdata, FluxData_x, FluxData_y, dtdx, dtdy);
Kokkos::parallel_for("ComputeAndStoreFluxes", Kokkos::RangePolicy<>(0, ijsize), functor);
Kokkos::parallel_for(
"ComputeAndStoreFluxes",
Kokkos::MDRangePolicy<Kokkos::Rank<2>>({ 0, 0 }, { params.isize, params.jsize }),
functor);
}

KOKKOS_INLINE_FUNCTION
void
operator()(const int & index) const
operator()(const int & i, const int & j) const
{
const int isize = params.isize;
const int jsize = params.jsize;
const int ghostWidth = params.ghostWidth;

int i, j;
index2coord(index, i, j, isize, jsize);

if (j >= ghostWidth && j <= jsize - ghostWidth && i >= ghostWidth && i <= isize - ghostWidth)
{

Expand Down Expand Up @@ -646,22 +642,21 @@ class UpdateFunctor : public HydroBaseFunctor
static void
apply(HydroParams params, DataArray Udata, DataArray FluxData_x, DataArray FluxData_y)
{
const int ijsize = params.isize * params.jsize;
UpdateFunctor functor(params, Udata, FluxData_x, FluxData_y);
Kokkos::parallel_for("UpdateFunctor", Kokkos::RangePolicy<>(0, ijsize), functor);
Kokkos::parallel_for(
"UpdateFunctor",
Kokkos::MDRangePolicy<Kokkos::Rank<2>>({ 0, 0 }, { params.isize, params.jsize }),
functor);
}

KOKKOS_INLINE_FUNCTION
void
operator()(const int & index) const
operator()(const int & i, const int & j) const
{
const int isize = params.isize;
const int jsize = params.jsize;
const int ghostWidth = params.ghostWidth;

int i, j;
index2coord(index, i, j, isize, jsize);

if (j >= ghostWidth && j < jsize - ghostWidth && i >= ghostWidth && i < isize - ghostWidth)
{

Expand Down Expand Up @@ -713,22 +708,21 @@ class UpdateDirFunctor : public HydroBaseFunctor
static void
apply(HydroParams params, DataArray Udata, DataArray FluxData)
{
const int ijsize = params.isize * params.jsize;
UpdateDirFunctor<dir> functor(params, Udata, FluxData);
Kokkos::parallel_for("UpdateDir", Kokkos::RangePolicy<>(0, ijsize), functor);
Kokkos::parallel_for(
"UpdateDir",
Kokkos::MDRangePolicy<Kokkos::Rank<2>>({ 0, 0 }, { params.isize, params.jsize }),
functor);
}

KOKKOS_INLINE_FUNCTION
void
operator()(const int & index) const
operator()(const int & i, const int & j) const
{
const int isize = params.isize;
const int jsize = params.jsize;
const int ghostWidth = params.ghostWidth;

int i, j;
index2coord(index, i, j, isize, jsize);

if (j >= ghostWidth && j < jsize - ghostWidth && i >= ghostWidth && i < isize - ghostWidth)
{

Expand Down Expand Up @@ -786,22 +780,21 @@ class ComputeSlopesFunctor : public HydroBaseFunctor
static void
apply(HydroParams params, DataArray Qdata, DataArray Slopes_x, DataArray Slopes_y)
{
const int ijsize = params.isize * params.jsize;
ComputeSlopesFunctor functor(params, Qdata, Slopes_x, Slopes_y);
Kokkos::parallel_for("ComputeSlopes", Kokkos::RangePolicy<>(0, ijsize), functor);
Kokkos::parallel_for(
"ComputeSlopes",
Kokkos::MDRangePolicy<Kokkos::Rank<2>>({ 0, 0 }, { params.isize, params.jsize }),
functor);
}

KOKKOS_INLINE_FUNCTION
void
operator()(const int & index) const
operator()(const int & i, const int & j) const
{
const int isize = params.isize;
const int jsize = params.jsize;
const int ghostWidth = params.ghostWidth;

int i, j;
index2coord(index, i, j, isize, jsize);

if (j >= ghostWidth - 1 && j <= jsize - ghostWidth && i >= ghostWidth - 1 &&
i <= isize - ghostWidth)
{
Expand Down Expand Up @@ -902,23 +895,22 @@ class ComputeTraceAndFluxes_Functor : public HydroBaseFunctor
real_t dtdx,
real_t dtdy)
{
const int ijsize = params.isize * params.jsize;
ComputeTraceAndFluxes_Functor<dir> functor(
params, Qdata, Slopes_x, Slopes_y, Fluxes, dtdx, dtdy);
Kokkos::parallel_for("ComputeTraceAndFluxes", Kokkos::RangePolicy<>(0, ijsize), functor);
Kokkos::parallel_for(
"ComputeTraceAndFluxes",
Kokkos::MDRangePolicy<Kokkos::Rank<2>>({ 0, 0 }, { params.isize, params.jsize }),
functor);
}

KOKKOS_INLINE_FUNCTION
void
operator()(const int & index) const
operator()(const int & i, const int & j) const
{
const int isize = params.isize;
const int jsize = params.jsize;
const int ghostWidth = params.ghostWidth;

int i, j;
index2coord(index, i, j, isize, jsize);

if (j >= ghostWidth && j <= jsize - ghostWidth && i >= ghostWidth && i <= isize - ghostWidth)
{

Expand Down Expand Up @@ -1062,18 +1054,18 @@ class InitImplodeFunctor : public HydroBaseFunctor
static void
apply(HydroParams params, DataArray Udata)
{
const int ijsize = params.isize * params.jsize;
InitImplodeFunctor functor(params, Udata);
Kokkos::parallel_for("InitImplode", Kokkos::RangePolicy<>(0, ijsize), functor);
Kokkos::parallel_for(
"InitImplode",
Kokkos::MDRangePolicy<Kokkos::Rank<2>>({ 0, 0 }, { params.isize, params.jsize }),
functor);
}

KOKKOS_INLINE_FUNCTION
void
operator()(const int & index) const
operator()(const int & i, const int & j) const
{

const int isize = params.isize;
const int jsize = params.jsize;
const int ghostWidth = params.ghostWidth;

const real_t xmin = params.xmin;
Expand All @@ -1083,9 +1075,6 @@ class InitImplodeFunctor : public HydroBaseFunctor

const real_t gamma0 = params.settings.gamma0;

int i, j;
index2coord(index, i, j, isize, jsize);

real_t x = xmin + dx / 2 + (i - ghostWidth) * dx;
real_t y = ymin + dy / 2 + (j - ghostWidth) * dy;

Expand Down Expand Up @@ -1126,18 +1115,18 @@ class InitBlastFunctor : public HydroBaseFunctor
static void
apply(HydroParams params, DataArray Udata)
{
const int ijsize = params.isize * params.jsize;
InitBlastFunctor functor(params, Udata);
Kokkos::parallel_for("InitBlast", Kokkos::RangePolicy<>(0, ijsize), functor);
Kokkos::parallel_for(
"InitBlast",
Kokkos::MDRangePolicy<Kokkos::Rank<2>>({ 0, 0 }, { params.isize, params.jsize }),
functor);
}

KOKKOS_INLINE_FUNCTION
void
operator()(const int & index) const
operator()(const int & i, const int & j) const
{

const int isize = params.isize;
const int jsize = params.jsize;
const int ghostWidth = params.ghostWidth;

const real_t xmin = params.xmin;
Expand All @@ -1157,10 +1146,6 @@ class InitBlastFunctor : public HydroBaseFunctor
const real_t blast_pressure_in = params.blast_pressure_in;
const real_t blast_pressure_out = params.blast_pressure_out;


int i, j;
index2coord(index, i, j, isize, jsize);

real_t x = xmin + dx / 2 + (i - ghostWidth) * dx;
real_t y = ymin + dy / 2 + (j - ghostWidth) * dy;

Expand Down

0 comments on commit 0780d5b

Please sign in to comment.