Skip to content

support Cabana backend #48

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

Merged
cwsmith merged 22 commits into from
Mar 30, 2025
Merged

support Cabana backend #48

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
fc073ac
put cabana controller OmegahElement test
Jan 29, 2025
666b17b
[skip ci] Added cabana controller to shape field
Feb 3, 2025
286972c
[skip ci] fixed last commit
Feb 3, 2025
289148d
added cabana controller initalizations where needed in shape field. …
Feb 4, 2025
ddd3b79
completed adding cabana tests. Adjusted ordering.
Feb 19, 2025
a243d04
reverted previous change
Feb 19, 2025
483f39b
[skip ci] Returning correct instantiation using the Cabana Controller
Feb 19, 2025
6741769
completed final formatting and revisions
Feb 20, 2025
5b4a046
added explanation for baseType struct
Feb 26, 2025
fd21bd1
Documented change to indexing
Feb 26, 2025
526a287
Changed Cabana controller to create an aosoa for each datatype
Mar 19, 2025
32a8446
adjusted size testing to also test different tuple sizes for each dat…
Mar 19, 2025
91f9736
adjusted other tests to also deal with different tuple sizes
Mar 19, 2025
58742ae
attempt CI fix
Mar 19, 2025
1f1f642
clang format
Mar 19, 2025
fa6da3d
ci fix
Mar 19, 2025
3a4d17b
fixing test for ci
Mar 19, 2025
ef6b98d
removed commented code
Mar 24, 2025
b291111
adjusted tests to be a function for both controllers
Mar 28, 2025
411195c
Removed extra helper function
Mar 28, 2025
e558402
Removed helper functions added template to calls
Mar 28, 2025
42858aa
Changed function to pass by reference
Mar 28, 2025
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
4 changes: 2 additions & 2 deletions src/MeshField.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ createCoordinateField(MeshField::MeshInfo mesh_info, Omega_h::Reals coords) {
auto coordField =
MeshField::CreateCoordinateField<ExecutionSpace, Controller>(mesh_info);
auto setCoordField = KOKKOS_LAMBDA(const int &i) {
coordField(0, 0, i, MeshField::Vertex) = coords[i * meshDim];
coordField(0, 1, i, MeshField::Vertex) = coords[i * meshDim + 1];
coordField(i, 0, 0, MeshField::Vertex) = coords[i * meshDim];
coordField(i, 0, 1, MeshField::Vertex) = coords[i * meshDim + 1];
};
MeshField::parallel_for(ExecutionSpace(), {0}, {mesh_info.numVtx},
setCoordField, "setCoordField");
Expand Down
14 changes: 10 additions & 4 deletions src/MeshField_Element.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,15 @@ struct FieldElement {
const ElementDofHolderAccessor elm2dofIn)
: numMeshEnts(numMeshEntsIn), field(fieldIn), shapeFn(shapeFnIn),
elm2dof(elm2dofIn) {}

using ValArray = Kokkos::Array<typename FieldAccessor::BaseType,
ShapeType::numComponentsPerDof>;
template <typename T> struct baseType {
using type = T;
};
template <typename T, size_t N> struct baseType<T[N]> {
using type = typename baseType<T>::type;
};
using ValArray =
Kokkos::Array<typename baseType<typename FieldAccessor::BaseType>::type,
ShapeType::numComponentsPerDof>;
static const size_t NumComponents = ShapeType::numComponentsPerDof;

/**
Expand Down Expand Up @@ -91,7 +97,7 @@ struct FieldElement {
for (int ci = 0; ci < shapeFn.numComponentsPerDof; ++ci) {
auto map = elm2dof(ni, ci, ent, topo);
const auto fval =
field(map.node, map.component, map.entity, map.topo);
field(map.entity, map.node, map.component, map.topo);
c[ci] += fval * shapeValues[ni];
}
}
Expand Down
62 changes: 54 additions & 8 deletions src/MeshField_ShapeField.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,9 +173,24 @@ auto CreateLagrangeField(const MeshInfo &meshInfo) {
if (meshInfo.numVtx <= 0) {
fail("mesh has no vertices\n");
}
using Ctrlr = Controller<MemorySpace, ExecutionSpace, DataType ***>;
using Ctrlr = std::conditional_t<
std::is_same_v<
Controller<ExecutionSpace, MemorySpace, DataType>,
MeshField::CabanaController<ExecutionSpace, MemorySpace, DataType>>,
Controller<ExecutionSpace, MemorySpace, DataType[1][1]>,
Controller<MemorySpace, ExecutionSpace, DataType ***>>;
// 1 dof with 1 component per vtx
Ctrlr kk_ctrl({/*field 0*/ 1, 1, meshInfo.numVtx});
auto createController = [](const int numComp, auto numVtx) {
if constexpr (std::is_same_v<
Controller<ExecutionSpace, MemorySpace, DataType>,
MeshField::CabanaController<ExecutionSpace, MemorySpace,
DataType>>) {
return Ctrlr(numVtx);
} else {
return Ctrlr({/*field 0*/ numVtx, 1, numComp});
}
};
Ctrlr kk_ctrl = createController(1, meshInfo.numVtx);
auto vtxField = MeshField::makeField<Ctrlr, 0>(kk_ctrl);
using LA = LinearAccessor<decltype(vtxField)>;
using LinearLagrangeShapeField = ShapeField<Ctrlr, LinearTriangleShape, LA>;
Expand All @@ -188,11 +203,25 @@ auto CreateLagrangeField(const MeshInfo &meshInfo) {
if (meshInfo.numEdge <= 0) {
fail("mesh has no edges\n");
}
using Ctrlr =
Controller<MemorySpace, ExecutionSpace, DataType ***, DataType ***>;
using Ctrlr = std::conditional_t<
std::is_same_v<
Controller<ExecutionSpace, MemorySpace, DataType>,
MeshField::CabanaController<ExecutionSpace, MemorySpace, DataType>>,
Controller<ExecutionSpace, MemorySpace, DataType[1][1], DataType[1][1]>,
Controller<MemorySpace, ExecutionSpace, DataType ***, DataType ***>>;
// 1 dof with 1 comp per vtx/edge
Ctrlr kk_ctrl({/*field 0*/ 1, 1, meshInfo.numVtx,
/*field 1*/ 1, 1, meshInfo.numEdge});
auto createController = [](const int numComp, auto numVtx, auto numEdge) {
if constexpr (std::is_same_v<
Controller<ExecutionSpace, MemorySpace, DataType>,
MeshField::CabanaController<ExecutionSpace, MemorySpace,
DataType>>) {
return Ctrlr(std::max(numVtx, numEdge));
} else {
return Ctrlr({/*field 0*/ numVtx, 1, numComp,
/*field 1*/ numEdge, 1, numComp});
}
};
Ctrlr kk_ctrl = createController(1, meshInfo.numVtx, meshInfo.numEdge);
auto vtxField = MeshField::makeField<Ctrlr, 0>(kk_ctrl);
auto edgeField = MeshField::makeField<Ctrlr, 1>(kk_ctrl);
using QA = QuadraticAccessor<decltype(vtxField), decltype(edgeField)>;
Expand Down Expand Up @@ -224,6 +253,7 @@ auto CreateLagrangeField(const MeshInfo &meshInfo) {
* @param meshInfo defines on-process mesh metadata
* @return a linear ShapeField
*/

template <typename ExecutionSpace, template <typename...> typename Controller =
MeshField::KokkosController>
auto CreateCoordinateField(const MeshInfo &meshInfo) {
Expand All @@ -232,9 +262,25 @@ auto CreateCoordinateField(const MeshInfo &meshInfo) {
}
using DataType = Real;
using MemorySpace = typename ExecutionSpace::memory_space;
using Ctrlr = Controller<MemorySpace, ExecutionSpace, DataType ***>;
const int numComp = meshInfo.dim;
Ctrlr kk_ctrl({/*field 0*/ 1, numComp, meshInfo.numVtx});
// FIXME Oversized cabana datatypes when numComp = 1|2
using Ctrlr = std::conditional_t<
std::is_same_v<
Controller<ExecutionSpace, MemorySpace, DataType>,
MeshField::CabanaController<ExecutionSpace, MemorySpace, DataType>>,
Controller<ExecutionSpace, MemorySpace, DataType[1][3]>,
Controller<MemorySpace, ExecutionSpace, DataType ***>>;
auto createController = [](const int numComp, auto numVtx) {
if constexpr (std::is_same_v<
Controller<ExecutionSpace, MemorySpace, DataType>,
MeshField::CabanaController<ExecutionSpace, MemorySpace,
DataType>>) {
return Ctrlr(numVtx);
} else {
return Ctrlr({/*field 0*/ numVtx, 1, numComp});
}
};
Ctrlr kk_ctrl = createController(numComp, meshInfo.numVtx);
auto vtxField = MeshField::makeField<Ctrlr, 0>(kk_ctrl);
using LA = LinearAccessor<decltype(vtxField)>;
using LinearLagrangeShapeField = ShapeField<Ctrlr, LinearTriangleShape, LA>;
Expand Down
4 changes: 2 additions & 2 deletions test/testOmegahCoordField.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,8 @@ bool triangleLocalToGlobal(Omega_h::Mesh mesh) {
MeshField::CreateCoordinateField<ExecutionSpace,
MeshField::KokkosController>(meshInfo);
auto setCoordField = KOKKOS_LAMBDA(const int &i) {
coordField(0, 0, i, MeshField::Vertex) = coords[i * MeshDim];
coordField(0, 1, i, MeshField::Vertex) = coords[i * MeshDim + 1];
coordField(i, 0, 0, MeshField::Vertex) = coords[i * MeshDim];
coordField(i, 0, 1, MeshField::Vertex) = coords[i * MeshDim + 1];
};
MeshField::parallel_for(ExecutionSpace(), {0}, {meshInfo.numVtx},
setCoordField, "setCoordField");
Expand Down
89 changes: 87 additions & 2 deletions test/testOmegahElement.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@
#include "MeshField_Fail.hpp" //remove?
#include "MeshField_For.hpp" //remove?
#include "MeshField_ShapeField.hpp" //remove?
#ifdef MESHFIELDS_ENABLE_CABANA
#include "CabanaController.hpp"
#endif
#include "Omega_h_build.hpp"
#include "Omega_h_file.hpp"
#include "Omega_h_simplex.hpp"
Expand Down Expand Up @@ -85,7 +88,7 @@ void setVertices(Omega_h::Mesh &mesh, AnalyticFunction func, ShapeField field) {
// - TODO should be encoded in the field?
const auto x = coords[vtx * MeshDim];
const auto y = coords[vtx * MeshDim + 1];
field(0, 0, vtx, MeshField::Vertex) = func(x, y);
field(vtx, 0, 0, MeshField::Vertex) = func(x, y);
};
MeshField::parallel_for(ExecutionSpace(), {0}, {mesh.nverts()},
setFieldAtVertices, "setFieldAtVertices");
Expand All @@ -106,7 +109,7 @@ void setEdges(Omega_h::Mesh &mesh, AnalyticFunction func, ShapeField field) {
const auto x = (coords[left * MeshDim] + coords[right * MeshDim]) / 2.0;
const auto y =
(coords[left * MeshDim + 1] + coords[right * MeshDim + 1]) / 2.0;
field(0, 0, edge, MeshField::Edge) = func(x, y);
field(edge, 0, 0, MeshField::Edge) = func(x, y);
};
MeshField::parallel_for(ExecutionSpace(), {0}, {mesh.nedges()},
setFieldAtEdges, "setFieldAtEdges");
Expand Down Expand Up @@ -142,6 +145,88 @@ int main(int argc, char **argv) {
Kokkos::initialize(argc, argv);
auto lib = Omega_h::Library(&argc, &argv);
MeshField::Debug = true;
{
auto mesh = createMeshTri18(lib);
MeshField::OmegahMeshField<ExecutionSpace, MeshField::CabanaController> omf(
mesh);

// setup field with values from the analytic function
static const size_t OnePtPerElem = 1;
static const size_t ThreePtsPerElem = 3;
auto centroids = createElmAreaCoords<OnePtPerElem>(
mesh.nfaces(), {1 / 3.0, 1 / 3.0, 1 / 3.0});
auto interior =
createElmAreaCoords<OnePtPerElem>(mesh.nfaces(), {0.1, 0.4, 0.5});
auto vertex =
createElmAreaCoords<OnePtPerElem>(mesh.nfaces(), {0.0, 0.0, 1.0});
// clang-format off
auto allVertices = createElmAreaCoords<ThreePtsPerElem>(mesh.nfaces(),
{1.0, 0.0, 0.0,
0.0, 1.0, 0.0,
0.0, 0.0, 1.0});
const auto cases = {TestCoords{centroids, OnePtPerElem, "centroids"},
TestCoords{interior, OnePtPerElem, "interior"},
TestCoords{vertex, OnePtPerElem, "vertex"},
TestCoords{allVertices, ThreePtsPerElem, "allVertices"}};
// clang-format on

auto coords = mesh.coords();
const auto MeshDim = 2;
for (auto testCase : cases) {
using ViewType = decltype(testCase.coords);
{
const auto ShapeOrder = 1;
auto field =
omf.CreateLagrangeField<MeshField::Real, ShapeOrder, MeshDim>();
auto func = LinearFunction();
setVertices(mesh, func, field);
using FieldType = decltype(field);
auto result =
omf.triangleLocalPointEval<LinearFunction, ViewType, FieldType>(
testCase.coords, testCase.NumPtsPerElem, LinearFunction{},
field);
auto failed = checkResult(mesh, result, omf.getCoordField(), testCase,
LinearFunction{});
if (failed)
doFail("linear", "linear", testCase.name);
}
{
const auto ShapeOrder = 2;
auto field =
omf.CreateLagrangeField<MeshField::Real, ShapeOrder, MeshDim>();
auto func = QuadraticFunction();
setVertices(mesh, func, field);
setEdges(mesh, func, field);
using FieldType = decltype(field);
auto result =
omf.triangleLocalPointEval<QuadraticFunction, ViewType, FieldType>(
testCase.coords, testCase.NumPtsPerElem, QuadraticFunction{},
field);
auto failed = checkResult(mesh, result, omf.getCoordField(), testCase,
QuadraticFunction{});
if (failed)
doFail("quadratic", "quadratic", testCase.name);
}
{
const auto ShapeOrder = 2;
auto field =
omf.CreateLagrangeField<MeshField::Real, ShapeOrder, MeshDim>();
auto func = LinearFunction();
auto coords = mesh.coords();
setVertices(mesh, func, field);
setEdges(mesh, func, field);
using FieldType = decltype(field);
auto result =
omf.triangleLocalPointEval<LinearFunction, ViewType, FieldType>(
testCase.coords, testCase.NumPtsPerElem, LinearFunction{},
field);
auto failed = checkResult(mesh, result, omf.getCoordField(), testCase,
LinearFunction{});
if (failed)
doFail("quadratic", "linear", testCase.name);
}
}
}
{
auto mesh = createMeshTri18(lib);
MeshField::OmegahMeshField<ExecutionSpace, MeshField::KokkosController> omf(
Expand Down
Loading