Skip to content

Commit 8200ce5

Browse files
jeremyltjeremylt
authored
Merge pull request #929 from CEED/jeremy/tidy-fix
tidy - small tidy fixes
2 parents 79f833b + b216396 commit 8200ce5

File tree

2 files changed

+78
-61
lines changed

2 files changed

+78
-61
lines changed

‎backends/cuda-ref/ceed-cuda-ref-operator.c

Lines changed: 39 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1374,13 +1374,14 @@ static int CeedSingleOperatorAssembleSetup_Cuda(CeedOperator op) {
13741374
CeedOperatorField *input_fields;
13751375
CeedOperatorField *output_fields;
13761376
ierr = CeedOperatorGetFields(op, &num_input_fields, &input_fields,
1377-
&num_output_fields, &output_fields); CeedChk(ierr);
1377+
&num_output_fields, &output_fields); CeedChkBackend(ierr);
13781378

13791379
// Determine active input basis eval mode
13801380
CeedQFunction qf;
1381-
ierr = CeedOperatorGetQFunction(op, &qf); CeedChk(ierr);
1381+
ierr = CeedOperatorGetQFunction(op, &qf); CeedChkBackend(ierr);
13821382
CeedQFunctionField *qf_fields;
1383-
ierr = CeedQFunctionGetFields(qf, NULL, &qf_fields, NULL, NULL); CeedChk(ierr);
1383+
ierr = CeedQFunctionGetFields(qf, NULL, &qf_fields, NULL, NULL);
1384+
CeedChkBackend(ierr);
13841385
// Note that the kernel will treat each dimension of a gradient action separately;
13851386
// i.e., when an active input has a CEED_EVAL_GRAD mode, num_emode_in will increment
13861387
// by dim. However, for the purposes of loading the B matrices, it will be treated
@@ -1389,24 +1390,25 @@ static int CeedSingleOperatorAssembleSetup_Cuda(CeedOperator op) {
13891390
CeedInt num_emode_in = 0, dim = 1, num_B_in_mats_to_load = 0, size_B_in = 0;
13901391
CeedEvalMode *eval_mode_in = NULL; //will be of size num_B_in_mats_load
13911392
CeedBasis basis_in = NULL;
1392-
CeedInt nqpts, esize;
1393+
CeedInt nqpts = 0, esize = 0;
13931394
CeedElemRestriction rstr_in = NULL;
13941395
for (CeedInt i=0; i<num_input_fields; i++) {
13951396
CeedVector vec;
1396-
ierr = CeedOperatorFieldGetVector(input_fields[i], &vec); CeedChk(ierr);
1397+
ierr = CeedOperatorFieldGetVector(input_fields[i], &vec); CeedChkBackend(ierr);
13971398
if (vec == CEED_VECTOR_ACTIVE) {
13981399
ierr = CeedOperatorFieldGetBasis(input_fields[i], &basis_in);
1399-
CeedChk(ierr);
1400-
ierr = CeedBasisGetDimension(basis_in, &dim); CeedChk(ierr);
1401-
ierr = CeedBasisGetNumQuadraturePoints(basis_in, &nqpts); CeedChk(ierr);
1400+
CeedChkBackend(ierr);
1401+
ierr = CeedBasisGetDimension(basis_in, &dim); CeedChkBackend(ierr);
1402+
ierr = CeedBasisGetNumQuadraturePoints(basis_in, &nqpts); CeedChkBackend(ierr);
14021403
ierr = CeedOperatorFieldGetElemRestriction(input_fields[i], &rstr_in);
1403-
ierr = CeedElemRestrictionGetElementSize(rstr_in, &esize); CeedChk(ierr);
1404-
CeedChk(ierr);
1404+
CeedChkBackend(ierr);
1405+
ierr = CeedElemRestrictionGetElementSize(rstr_in, &esize); CeedChkBackend(ierr);
14051406
CeedEvalMode eval_mode;
14061407
ierr = CeedQFunctionFieldGetEvalMode(qf_fields[i], &eval_mode);
1407-
CeedChk(ierr);
1408+
CeedChkBackend(ierr);
14081409
if (eval_mode != CEED_EVAL_NONE) {
1409-
ierr = CeedRealloc(num_B_in_mats_to_load + 1, &eval_mode_in); CeedChk(ierr);
1410+
ierr = CeedRealloc(num_B_in_mats_to_load + 1, &eval_mode_in);
1411+
CeedChkBackend(ierr);
14101412
eval_mode_in[num_B_in_mats_to_load] = eval_mode;
14111413
num_B_in_mats_to_load += 1;
14121414
if (eval_mode == CEED_EVAL_GRAD) {
@@ -1421,29 +1423,31 @@ static int CeedSingleOperatorAssembleSetup_Cuda(CeedOperator op) {
14211423
}
14221424

14231425
// Determine active output basis; basis_out and rstr_out only used if same as input, TODO
1424-
ierr = CeedQFunctionGetFields(qf, NULL, NULL, NULL, &qf_fields); CeedChk(ierr);
1426+
ierr = CeedQFunctionGetFields(qf, NULL, NULL, NULL, &qf_fields);
1427+
CeedChkBackend(ierr);
14251428
CeedInt num_emode_out = 0, num_B_out_mats_to_load = 0, size_B_out = 0;
14261429
CeedEvalMode *eval_mode_out = NULL;
14271430
CeedBasis basis_out = NULL;
14281431
CeedElemRestriction rstr_out = NULL;
14291432
for (CeedInt i=0; i<num_output_fields; i++) {
14301433
CeedVector vec;
1431-
ierr = CeedOperatorFieldGetVector(output_fields[i], &vec); CeedChk(ierr);
1434+
ierr = CeedOperatorFieldGetVector(output_fields[i], &vec); CeedChkBackend(ierr);
14321435
if (vec == CEED_VECTOR_ACTIVE) {
14331436
ierr = CeedOperatorFieldGetBasis(output_fields[i], &basis_out);
1434-
CeedChk(ierr);
1437+
CeedChkBackend(ierr);
14351438
ierr = CeedOperatorFieldGetElemRestriction(output_fields[i], &rstr_out);
1436-
CeedChk(ierr);
1439+
CeedChkBackend(ierr);
14371440
if (rstr_out && rstr_out != rstr_in)
14381441
// LCOV_EXCL_START
14391442
return CeedError(ceed, CEED_ERROR_BACKEND,
14401443
"Multi-field non-composite operator assembly not supported");
14411444
// LCOV_EXCL_STOP
14421445
CeedEvalMode eval_mode;
14431446
ierr = CeedQFunctionFieldGetEvalMode(qf_fields[i], &eval_mode);
1444-
CeedChk(ierr);
1447+
CeedChkBackend(ierr);
14451448
if (eval_mode != CEED_EVAL_NONE) {
1446-
ierr = CeedRealloc(num_B_out_mats_to_load + 1, &eval_mode_out); CeedChk(ierr);
1449+
ierr = CeedRealloc(num_B_out_mats_to_load + 1, &eval_mode_out);
1450+
CeedChkBackend(ierr);
14471451
eval_mode_out[num_B_out_mats_to_load] = eval_mode;
14481452
num_B_out_mats_to_load += 1;
14491453
if (eval_mode == CEED_EVAL_GRAD) {
@@ -1464,8 +1468,9 @@ static int CeedSingleOperatorAssembleSetup_Cuda(CeedOperator op) {
14641468
// LCOV_EXCL_STOP
14651469

14661470
CeedInt nelem, ncomp;
1467-
ierr = CeedElemRestrictionGetNumElements(rstr_in, &nelem); CeedChk(ierr);
1468-
ierr = CeedElemRestrictionGetNumComponents(rstr_in, &ncomp); CeedChk(ierr);
1471+
ierr = CeedElemRestrictionGetNumElements(rstr_in, &nelem); CeedChkBackend(ierr);
1472+
ierr = CeedElemRestrictionGetNumComponents(rstr_in, &ncomp);
1473+
CeedChkBackend(ierr);
14691474

14701475
ierr = CeedCalloc(1, &impl->asmb); CeedChkBackend(ierr);
14711476
CeedOperatorAssemble_Cuda *asmb = impl->asmb;
@@ -1579,13 +1584,14 @@ static int CeedSingleOperatorAssemble_Cuda(CeedOperator op, CeedInt offset,
15791584
if (!impl->asmb) {
15801585
ierr = CeedSingleOperatorAssembleSetup_Cuda(op);
15811586
CeedChkBackend(ierr);
1587+
assert(impl->asmb != NULL);
15821588
}
15831589

15841590
// Assemble QFunction
15851591
CeedVector assembled_qf;
15861592
CeedElemRestriction rstr_q;
15871593
ierr = CeedOperatorLinearAssembleQFunctionBuildOrUpdate(
1588-
op, &assembled_qf, &rstr_q, CEED_REQUEST_IMMEDIATE); CeedChk(ierr);
1594+
op, &assembled_qf, &rstr_q, CEED_REQUEST_IMMEDIATE); CeedChkBackend(ierr);
15891595
ierr = CeedElemRestrictionDestroy(&rstr_q); CeedChkBackend(ierr);
15901596
CeedScalar *values_array;
15911597
ierr = CeedVectorGetArrayWrite(values, CEED_MEM_DEVICE, &values_array);
@@ -1635,29 +1641,32 @@ int CeedOperatorLinearAssemble_Cuda(CeedOperator op, CeedVector values) {
16351641
// for composite operators, or call single operator assembly otherwise
16361642
bool is_composite;
16371643
CeedInt ierr;
1638-
ierr = CeedOperatorIsComposite(op, &is_composite); CeedChk(ierr);
1644+
ierr = CeedOperatorIsComposite(op, &is_composite); CeedChkBackend(ierr);
16391645

16401646
CeedElemRestriction rstr;
16411647
CeedInt num_elem, elem_size, num_comp;
16421648

16431649
CeedInt offset = 0;
16441650
if (is_composite) {
16451651
CeedInt num_suboperators;
1646-
ierr = CeedOperatorGetNumSub(op, &num_suboperators); CeedChk(ierr);
1652+
ierr = CeedOperatorGetNumSub(op, &num_suboperators); CeedChkBackend(ierr);
16471653
CeedOperator *sub_operators;
1648-
ierr = CeedOperatorGetSubList(op, &sub_operators); CeedChk(ierr);
1654+
ierr = CeedOperatorGetSubList(op, &sub_operators); CeedChkBackend(ierr);
16491655
for (int k = 0; k < num_suboperators; ++k) {
16501656
ierr = CeedSingleOperatorAssemble_Cuda(sub_operators[k], offset, values);
1651-
CeedChk(ierr);
1657+
CeedChkBackend(ierr);
16521658
ierr = CeedOperatorGetActiveElemRestriction(sub_operators[k], &rstr);
1653-
CeedChk(ierr);
1654-
ierr = CeedElemRestrictionGetNumElements(rstr, &num_elem); CeedChk(ierr);
1655-
ierr = CeedElemRestrictionGetElementSize(rstr, &elem_size); CeedChk(ierr);
1656-
ierr = CeedElemRestrictionGetNumComponents(rstr, &num_comp); CeedChk(ierr);
1659+
CeedChkBackend(ierr);
1660+
ierr = CeedElemRestrictionGetNumElements(rstr, &num_elem); CeedChkBackend(ierr);
1661+
ierr = CeedElemRestrictionGetElementSize(rstr, &elem_size);
1662+
CeedChkBackend(ierr);
1663+
ierr = CeedElemRestrictionGetNumComponents(rstr, &num_comp);
1664+
CeedChkBackend(ierr);
16571665
offset += elem_size*num_comp * elem_size*num_comp * num_elem;
16581666
}
16591667
} else {
1660-
ierr = CeedSingleOperatorAssemble_Cuda(op, offset, values); CeedChk(ierr);
1668+
ierr = CeedSingleOperatorAssemble_Cuda(op, offset, values);
1669+
CeedChkBackend(ierr);
16611670
}
16621671

16631672
return CEED_ERROR_SUCCESS;

‎backends/hip-ref/ceed-hip-ref-operator.c

Lines changed: 39 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1371,13 +1371,14 @@ static int CeedSingleOperatorAssembleSetup_Hip(CeedOperator op) {
13711371
CeedOperatorField *input_fields;
13721372
CeedOperatorField *output_fields;
13731373
ierr = CeedOperatorGetFields(op, &num_input_fields, &input_fields,
1374-
&num_output_fields, &output_fields); CeedChk(ierr);
1374+
&num_output_fields, &output_fields); CeedChkBackend(ierr);
13751375

13761376
// Determine active input basis eval mode
13771377
CeedQFunction qf;
1378-
ierr = CeedOperatorGetQFunction(op, &qf); CeedChk(ierr);
1378+
ierr = CeedOperatorGetQFunction(op, &qf); CeedChkBackend(ierr);
13791379
CeedQFunctionField *qf_fields;
1380-
ierr = CeedQFunctionGetFields(qf, NULL, &qf_fields, NULL, NULL); CeedChk(ierr);
1380+
ierr = CeedQFunctionGetFields(qf, NULL, &qf_fields, NULL, NULL);
1381+
CeedChkBackend(ierr);
13811382
// Note that the kernel will treat each dimension of a gradient action separately;
13821383
// i.e., when an active input has a CEED_EVAL_GRAD mode, num_emode_in will increment
13831384
// by dim. However, for the purposes of loading the B matrices, it will be treated
@@ -1386,24 +1387,25 @@ static int CeedSingleOperatorAssembleSetup_Hip(CeedOperator op) {
13861387
CeedInt num_emode_in = 0, dim = 1, num_B_in_mats_to_load = 0, size_B_in = 0;
13871388
CeedEvalMode *eval_mode_in = NULL; //will be of size num_B_in_mats_load
13881389
CeedBasis basis_in = NULL;
1389-
CeedInt nqpts, esize;
1390+
CeedInt nqpts = 0, esize = 0;
13901391
CeedElemRestriction rstr_in = NULL;
13911392
for (CeedInt i=0; i<num_input_fields; i++) {
13921393
CeedVector vec;
1393-
ierr = CeedOperatorFieldGetVector(input_fields[i], &vec); CeedChk(ierr);
1394+
ierr = CeedOperatorFieldGetVector(input_fields[i], &vec); CeedChkBackend(ierr);
13941395
if (vec == CEED_VECTOR_ACTIVE) {
13951396
ierr = CeedOperatorFieldGetBasis(input_fields[i], &basis_in);
1396-
CeedChk(ierr);
1397-
ierr = CeedBasisGetDimension(basis_in, &dim); CeedChk(ierr);
1398-
ierr = CeedBasisGetNumQuadraturePoints(basis_in, &nqpts); CeedChk(ierr);
1397+
CeedChkBackend(ierr);
1398+
ierr = CeedBasisGetDimension(basis_in, &dim); CeedChkBackend(ierr);
1399+
ierr = CeedBasisGetNumQuadraturePoints(basis_in, &nqpts); CeedChkBackend(ierr);
13991400
ierr = CeedOperatorFieldGetElemRestriction(input_fields[i], &rstr_in);
1400-
ierr = CeedElemRestrictionGetElementSize(rstr_in, &esize); CeedChk(ierr);
1401-
CeedChk(ierr);
1401+
CeedChkBackend(ierr);
1402+
ierr = CeedElemRestrictionGetElementSize(rstr_in, &esize); CeedChkBackend(ierr);
14021403
CeedEvalMode eval_mode;
14031404
ierr = CeedQFunctionFieldGetEvalMode(qf_fields[i], &eval_mode);
1404-
CeedChk(ierr);
1405+
CeedChkBackend(ierr);
14051406
if (eval_mode != CEED_EVAL_NONE) {
1406-
ierr = CeedRealloc(num_B_in_mats_to_load + 1, &eval_mode_in); CeedChk(ierr);
1407+
ierr = CeedRealloc(num_B_in_mats_to_load + 1, &eval_mode_in);
1408+
CeedChkBackend(ierr);
14071409
eval_mode_in[num_B_in_mats_to_load] = eval_mode;
14081410
num_B_in_mats_to_load += 1;
14091411
if (eval_mode == CEED_EVAL_GRAD) {
@@ -1418,29 +1420,31 @@ static int CeedSingleOperatorAssembleSetup_Hip(CeedOperator op) {
14181420
}
14191421

14201422
// Determine active output basis; basis_out and rstr_out only used if same as input, TODO
1421-
ierr = CeedQFunctionGetFields(qf, NULL, NULL, NULL, &qf_fields); CeedChk(ierr);
1423+
ierr = CeedQFunctionGetFields(qf, NULL, NULL, NULL, &qf_fields);
1424+
CeedChkBackend(ierr);
14221425
CeedInt num_emode_out = 0, num_B_out_mats_to_load = 0, size_B_out = 0;
14231426
CeedEvalMode *eval_mode_out = NULL;
14241427
CeedBasis basis_out = NULL;
14251428
CeedElemRestriction rstr_out = NULL;
14261429
for (CeedInt i=0; i<num_output_fields; i++) {
14271430
CeedVector vec;
1428-
ierr = CeedOperatorFieldGetVector(output_fields[i], &vec); CeedChk(ierr);
1431+
ierr = CeedOperatorFieldGetVector(output_fields[i], &vec); CeedChkBackend(ierr);
14291432
if (vec == CEED_VECTOR_ACTIVE) {
14301433
ierr = CeedOperatorFieldGetBasis(output_fields[i], &basis_out);
1431-
CeedChk(ierr);
1434+
CeedChkBackend(ierr);
14321435
ierr = CeedOperatorFieldGetElemRestriction(output_fields[i], &rstr_out);
1433-
CeedChk(ierr);
1436+
CeedChkBackend(ierr);
14341437
if (rstr_out && rstr_out != rstr_in)
14351438
// LCOV_EXCL_START
14361439
return CeedError(ceed, CEED_ERROR_BACKEND,
14371440
"Multi-field non-composite operator assembly not supported");
14381441
// LCOV_EXCL_STOP
14391442
CeedEvalMode eval_mode;
14401443
ierr = CeedQFunctionFieldGetEvalMode(qf_fields[i], &eval_mode);
1441-
CeedChk(ierr);
1444+
CeedChkBackend(ierr);
14421445
if (eval_mode != CEED_EVAL_NONE) {
1443-
ierr = CeedRealloc(num_B_out_mats_to_load + 1, &eval_mode_out); CeedChk(ierr);
1446+
ierr = CeedRealloc(num_B_out_mats_to_load + 1, &eval_mode_out);
1447+
CeedChkBackend(ierr);
14441448
eval_mode_out[num_B_out_mats_to_load] = eval_mode;
14451449
num_B_out_mats_to_load += 1;
14461450
if (eval_mode == CEED_EVAL_GRAD) {
@@ -1461,8 +1465,9 @@ static int CeedSingleOperatorAssembleSetup_Hip(CeedOperator op) {
14611465
// LCOV_EXCL_STOP
14621466

14631467
CeedInt nelem, ncomp;
1464-
ierr = CeedElemRestrictionGetNumElements(rstr_in, &nelem); CeedChk(ierr);
1465-
ierr = CeedElemRestrictionGetNumComponents(rstr_in, &ncomp); CeedChk(ierr);
1468+
ierr = CeedElemRestrictionGetNumElements(rstr_in, &nelem); CeedChkBackend(ierr);
1469+
ierr = CeedElemRestrictionGetNumComponents(rstr_in, &ncomp);
1470+
CeedChkBackend(ierr);
14661471

14671472
ierr = CeedCalloc(1, &impl->asmb); CeedChkBackend(ierr);
14681473
CeedOperatorAssemble_Hip *asmb = impl->asmb;
@@ -1573,13 +1578,14 @@ static int CeedSingleOperatorAssemble_Hip(CeedOperator op, CeedInt offset,
15731578
if (!impl->asmb) {
15741579
ierr = CeedSingleOperatorAssembleSetup_Hip(op);
15751580
CeedChkBackend(ierr);
1581+
assert(impl->asmb != NULL);
15761582
}
15771583

15781584
// Assemble QFunction
15791585
CeedVector assembled_qf;
15801586
CeedElemRestriction rstr_q;
15811587
ierr = CeedOperatorLinearAssembleQFunctionBuildOrUpdate(
1582-
op, &assembled_qf, &rstr_q, CEED_REQUEST_IMMEDIATE); CeedChk(ierr);
1588+
op, &assembled_qf, &rstr_q, CEED_REQUEST_IMMEDIATE); CeedChkBackend(ierr);
15831589
ierr = CeedElemRestrictionDestroy(&rstr_q); CeedChkBackend(ierr);
15841590
CeedScalar *values_array;
15851591
ierr = CeedVectorGetArrayWrite(values, CEED_MEM_DEVICE, &values_array);
@@ -1590,7 +1596,7 @@ static int CeedSingleOperatorAssemble_Hip(CeedOperator op, CeedInt offset,
15901596
CeedChkBackend(ierr);
15911597

15921598
// Compute B^T D B
1593-
const CeedInt nelem = impl->asmb->nelem;
1599+
const CeedInt nelem = impl->asmb->nelem; // to satisfy clang-tidy
15941600
const CeedInt elemsPerBlock = impl->asmb->elemsPerBlock;
15951601
const CeedInt grid = nelem/elemsPerBlock+((
15961602
nelem/elemsPerBlock*elemsPerBlock<nelem)?1:0);
@@ -1629,29 +1635,31 @@ int CeedOperatorLinearAssemble_Hip(CeedOperator op, CeedVector values) {
16291635
// for composite operators, or call single operator assembly otherwise
16301636
bool is_composite;
16311637
CeedInt ierr;
1632-
ierr = CeedOperatorIsComposite(op, &is_composite); CeedChk(ierr);
1638+
ierr = CeedOperatorIsComposite(op, &is_composite); CeedChkBackend(ierr);
16331639

16341640
CeedElemRestriction rstr;
16351641
CeedInt num_elem, elem_size, num_comp;
16361642

16371643
CeedInt offset = 0;
16381644
if (is_composite) {
16391645
CeedInt num_suboperators;
1640-
ierr = CeedOperatorGetNumSub(op, &num_suboperators); CeedChk(ierr);
1646+
ierr = CeedOperatorGetNumSub(op, &num_suboperators); CeedChkBackend(ierr);
16411647
CeedOperator *sub_operators;
1642-
ierr = CeedOperatorGetSubList(op, &sub_operators); CeedChk(ierr);
1648+
ierr = CeedOperatorGetSubList(op, &sub_operators); CeedChkBackend(ierr);
16431649
for (int k = 0; k < num_suboperators; ++k) {
16441650
ierr = CeedSingleOperatorAssemble_Hip(sub_operators[k], offset, values);
1645-
CeedChk(ierr);
1651+
CeedChkBackend(ierr);
16461652
ierr = CeedOperatorGetActiveElemRestriction(sub_operators[k], &rstr);
1647-
CeedChk(ierr);
1648-
ierr = CeedElemRestrictionGetNumElements(rstr, &num_elem); CeedChk(ierr);
1649-
ierr = CeedElemRestrictionGetElementSize(rstr, &elem_size); CeedChk(ierr);
1650-
ierr = CeedElemRestrictionGetNumComponents(rstr, &num_comp); CeedChk(ierr);
1653+
CeedChkBackend(ierr);
1654+
ierr = CeedElemRestrictionGetNumElements(rstr, &num_elem); CeedChkBackend(ierr);
1655+
ierr = CeedElemRestrictionGetElementSize(rstr, &elem_size);
1656+
CeedChkBackend(ierr);
1657+
ierr = CeedElemRestrictionGetNumComponents(rstr, &num_comp);
1658+
CeedChkBackend(ierr);
16511659
offset += elem_size*num_comp * elem_size*num_comp * num_elem;
16521660
}
16531661
} else {
1654-
ierr = CeedSingleOperatorAssemble_Hip(op, offset, values); CeedChk(ierr);
1662+
ierr = CeedSingleOperatorAssemble_Hip(op, offset, values); CeedChkBackend(ierr);
16551663
}
16561664

16571665
return CEED_ERROR_SUCCESS;

0 commit comments

Comments
 (0)