Skip to content

Commit 1a8516d

Browse files
jrwrighjrwrigh
committed
style: Change clang-format to penalize newline after open ()
1 parent d9b02d1 commit 1a8516d

35 files changed

+206
-199
lines changed

‎.clang-format‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ AlignEscapedNewlines: true
88
AlignOperands: Align
99
AllowShortIfStatementsOnASingleLine: AllIfsAndElse
1010
ColumnLimit: 150
11+
PenaltyBreakOpenParenthesis: 100
1112
ReflowComments: false
1213
CommentPragmas: 'TESTARGS'
1314
DerivePointerAlignment: false

‎backends/blocked/ceed-blocked-operator.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -476,8 +476,8 @@ static int CeedOperatorApplyAdd_Blocked(CeedOperator op, CeedVector in_vec, Ceed
476476
CeedCallBackend(CeedQFunctionFieldGetEvalMode(qf_output_fields[i], &eval_mode));
477477
if (eval_mode == CEED_EVAL_NONE) {
478478
CeedCallBackend(CeedQFunctionFieldGetSize(qf_output_fields[i], &size));
479-
CeedCallBackend(
480-
CeedVectorSetArray(impl->q_vecs_out[i], CEED_MEM_HOST, CEED_USE_POINTER, &e_data_full[i + num_input_fields][(CeedSize)e * Q * size]));
479+
CeedCallBackend(CeedVectorSetArray(impl->q_vecs_out[i], CEED_MEM_HOST, CEED_USE_POINTER,
480+
&e_data_full[i + num_input_fields][(CeedSize)e * Q * size]));
481481
}
482482
}
483483

@@ -508,8 +508,8 @@ static int CeedOperatorApplyAdd_Blocked(CeedOperator op, CeedVector in_vec, Ceed
508508
// Active
509509
if (is_active) vec = out_vec;
510510
// Restrict
511-
CeedCallBackend(
512-
CeedElemRestrictionApply(impl->block_rstr[i + impl->num_inputs], CEED_TRANSPOSE, impl->e_vecs_full[i + impl->num_inputs], vec, request));
511+
CeedCallBackend(CeedElemRestrictionApply(impl->block_rstr[i + impl->num_inputs], CEED_TRANSPOSE, impl->e_vecs_full[i + impl->num_inputs], vec,
512+
request));
513513
if (!is_active) CeedCallBackend(CeedVectorDestroy(&vec));
514514
}
515515

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

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -472,8 +472,8 @@ static int CeedOperatorLinearAssembleQFunctionCore_Cuda_gen(CeedOperator op, boo
472472
}
473473
CeedInt shared_mem = block[0] * block[1] * block[2] * sizeof(CeedScalar);
474474

475-
CeedCallBackend(
476-
CeedTryRunKernelDimShared_Cuda(ceed, data->assemble_qfunction, NULL, grid, block[0], block[1], block[2], shared_mem, &is_run_good, opargs));
475+
CeedCallBackend(CeedTryRunKernelDimShared_Cuda(ceed, data->assemble_qfunction, NULL, grid, block[0], block[1], block[2], shared_mem, &is_run_good,
476+
opargs));
477477
CeedCallCuda(ceed, cudaDeviceSynchronize());
478478

