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

Jump to bottom

Support non-tensor elements with cuda/gen backend. #1022

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

Support non-tensor elements with cuda/gen backend. #1022

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
784912b
Use dim==1 for nontensor basis.
YohannDudouit Jul 7, 2022
6c618fe
Add check that tensor and non-tensor basis are not mixed.
YohannDudouit Jul 7, 2022
493d50d
Fix: Forgot to replace `CeedBasisGetNumNodes1D`.
YohannDudouit Jul 7, 2022
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
43 changes: 30 additions & 13 deletions backends/cuda-gen/ceed-cuda-gen-operator-build.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -814,6 +814,8 @@ extern "C" int CeedCudaGenOperatorBuild(CeedOperator op) {
code << "#define CEED_ERROR_SUCCESS 0\n\n";

// Find dim and Q1d
bool hasTensorBasis = false;
bool hasNonTensorBasis = false;
bool useCollograd = true;
bool allCollograd = true;
data->maxP1d = 0;
Expand All @@ -829,18 +831,18 @@ extern "C" int CeedCudaGenOperatorBuild(CeedOperator op) {
useCollograd = useCollograd && basis_data->d_collo_grad_1d;

// Collect dim and Q1d
ierr = CeedBasisGetDimension(basis, &dim); CeedChkBackend(ierr);
bool isTensor;
ierr = CeedBasisIsTensor(basis, &isTensor); CeedChkBackend(ierr);
if (isTensor) {
ierr = CeedBasisGetDimension(basis, &dim); CeedChkBackend(ierr);
ierr = CeedBasisGetNumQuadraturePoints1D(basis, &Q1d); CeedChkBackend(ierr);
ierr = CeedBasisGetNumNodes1D(basis, &P1d); CeedChkBackend(ierr);
if (P1d>data->maxP1d) data->maxP1d = P1d;
hasTensorBasis = true;
} else {
// LCOV_EXCL_START
return CeedError(ceed, CEED_ERROR_BACKEND, "Backend does not implement operators with non-tensor basis");
// LCOV_EXCL_STOP
}
ierr = CeedBasisGetNumNodes(basis, &P1d); CeedChkBackend(ierr);
hasNonTensorBasis = true;
}
if (P1d>data->maxP1d) data->maxP1d = P1d;
}
}
// Check output bases for Q1d, dim as well
Expand All @@ -855,21 +857,24 @@ extern "C" int CeedCudaGenOperatorBuild(CeedOperator op) {
CeedChkBackend(ierr);

// Collect dim and Q1d
ierr = CeedBasisGetDimension(basis, &dim); CeedChkBackend(ierr);
bool isTensor;
ierr = CeedBasisIsTensor(basis, &isTensor); CeedChkBackend(ierr);
if (isTensor) {
ierr = CeedBasisGetDimension(basis, &dim); CeedChkBackend(ierr);
ierr = CeedBasisGetNumQuadraturePoints1D(basis, &Q1d); CeedChkBackend(ierr);
hasTensorBasis = true;
} else {
// LCOV_EXCL_START
return CeedError(ceed, CEED_ERROR_BACKEND, "Backend does not implement operators with non-tensor basis");
// LCOV_EXCL_STOP
}
hasNonTensorBasis = true;
}

// Check for collocated gradient
useCollograd = useCollograd && basis_data->d_collo_grad_1d;
}
}
if ( hasTensorBasis && hasNonTensorBasis )
{
return CeedError(ceed, CEED_ERROR_BACKEND, "Backend does not implement operators with mixed tensor and non-tensor basis");
}
data->dim = dim;
data->Q1d = Q1d;
// TODO: https://github.com/CEED/libCEED/pull/1009#issuecomment-1176751436
Expand Down Expand Up @@ -928,7 +933,13 @@ extern "C" int CeedCudaGenOperatorBuild(CeedOperator op) {
if (emode != CEED_EVAL_WEIGHT) {
ierr = CeedOperatorFieldGetBasis(opinputfields[i], &basis); CeedChkBackend(ierr);
if (basis != CEED_BASIS_COLLOCATED) {
ierr = CeedBasisGetNumNodes1D(basis, &P1d); CeedChkBackend(ierr);
bool isTensor;
ierr = CeedBasisIsTensor(basis, &isTensor); CeedChkBackend(ierr);
if (isTensor) {
ierr = CeedBasisGetNumNodes1D(basis, &P1d); CeedChkBackend(ierr);
} else {
ierr = CeedBasisGetNumNodes(basis, &P1d); CeedChkBackend(ierr);
}
code << " const CeedInt P_in_"<<i<<" = "<<P1d<<";\n";
} else {
code << " const CeedInt P_in_"<<i<<" = "<<Q1d<<";\n";
Expand Down Expand Up @@ -987,7 +998,13 @@ extern "C" int CeedCudaGenOperatorBuild(CeedOperator op) {
// Set field constants
ierr = CeedOperatorFieldGetBasis(opoutputfields[i], &basis); CeedChkBackend(ierr);
if (basis != CEED_BASIS_COLLOCATED) {
ierr = CeedBasisGetNumNodes1D(basis, &P1d); CeedChkBackend(ierr);
bool isTensor;
ierr = CeedBasisIsTensor(basis, &isTensor); CeedChkBackend(ierr);
if (isTensor) {
ierr = CeedBasisGetNumNodes1D(basis, &P1d); CeedChkBackend(ierr);
} else {
ierr = CeedBasisGetNumNodes(basis, &P1d); CeedChkBackend(ierr);
}
code << " const CeedInt P_out_"<<i<<" = "<<P1d<<";\n";
} else {
code << " const CeedInt P_out_"<<i<<" = "<<Q1d<<";\n";
Expand Down