Skip to content

Commit 329ec17

Browse files
jeremyltjeremylt
committed
style
1 parent 2c0d800 commit 329ec17

13 files changed

Lines changed: 84 additions & 84 deletions

File tree

‎backends/cuda-gen/ceed-cuda-gen-operator-build.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -620,9 +620,9 @@ static int CeedOperatorBuildKernelBasis_Cuda_gen(std::ostringstream &code, CeedO
620620
code << tab << "// Nothing to do AtPoints\n";
621621
} else {
622622
CeedBasis_Cuda_shared *basis_data;
623-
std::string function_name = is_tensor
624-
? ((dim == 1 ? "Weight" : "WeightTensor") + std::to_string(dim) + "d" + (is_all_tensor ? "" : "Flattened"))
625-
: "WeightNonTensor";
623+
std::string function_name = is_tensor
624+
? ((dim == 1 ? "Weight" : "WeightTensor") + std::to_string(dim) + "d" + (is_all_tensor ? "" : "Flattened"))
625+
: "WeightNonTensor";
626626

627627
code << tab << "CeedScalar r_q" << var_suffix << "[" << (is_all_tensor && (dim >= 3) ? Q_name : "1") << "];\n";
628628
CeedCallBackend(CeedBasisGetData(basis, &basis_data));

‎backends/hip-gen/ceed-hip-gen-operator-build.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -648,9 +648,9 @@ static int CeedOperatorBuildKernelBasis_Hip_gen(std::ostringstream &code, CeedOp
648648
code << tab << "// Nothing to do AtPoints\n";
649649
} else {
650650
CeedBasis_Hip_shared *basis_data;
651-
std::string function_name = is_tensor
652-
? ((dim == 1 ? "Weight" : "WeightTensor") + std::to_string(dim) + "d" + (is_all_tensor ? "" : "Flattened"))
653-
: "WeightNonTensor";
651+
std::string function_name = is_tensor
652+
? ((dim == 1 ? "Weight" : "WeightTensor") + std::to_string(dim) + "d" + (is_all_tensor ? "" : "Flattened"))
653+
: "WeightNonTensor";
654654

655655
code << tab << "CeedScalar r_q" << var_suffix << "[" << (is_all_tensor && (dim >= 3) ? Q_name : "1") << "];\n";
656656
CeedCallBackend(CeedBasisGetData(basis, &basis_data));

‎backends/sycl-ref/ceed-sycl-ref-operator.sycl.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -998,11 +998,11 @@ static int CeedOperatorLinearAssembleAddPointBlockDiagonal_Sycl(CeedOperator op,
998998
// Single operator assembly setup
999999
//------------------------------------------------------------------------------
10001000
static int CeedOperatorAssembleSingleSetup_Sycl(CeedOperator op) {
1001-
Ceed ceed;
1002-
CeedInt num_input_fields, num_output_fields, num_eval_mode_in = 0, dim = 1, num_B_in_mats_to_load = 0, size_B_in = 0, num_eval_mode_out = 0,
1003-
num_B_out_mats_to_load = 0, size_B_out = 0, num_qpts = 0, elem_size = 0, num_elem, num_comp,
1004-
mat_start = 0;
1005-
CeedEvalMode *eval_mode_in = NULL, *eval_mode_out = NULL;
1001+
Ceed ceed;
1002+
CeedInt num_input_fields, num_output_fields, num_eval_mode_in = 0, dim = 1, num_B_in_mats_to_load = 0, size_B_in = 0, num_eval_mode_out = 0,
1003+
num_B_out_mats_to_load = 0, size_B_out = 0, num_qpts = 0, elem_size = 0, num_elem, num_comp,
1004+
mat_start = 0;
1005+
CeedEvalMode *eval_mode_in = NULL, *eval_mode_out = NULL;
10061006
const CeedScalar *interp_in, *grad_in;
10071007
CeedElemRestriction rstr_in = NULL, rstr_out = NULL;
10081008
CeedBasis basis_in = NULL, basis_out = NULL;

‎backends/xsmm/ceed-xsmm-tensor.c‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@ static int CeedTensorContractApply_Xsmm(CeedTensorContract contract, CeedInt A,
1818
CeedTransposeMode t_mode, const CeedInt add, const CeedScalar *restrict u, CeedScalar *restrict v) {
1919
if (C == 1) {
2020
// Build or query the required kernel
21-
const int flags_t = LIBXSMM_GEMM_FLAGS(!t_mode ? 'T' : 'N', 'N');
22-
const int flags_ab = (!add) ? LIBXSMM_GEMM_FLAG_BETA_0 : LIBXSMM_BASIC_GEMM_FLAG_NONE;
23-
const int flags = (flags_t | flags_ab);
24-
const libxsmm_gemm_shape gemm_shape = (CEED_SCALAR_TYPE == CEED_SCALAR_FP64)
25-
? libxsmm_create_gemm_shape(J, A, B, !t_mode ? B : J, B, J, LIBXSMM_DATATYPE_F64, LIBXSMM_DATATYPE_F64,
26-
LIBXSMM_DATATYPE_F64, LIBXSMM_DATATYPE_F64)
27-
: libxsmm_create_gemm_shape(J, A, B, !t_mode ? B : J, B, J, LIBXSMM_DATATYPE_F32, LIBXSMM_DATATYPE_F32,
28-
LIBXSMM_DATATYPE_F32, LIBXSMM_DATATYPE_F32);
29-
const libxsmm_gemmfunction kernel = libxsmm_dispatch_gemm(gemm_shape, (libxsmm_bitfield)(flags), (libxsmm_bitfield)LIBXSMM_GEMM_PREFETCH_NONE);
21+
const int flags_t = LIBXSMM_GEMM_FLAGS(!t_mode ? 'T' : 'N', 'N');
22+
const int flags_ab = (!add) ? LIBXSMM_GEMM_FLAG_BETA_0 : LIBXSMM_BASIC_GEMM_FLAG_NONE;
23+
const int flags = (flags_t | flags_ab);
24+
const libxsmm_gemm_shape gemm_shape = (CEED_SCALAR_TYPE == CEED_SCALAR_FP64)
25+
? libxsmm_create_gemm_shape(J, A, B, !t_mode ? B : J, B, J, LIBXSMM_DATATYPE_F64, LIBXSMM_DATATYPE_F64,
26+
LIBXSMM_DATATYPE_F64, LIBXSMM_DATATYPE_F64)
27+
: libxsmm_create_gemm_shape(J, A, B, !t_mode ? B : J, B, J, LIBXSMM_DATATYPE_F32, LIBXSMM_DATATYPE_F32,
28+
LIBXSMM_DATATYPE_F32, LIBXSMM_DATATYPE_F32);
29+
const libxsmm_gemmfunction kernel = libxsmm_dispatch_gemm(gemm_shape, (libxsmm_bitfield)(flags), (libxsmm_bitfield)LIBXSMM_GEMM_PREFETCH_NONE);
3030
libxsmm_gemm_param gemm_param;
3131

3232
CeedCheck(kernel, CeedTensorContractReturnCeed(contract), CEED_ERROR_BACKEND, "LIBXSMM kernel failed to build.");
@@ -38,15 +38,15 @@ static int CeedTensorContractApply_Xsmm(CeedTensorContract contract, CeedInt A,
3838
kernel(&gemm_param);
3939
} else {
4040
// Build or query the required kernel
41-
const int flags_t = LIBXSMM_GEMM_FLAGS('N', t_mode ? 'T' : 'N');
42-
const int flags_ab = (!add) ? LIBXSMM_GEMM_FLAG_BETA_0 : LIBXSMM_BASIC_GEMM_FLAG_NONE;
43-
const int flags = (flags_t | flags_ab);
44-
const libxsmm_gemm_shape gemm_shape = (CEED_SCALAR_TYPE == CEED_SCALAR_FP64)
45-
? libxsmm_create_gemm_shape(C, J, B, C, !t_mode ? B : J, C, LIBXSMM_DATATYPE_F64, LIBXSMM_DATATYPE_F64,
46-
LIBXSMM_DATATYPE_F64, LIBXSMM_DATATYPE_F64)
47-
: libxsmm_create_gemm_shape(C, J, B, C, !t_mode ? B : J, C, LIBXSMM_DATATYPE_F32, LIBXSMM_DATATYPE_F32,
48-
LIBXSMM_DATATYPE_F32, LIBXSMM_DATATYPE_F32);
49-
const libxsmm_gemmfunction kernel = libxsmm_dispatch_gemm(gemm_shape, (libxsmm_bitfield)(flags), (libxsmm_bitfield)LIBXSMM_GEMM_PREFETCH_NONE);
41+
const int flags_t = LIBXSMM_GEMM_FLAGS('N', t_mode ? 'T' : 'N');
42+
const int flags_ab = (!add) ? LIBXSMM_GEMM_FLAG_BETA_0 : LIBXSMM_BASIC_GEMM_FLAG_NONE;
43+
const int flags = (flags_t | flags_ab);
44+
const libxsmm_gemm_shape gemm_shape = (CEED_SCALAR_TYPE == CEED_SCALAR_FP64)
45+
? libxsmm_create_gemm_shape(C, J, B, C, !t_mode ? B : J, C, LIBXSMM_DATATYPE_F64, LIBXSMM_DATATYPE_F64,
46+
LIBXSMM_DATATYPE_F64, LIBXSMM_DATATYPE_F64)
47+
: libxsmm_create_gemm_shape(C, J, B, C, !t_mode ? B : J, C, LIBXSMM_DATATYPE_F32, LIBXSMM_DATATYPE_F32,
48+
LIBXSMM_DATATYPE_F32, LIBXSMM_DATATYPE_F32);
49+
const libxsmm_gemmfunction kernel = libxsmm_dispatch_gemm(gemm_shape, (libxsmm_bitfield)(flags), (libxsmm_bitfield)LIBXSMM_GEMM_PREFETCH_NONE);
5050
libxsmm_gemm_param gemm_param;
5151

5252
CeedCheck(kernel, CeedTensorContractReturnCeed(contract), CEED_ERROR_BACKEND, "LIBXSMM kernel failed to build.");

‎examples/fluids/qfunctions/riemann_solver.h‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -238,9 +238,9 @@ CEED_QFUNCTION_HELPER StateConservative RiemannFlux_HLLC_Star_fwd(NewtonianIdeal
238238
StateConservative dF_side, const CeedScalar normal[3], CeedScalar u_side,
239239
CeedScalar du_side, CeedScalar s_side, CeedScalar ds_side, CeedScalar s_star,
240240
CeedScalar ds_star) {
241-
CeedScalar fact = side.U.density * (s_side - u_side) / (s_side - s_star);
242-
CeedScalar dfact = (side.U.density * (ds_side - du_side) + dside.U.density * (s_side - u_side)) / (s_side - s_star) //
243-
- fact / (s_side - s_star) * (ds_side - ds_star);
241+
CeedScalar fact = side.U.density * (s_side - u_side) / (s_side - s_star);
242+
CeedScalar dfact = (side.U.density * (ds_side - du_side) + dside.U.density * (s_side - u_side)) / (s_side - s_star) //
243+
- fact / (s_side - s_star) * (ds_side - ds_star);
244244
CeedScalar denom = side.U.density * (s_side - u_side);
245245
CeedScalar ddenom = side.U.density * (ds_side - du_side) + dside.U.density * (s_side - u_side);
246246

@@ -317,15 +317,15 @@ CEED_QFUNCTION_HELPER StateConservative RiemannFlux_HLLC_fwd(NewtonianIdealGasCo
317317
// Contact wave speed; Toro (10.37)
318318
CeedScalar rhou_left = left.U.density * u_left, drhou_left = left.U.density * du_left + dleft.U.density * u_left;
319319
CeedScalar rhou_right = right.U.density * u_right, drhou_right = right.U.density * du_right + dright.U.density * u_right;
320-
CeedScalar numer = right.Y.pressure - left.Y.pressure //
321-
+ rhou_left * (s_left - u_left) //
322-
- rhou_right * (s_right - u_right);
323-
CeedScalar dnumer = dright.Y.pressure - dleft.Y.pressure //
324-
+ rhou_left * (ds_left - du_left) + drhou_left * (s_left - u_left) //
325-
- rhou_right * (ds_right - du_right) - drhou_right * (s_right - u_right);
326-
CeedScalar denom = left.U.density * (s_left - u_left) - right.U.density * (s_right - u_right);
327-
CeedScalar ddenom = left.U.density * (ds_left - du_left) + dleft.U.density * (s_left - u_left) //
328-
- right.U.density * (ds_right - du_right) - dright.U.density * (s_right - u_right);
320+
CeedScalar numer = right.Y.pressure - left.Y.pressure //
321+
+ rhou_left * (s_left - u_left) //
322+
- rhou_right * (s_right - u_right);
323+
CeedScalar dnumer = dright.Y.pressure - dleft.Y.pressure //
324+
+ rhou_left * (ds_left - du_left) + drhou_left * (s_left - u_left) //
325+
- rhou_right * (ds_right - du_right) - drhou_right * (s_right - u_right);
326+
CeedScalar denom = left.U.density * (s_left - u_left) - right.U.density * (s_right - u_right);
327+
CeedScalar ddenom = left.U.density * (ds_left - du_left) + dleft.U.density * (s_left - u_left) //
328+
- right.U.density * (ds_right - du_right) - dright.U.density * (s_right - u_right);
329329
CeedScalar s_star = numer / denom;
330330
CeedScalar ds_star = dnumer / denom - numer / Square(denom) * ddenom;
331331

‎examples/nek/bps/bps.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ CEED_QFUNCTION(diffsetupf)(void *ctx, CeedInt Q, const CeedScalar *const *in, Ce
9090
const CeedScalar k[3] = {1., 2., 3.};
9191
const CeedScalar rho = w[i] * (J11 * A11 + J21 * A12 + J31 * A13);
9292
rhs[i] = rho * M_PI * M_PI * (k[0] * k[0] + k[1] * k[1] + k[2] * k[2]) * sin(M_PI * (c[0] + k[0] * x[i + Q * 0])) *
93-
sin(M_PI * (c[1] + k[1] * x[i + Q * 1])) * sin(M_PI * (c[2] + k[2] * x[i + Q * 2]));
93+
sin(M_PI * (c[1] + k[1] * x[i + Q * 1])) * sin(M_PI * (c[2] + k[2] * x[i + Q * 2]));
9494
} // End of Quadrature Point Loop
9595
return 0;
9696
}

‎examples/petsc/bpsraw.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -336,11 +336,11 @@ static PetscErrorCode ComputeErrorMax(OperatorApplyContext op_apply_ctx, CeedOpe
336336
}
337337

338338
int main(int argc, char **argv) {
339-
MPI_Comm comm;
340-
char ceed_resource[PETSC_MAX_PATH_LEN] = "/cpu/self";
341-
double my_rt_start, my_rt, rt_min, rt_max;
342-
PetscInt degree, q_extra, local_nodes, local_elem, mesh_elem[3], m_nodes[3], p[3], i_rank[3], l_nodes[3], l_size, num_comp_u = 1,
343-
ksp_max_it_clip[2];
339+
MPI_Comm comm;
340+
char ceed_resource[PETSC_MAX_PATH_LEN] = "/cpu/self";
341+
double my_rt_start, my_rt, rt_min, rt_max;
342+
PetscInt degree, q_extra, local_nodes, local_elem, mesh_elem[3], m_nodes[3], p[3], i_rank[3], l_nodes[3], l_size, num_comp_u = 1,
343+
ksp_max_it_clip[2];
344344
PetscScalar *r;
345345
PetscBool test_mode, benchmark_mode, write_solution;
346346
PetscMPIInt size, rank;

‎examples/petsc/multigrid.c‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -46,21 +46,21 @@ const char help[] = "Solve CEED BPs using p-multigrid with PETSc and DMPlex\n";
4646
#include "include/structs.h"
4747

4848
int main(int argc, char **argv) {
49-
MPI_Comm comm;
50-
char filename[PETSC_MAX_PATH_LEN], ceed_resource[PETSC_MAX_PATH_LEN] = "/cpu/self";
51-
double my_rt_start, my_rt, rt_min, rt_max;
52-
PetscInt degree = 3, q_extra, *l_size, *xl_size, *g_size, dim = 3, fine_level, mesh_elem[3] = {3, 3, 3}, num_comp_u = 1, num_levels = degree,
53-
*level_degrees;
54-
PetscScalar eps = 1.0;
55-
PetscBool test_mode, benchmark_mode, read_mesh, write_solution, simplex;
56-
PetscLogStage solve_stage;
57-
PetscLogEvent assemble_event;
58-
DM *dm, dm_orig;
59-
KSP ksp;
60-
PC pc;
61-
Mat *mat_O, *mat_pr, mat_coarse;
62-
Vec *X, *X_loc, *mult, rhs, rhs_loc;
63-
PetscMemType mem_type;
49+
MPI_Comm comm;
50+
char filename[PETSC_MAX_PATH_LEN], ceed_resource[PETSC_MAX_PATH_LEN] = "/cpu/self";
51+
double my_rt_start, my_rt, rt_min, rt_max;
52+
PetscInt degree = 3, q_extra, *l_size, *xl_size, *g_size, dim = 3, fine_level, mesh_elem[3] = {3, 3, 3}, num_comp_u = 1, num_levels = degree,
53+
*level_degrees;
54+
PetscScalar eps = 1.0;
55+
PetscBool test_mode, benchmark_mode, read_mesh, write_solution, simplex;
56+
PetscLogStage solve_stage;
57+
PetscLogEvent assemble_event;
58+
DM *dm, dm_orig;
59+
KSP ksp;
60+
PC pc;
61+
Mat *mat_O, *mat_pr, mat_coarse;
62+
Vec *X, *X_loc, *mult, rhs, rhs_loc;
63+
PetscMemType mem_type;
6464
OperatorApplyContext *op_apply_ctx, op_error_ctx;
6565
ProlongRestrContext *pr_restr_ctx;
6666
Ceed ceed;

‎interface/ceed-fortran.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ CEED_EXTERN void fCeedElemRestrictionCreateStrided(int *ceed, int *nelements, in
297297
}
298298

299299
CeedElemRestriction *elemrestriction_ = &CeedElemRestriction_dict[CeedElemRestriction_count];
300-
*err = CeedElemRestrictionCreateStrided(Ceed_dict[*ceed], *nelements, *esize, *num_comp, *lsize,
300+
*err = CeedElemRestrictionCreateStrided(Ceed_dict[*ceed], *nelements, *esize, *num_comp, *lsize,
301301
*strides == FORTRAN_STRIDES_BACKEND ? CEED_STRIDES_BACKEND : strides, elemrestriction_);
302302

303303
if (*err == 0) {

‎interface/ceed-jit-tools.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -218,9 +218,9 @@ int CeedLoadSourceToInitializedBuffer(Ceed ceed, const char *source_file_path, C
218218
bool is_local_header = is_hash_include && next_quote && (next_new_line - next_quote > 0);
219219
char *next_left_chevron = strchr(first_hash, '<');
220220
bool is_ceed_header = next_left_chevron && (next_new_line - next_left_chevron > 0) &&
221-
(!strncmp(next_left_chevron, "<ceed/jit-source/", 17) || !strncmp(next_left_chevron, "<ceed/types.h>", 14) ||
222-
!strncmp(next_left_chevron, "<ceed/ceed-f32.h>", 17) || !strncmp(next_left_chevron, "<ceed/ceed-f64.h>", 17));
223-
bool is_std_header =
221+
(!strncmp(next_left_chevron, "<ceed/jit-source/", 17) || !strncmp(next_left_chevron, "<ceed/types.h>", 14) ||
222+
!strncmp(next_left_chevron, "<ceed/ceed-f32.h>", 17) || !strncmp(next_left_chevron, "<ceed/ceed-f64.h>", 17));
223+
bool is_std_header =
224224
next_left_chevron && (next_new_line - next_left_chevron > 0) &&
225225
(!strncmp(next_left_chevron, "<std", 4) || !strncmp(next_left_chevron, "<math.h>", 8) || !strncmp(next_left_chevron, "<ceed", 5));
226226

0 commit comments

Comments
 (0)