479479
// Restore input arrays
@@ -546,8 +546,8 @@ static int CeedOperatorLinearAssembleAddDiagonalAtPoints_Cuda_gen(CeedOperator o
546546
CeedOperatorAssemblyData assembly_data;
547547

548548
CeedCallBackend(CeedOperatorGetOperatorAssemblyData(op, &assembly_data));
549-
CeedCallBackend(
550-
CeedOperatorAssemblyDataGetEvalModes(assembly_data, &num_active_bases_in, NULL, NULL, NULL, &num_active_bases_out, NULL, NULL, NULL, NULL));
549+
CeedCallBackend(CeedOperatorAssemblyDataGetEvalModes(assembly_data, &num_active_bases_in, NULL, NULL, NULL, &num_active_bases_out, NULL, NULL,
550+
NULL, NULL));
551551
if (num_active_bases_in == num_active_bases_out) {
552552
CeedCallBackend(CeedOperatorBuildKernel_Cuda_gen(op, &is_build_good));
553553
if (is_build_good) CeedCallBackend(CeedOperatorBuildKernelDiagonalAssemblyAtPoints_Cuda_gen(op, &is_build_good));
@@ -640,8 +640,8 @@ static int CeedOperatorLinearAssembleAddDiagonalAtPoints_Cuda_gen(CeedOperator o
640640
cuda_data->device_prop.maxThreadsDim[2], cuda_data->device_prop.warpSize, block, &grid));
641641
CeedInt shared_mem = block[0] * block[1] * block[2] * sizeof(CeedScalar);
642642

643-
CeedCallBackend(
644-
CeedTryRunKernelDimShared_Cuda(ceed, data->assemble_diagonal, NULL, grid, block[0], block[1], block[2], shared_mem, &is_run_good, opargs));
643+
CeedCallBackend(CeedTryRunKernelDimShared_Cuda(ceed, data->assemble_diagonal, NULL, grid, block[0], block[1], block[2], shared_mem, &is_run_good,
644+
opargs));
645645
CeedCallCuda(ceed, cudaDeviceSynchronize());
646646

647647
// Restore input arrays
@@ -709,8 +709,8 @@ static int CeedOperatorAssembleSingleAtPoints_Cuda_gen(CeedOperator op, CeedInt
709709
CeedOperatorAssemblyData assembly_data;
710710

711711
CeedCallBackend(CeedOperatorGetOperatorAssemblyData(op, &assembly_data));
712-
CeedCallBackend(
713-
CeedOperatorAssemblyDataGetEvalModes(assembly_data, &num_active_bases_in, NULL, NULL, NULL, &num_active_bases_out, NULL, NULL, NULL, NULL));
712+
CeedCallBackend(CeedOperatorAssemblyDataGetEvalModes(assembly_data, &num_active_bases_in, NULL, NULL, NULL, &num_active_bases_out, NULL, NULL,
713+
NULL, NULL));
714714
if (num_active_bases_in == num_active_bases_out) {
715715
CeedCallBackend(CeedOperatorBuildKernel_Cuda_gen(op, &is_build_good));
716716
if (is_build_good) CeedCallBackend(CeedOperatorBuildKernelFullAssemblyAtPoints_Cuda_gen(op, &is_build_good));
@@ -805,8 +805,8 @@ static int CeedOperatorAssembleSingleAtPoints_Cuda_gen(CeedOperator op, CeedInt
805805
cuda_data->device_prop.maxThreadsDim[2], cuda_data->device_prop.warpSize, block, &grid));
806806
CeedInt shared_mem = block[0] * block[1] * block[2] * sizeof(CeedScalar);
807807

808-
CeedCallBackend(
809-
CeedTryRunKernelDimShared_Cuda(ceed, data->assemble_full, NULL, grid, block[0], block[1], block[2], shared_mem, &is_run_good, opargs));
808+
CeedCallBackend(CeedTryRunKernelDimShared_Cuda(ceed, data->assemble_full, NULL, grid, block[0], block[1], block[2], shared_mem, &is_run_good,
809+
opargs));
810810
CeedCallCuda(ceed, cudaDeviceSynchronize());
811811

812812
// Restore input arrays
@@ -876,14 +876,14 @@ int CeedOperatorCreate_Cuda_gen(CeedOperator op) {
876876
}
877877
CeedCall(CeedOperatorIsAtPoints(op, &is_at_points));
878878
if (is_at_points) {
879-
CeedCallBackend(
880-
CeedSetBackendFunction(ceed, "Operator", op, "LinearAssembleAddDiagonal", CeedOperatorLinearAssembleAddDiagonalAtPoints_Cuda_gen));
879+
CeedCallBackend(CeedSetBackendFunction(ceed, "Operator", op, "LinearAssembleAddDiagonal",
880+
CeedOperatorLinearAssembleAddDiagonalAtPoints_Cuda_gen));
881881
CeedCallBackend(CeedSetBackendFunction(ceed, "Operator", op, "LinearAssembleSingle", CeedOperatorAssembleSingleAtPoints_Cuda_gen));
882882
}
883883
if (!is_at_points) {
884884
CeedCallBackend(CeedSetBackendFunction(ceed, "Operator", op, "LinearAssembleQFunction", CeedOperatorLinearAssembleQFunction_Cuda_gen));
885-
CeedCallBackend(
886-
CeedSetBackendFunction(ceed, "Operator", op, "LinearAssembleQFunctionUpdate", CeedOperatorLinearAssembleQFunctionUpdate_Cuda_gen));
885+
CeedCallBackend(CeedSetBackendFunction(ceed, "Operator", op, "LinearAssembleQFunctionUpdate",
886+
CeedOperatorLinearAssembleQFunctionUpdate_Cuda_gen));
887887
}
888888
CeedCallBackend(CeedSetBackendFunction(ceed, "Operator", op, "Destroy", CeedOperatorDestroy_Cuda_gen));
889889
CeedCallBackend(CeedDestroy(&ceed));

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -209,8 +209,8 @@ static int CeedBasisApplyAtPointsCore_Cuda(CeedBasis basis, bool apply_add, cons
209209
void *interp_args[] = {(void *)&num_elem, &data->d_chebyshev_interp_1d, &data->d_points_per_elem, &d_x, &d_u, &d_v};
210210
const CeedInt block_size = CeedIntMin(CeedIntPow(Q_1d, dim), max_block_size);
211211

212-
CeedCallBackend(
213-
CeedRunKernel_Cuda(ceed, is_transpose ? data->InterpTransposeAtPoints : data->InterpAtPoints, num_elem, block_size, interp_args));
212+
CeedCallBackend(CeedRunKernel_Cuda(ceed, is_transpose ? data->InterpTransposeAtPoints : data->InterpAtPoints, num_elem, block_size,
213+
interp_args));
214214
} break;
215215
case CEED_EVAL_GRAD: {
216216
void *grad_args[] = {(void *)&num_elem, &data->d_chebyshev_interp_1d, &data->d_points_per_elem, &d_x, &d_u, &d_v};

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

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -170,8 +170,8 @@ static int CeedOperatorSetupFields_Cuda(CeedQFunction qf, CeedOperator op, bool
170170
CeedInt num_points[num_elem];
171171

172172
for (CeedInt i = 0; i < num_elem; i++) num_points[i] = Q;
173-
CeedCallBackend(
174-
CeedBasisApplyAtPoints(basis, num_elem, num_points, CEED_NOTRANSPOSE, CEED_EVAL_WEIGHT, CEED_VECTOR_NONE, CEED_VECTOR_NONE, q_vecs[i]));
173+
CeedCallBackend(CeedBasisApplyAtPoints(basis, num_elem, num_points, CEED_NOTRANSPOSE, CEED_EVAL_WEIGHT, CEED_VECTOR_NONE, CEED_VECTOR_NONE,
174+
q_vecs[i]));
175175
} else {
176176
CeedCallBackend(CeedBasisApply(basis, num_elem, CEED_NOTRANSPOSE, CEED_EVAL_WEIGHT, CEED_VECTOR_NONE, q_vecs[i]));
177177
}
@@ -269,8 +269,8 @@ static int CeedOperatorSetup_Cuda(CeedOperator op) {
269269
impl->num_outputs = num_output_fields;
270270

271271
// Set up infield and outfield e-vecs and q-vecs
272-
CeedCallBackend(
273-
CeedOperatorSetupFields_Cuda(qf, op, true, false, impl->skip_rstr_in, NULL, impl->e_vecs_in, impl->q_vecs_in, num_input_fields, Q, num_elem));
272+
CeedCallBackend(CeedOperatorSetupFields_Cuda(qf, op, true, false, impl->skip_rstr_in, NULL, impl->e_vecs_in, impl->q_vecs_in, num_input_fields, Q,
273+
num_elem));
274274
CeedCallBackend(CeedOperatorSetupFields_Cuda(qf, op, false, false, impl->skip_rstr_out, impl->apply_add_basis_out, impl->e_vecs_out,
275275
impl->q_vecs_out, num_output_fields, Q, num_elem));
276276

@@ -522,8 +522,8 @@ static int CeedOperatorApplyAdd_Cuda(CeedOperator op, CeedVector in_vec, CeedVec
522522
for (CeedInt i = 0; i < num_input_fields; i++) {
523523
CeedInt field = impl->input_field_order[i];
524524

525-
CeedCallBackend(
526-
CeedOperatorInputRestrict_Cuda(op_input_fields[field], qf_input_fields[field], field, in_vec, active_e_vec, false, impl, request));
525+
CeedCallBackend(CeedOperatorInputRestrict_Cuda(op_input_fields[field], qf_input_fields[field], field, in_vec, active_e_vec, false, impl,
526+
request));
527527
CeedCallBackend(CeedOperatorInputBasis_Cuda(op_input_fields[field], qf_input_fields[field], field, in_vec, active_e_vec, num_elem, false, impl));
528528
}
529529

@@ -869,8 +869,8 @@ static int CeedOperatorApplyAddAtPoints_Cuda(CeedOperator op, CeedVector in_vec,
869869
for (CeedInt i = 0; i < num_input_fields; i++) {
870870
CeedInt field = impl->input_field_order[i];
871871

872-
CeedCallBackend(
873-
CeedOperatorInputRestrict_Cuda(op_input_fields[field], qf_input_fields[field], field, in_vec, active_e_vec, false, impl, request));
872+
CeedCallBackend(CeedOperatorInputRestrict_Cuda(op_input_fields[field], qf_input_fields[field], field, in_vec, active_e_vec, false, impl,
873+
request));
874874
CeedCallBackend(CeedOperatorInputBasisAtPoints_Cuda(op_input_fields[field], qf_input_fields[field], field, in_vec, active_e_vec, num_elem,
875875
num_points, false, false, impl));
876876
}
@@ -1015,8 +1015,8 @@ static inline int CeedOperatorLinearAssembleQFunctionCore_Cuda(CeedOperator op,
10151015
CeedSize q_size = (CeedSize)Q * num_elem;
10161016

10171017
CeedCallBackend(CeedVectorCreate(ceed, q_size, &active_inputs[num_active_in + field]));
1018-
CeedCallBackend(
1019-
CeedVectorSetArray(active_inputs[num_active_in + field], CEED_MEM_DEVICE, CEED_USE_POINTER, &q_vec_array[field * Q * num_elem]));
1018+
CeedCallBackend(CeedVectorSetArray(active_inputs[num_active_in + field], CEED_MEM_DEVICE, CEED_USE_POINTER,
1019+
&q_vec_array[field * Q * num_elem]));
10201020
}
10211021
num_active_in += size;
10221022
CeedCallBackend(CeedVectorRestoreArray(impl->q_vecs_in[i], &q_vec_array));
@@ -1881,8 +1881,8 @@ static int CeedOperatorLinearAssembleAddDiagonalAtPoints_Cuda(CeedOperator op, C
18811881
// Process inputs
18821882
for (CeedInt i = 0; i < num_input_fields; i++) {
18831883
CeedCallBackend(CeedOperatorInputRestrict_Cuda(op_input_fields[i], qf_input_fields[i], i, NULL, NULL, true, impl, request));
1884-
CeedCallBackend(
1885-
CeedOperatorInputBasisAtPoints_Cuda(op_input_fields[i], qf_input_fields[i], i, NULL, NULL, num_elem, num_points, true, false, impl));
1884+
CeedCallBackend(CeedOperatorInputBasisAtPoints_Cuda(op_input_fields[i], qf_input_fields[i], i, NULL, NULL, num_elem, num_points, true, false,
1885+
impl));
18861886
}
18871887

18881888
// Output pointers, as necessary
@@ -2003,8 +2003,8 @@ static int CeedOperatorLinearAssembleAddDiagonalAtPoints_Cuda(CeedOperator op, C
20032003

20042004
CeedCallBackend(CeedOperatorFieldGetBasis(op_output_fields[field_out], &basis));
20052005
if (impl->apply_add_basis_out[field_out]) {
2006-
CeedCallBackend(
2007-
CeedBasisApplyAddAtPoints(basis, num_elem, num_points, CEED_TRANSPOSE, eval_mode, impl->point_coords_elem, q_vec, e_vec));
2006+
CeedCallBackend(CeedBasisApplyAddAtPoints(basis, num_elem, num_points, CEED_TRANSPOSE, eval_mode, impl->point_coords_elem, q_vec,
2007+
e_vec));
20082008
} else {
20092009
CeedCallBackend(CeedBasisApplyAtPoints(basis, num_elem, num_points, CEED_TRANSPOSE, eval_mode, impl->point_coords_elem, q_vec, e_vec));
20102010
}
@@ -2087,8 +2087,8 @@ int CeedOperatorCreate_Cuda(CeedOperator op) {
20872087
CeedCallBackend(CeedSetBackendFunction(ceed, "Operator", op, "LinearAssembleQFunction", CeedOperatorLinearAssembleQFunction_Cuda));
20882088
CeedCallBackend(CeedSetBackendFunction(ceed, "Operator", op, "LinearAssembleQFunctionUpdate", CeedOperatorLinearAssembleQFunctionUpdate_Cuda));
20892089
CeedCallBackend(CeedSetBackendFunction(ceed, "Operator", op, "LinearAssembleAddDiagonal", CeedOperatorLinearAssembleAddDiagonal_Cuda));
2090-
CeedCallBackend(
2091-
CeedSetBackendFunction(ceed, "Operator", op, "LinearAssembleAddPointBlockDiagonal", CeedOperatorLinearAssembleAddPointBlockDiagonal_Cuda));
2090+
CeedCallBackend(CeedSetBackendFunction(ceed, "Operator", op, "LinearAssembleAddPointBlockDiagonal",
2091+
CeedOperatorLinearAssembleAddPointBlockDiagonal_Cuda));
20922092
CeedCallBackend(CeedSetBackendFunction(ceed, "Operator", op, "LinearAssembleSingle", CeedOperatorAssembleSingle_Cuda));
20932093
CeedCallBackend(CeedSetBackendFunction(ceed, "Operator", op, "ApplyAdd", CeedOperatorApplyAdd_Cuda));
20942094
CeedCallBackend(CeedSetBackendFunction(ceed, "Operator", op, "Destroy", CeedOperatorDestroy_Cuda));

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -652,8 +652,8 @@ int CeedElemRestrictionCreate_Cuda(CeedMemType mem_type, CeedCopyMode copy_mode,
652652
CeedCallBackend(CeedSetBackendFunction(ceed, "ElemRestriction", rstr, "GetOrientations", CeedElemRestrictionGetOrientations_Cuda));
653653
CeedCallBackend(CeedSetBackendFunction(ceed, "ElemRestriction", rstr, "GetCurlOrientations", CeedElemRestrictionGetCurlOrientations_Cuda));
654654
if (rstr_type == CEED_RESTRICTION_POINTS) {
655-
CeedCallBackend(
656-
CeedSetBackendFunction(ceed, "ElemRestriction", rstr, "GetAtPointsElementOffset", CeedElemRestrictionGetAtPointsElementOffset_Cuda));
655+
CeedCallBackend(CeedSetBackendFunction(ceed, "ElemRestriction", rstr, "GetAtPointsElementOffset",
656+
CeedElemRestrictionGetAtPointsElementOffset_Cuda));
657657
}
658658
CeedCallBackend(CeedSetBackendFunction(ceed, "ElemRestriction", rstr, "Destroy", CeedElemRestrictionDestroy_Cuda));
659659
CeedCallBackend(CeedDestroy(&ceed));

0 commit comments

Comments
 (0)