Skip to content

Commit e125156

Browse files
jeremyltjeremylt
committed
backend - update CeedOperatorAssembleSingle
1 parent ca5fd1f commit e125156

File tree

7 files changed

+21
-21
lines changed

7 files changed

+21
-21
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -695,7 +695,7 @@ static int CeedOperatorLinearAssembleAddDiagonalAtPoints_Cuda_gen(CeedOperator o
695695
//------------------------------------------------------------------------------
696696
// AtPoints full assembly
697697
//------------------------------------------------------------------------------
698-
static int CeedSingleOperatorAssembleAtPoints_Cuda_gen(CeedOperator op, CeedInt offset, CeedVector assembled) {
698+
static int CeedOperatorAssembleSingleAtPoints_Cuda_gen(CeedOperator op, CeedInt offset, CeedVector assembled) {
699699
Ceed ceed;
700700
CeedOperator_Cuda_gen *data;
701701

@@ -851,7 +851,7 @@ static int CeedSingleOperatorAssembleAtPoints_Cuda_gen(CeedOperator op, CeedInt
851851

852852
CeedDebug(CeedOperatorReturnCeed(op), "\nFalling back to /gpu/cuda/ref CeedOperator for AtPoints SingleOperatorAssemble\n");
853853
CeedCallBackend(CeedOperatorGetFallback(op, &op_fallback));
854-
CeedCallBackend(CeedSingleOperatorAssemble(op_fallback, offset, assembled));
854+
CeedCallBackend(CeedOperatorAssembleSingle(op_fallback, offset, assembled));
855855
return CEED_ERROR_SUCCESS;
856856
}
857857
return CEED_ERROR_SUCCESS;
@@ -878,7 +878,7 @@ int CeedOperatorCreate_Cuda_gen(CeedOperator op) {
878878
if (is_at_points) {
879879
CeedCallBackend(
880880
CeedSetBackendFunction(ceed, "Operator", op, "LinearAssembleAddDiagonal", CeedOperatorLinearAssembleAddDiagonalAtPoints_Cuda_gen));
881-
CeedCallBackend(CeedSetBackendFunction(ceed, "Operator", op, "LinearAssembleSingle", CeedSingleOperatorAssembleAtPoints_Cuda_gen));
881+
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));

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1501,7 +1501,7 @@ static int CeedOperatorLinearAssembleAddPointBlockDiagonal_Cuda(CeedOperator op,
15011501
//------------------------------------------------------------------------------
15021502
// Single Operator Assembly Setup
15031503
//------------------------------------------------------------------------------
1504-
static int CeedSingleOperatorAssembleSetup_Cuda(CeedOperator op, CeedInt use_ceedsize_idx) {
1504+
static int CeedOperatorAssembleSingleSetup_Cuda(CeedOperator op, CeedInt use_ceedsize_idx) {
15051505
Ceed ceed;
15061506
Ceed_Cuda *cuda_data;
15071507
CeedInt num_input_fields, num_output_fields, num_eval_modes_in = 0, num_eval_modes_out = 0;
@@ -1707,7 +1707,7 @@ static int CeedSingleOperatorAssembleSetup_Cuda(CeedOperator op, CeedInt use_cee
17071707
// (could have multiple basis eval modes).
17081708
// TODO: allow multiple active input restrictions/basis objects
17091709
//------------------------------------------------------------------------------
1710-
static int CeedSingleOperatorAssemble_Cuda(CeedOperator op, CeedInt offset, CeedVector values) {
1710+
static int CeedOperatorAssembleSingle_Cuda(CeedOperator op, CeedInt offset, CeedVector values) {
17111711
Ceed ceed;
17121712
CeedSize values_length = 0, assembled_qf_length = 0;
17131713
CeedInt use_ceedsize_idx = 0, num_elem_in, num_elem_out, elem_size_in, elem_size_out;
@@ -1733,7 +1733,7 @@ static int CeedSingleOperatorAssemble_Cuda(CeedOperator op, CeedInt offset, Ceed
17331733
if ((values_length > INT_MAX) || (assembled_qf_length > INT_MAX)) use_ceedsize_idx = 1;
17341734

17351735
// Setup
1736-
if (!impl->asmb) CeedCallBackend(CeedSingleOperatorAssembleSetup_Cuda(op, use_ceedsize_idx));
1736+
if (!impl->asmb) CeedCallBackend(CeedOperatorAssembleSingleSetup_Cuda(op, use_ceedsize_idx));
17371737
CeedOperatorAssemble_Cuda *asmb = impl->asmb;
17381738

17391739
assert(asmb != NULL);
@@ -2077,7 +2077,7 @@ int CeedOperatorCreate_Cuda(CeedOperator op) {
20772077
CeedCallBackend(CeedSetBackendFunction(ceed, "Operator", op, "LinearAssembleAddDiagonal", CeedOperatorLinearAssembleAddDiagonal_Cuda));
20782078
CeedCallBackend(
20792079
CeedSetBackendFunction(ceed, "Operator", op, "LinearAssembleAddPointBlockDiagonal", CeedOperatorLinearAssembleAddPointBlockDiagonal_Cuda));
2080-
CeedCallBackend(CeedSetBackendFunction(ceed, "Operator", op, "LinearAssembleSingle", CeedSingleOperatorAssemble_Cuda));
2080+
CeedCallBackend(CeedSetBackendFunction(ceed, "Operator", op, "LinearAssembleSingle", CeedOperatorAssembleSingle_Cuda));
20812081
CeedCallBackend(CeedSetBackendFunction(ceed, "Operator", op, "ApplyAdd", CeedOperatorApplyAdd_Cuda));
20822082
CeedCallBackend(CeedSetBackendFunction(ceed, "Operator", op, "Destroy", CeedOperatorDestroy_Cuda));
20832083
CeedCallBackend(CeedDestroy(&ceed));

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -684,7 +684,7 @@ static int CeedOperatorLinearAssembleAddDiagonalAtPoints_Hip_gen(CeedOperator op
684684
//------------------------------------------------------------------------------
685685
// AtPoints full assembly
686686
//------------------------------------------------------------------------------
687-
static int CeedSingleOperatorAssembleAtPoints_Hip_gen(CeedOperator op, CeedInt offset, CeedVector assembled) {
687+
static int CeedOperatorAssembleSingleAtPoints_Hip_gen(CeedOperator op, CeedInt offset, CeedVector assembled) {
688688
Ceed ceed;
689689
CeedOperator_Hip_gen *data;
690690

@@ -860,7 +860,7 @@ static int CeedSingleOperatorAssembleAtPoints_Hip_gen(CeedOperator op, CeedInt o
860860

861861
CeedDebug(CeedOperatorReturnCeed(op), "\nFalling back to /gpu/hip/ref CeedOperator for AtPoints SingleOperatorAssemble\n");
862862
CeedCallBackend(CeedOperatorGetFallback(op, &op_fallback));
863-
CeedCallBackend(CeedSingleOperatorAssemble(op_fallback, offset, assembled));
863+
CeedCallBackend(CeedOperatorAssembleSingle(op_fallback, offset, assembled));
864864
return CEED_ERROR_SUCCESS;
865865
}
866866
return CEED_ERROR_SUCCESS;
@@ -886,7 +886,7 @@ int CeedOperatorCreate_Hip_gen(CeedOperator op) {
886886
CeedCall(CeedOperatorIsAtPoints(op, &is_at_points));
887887
if (is_at_points) {
888888
CeedCallBackend(CeedSetBackendFunction(ceed, "Operator", op, "LinearAssembleAddDiagonal", CeedOperatorLinearAssembleAddDiagonalAtPoints_Hip_gen));
889-
CeedCallBackend(CeedSetBackendFunction(ceed, "Operator", op, "LinearAssembleSingle", CeedSingleOperatorAssembleAtPoints_Hip_gen));
889+
CeedCallBackend(CeedSetBackendFunction(ceed, "Operator", op, "LinearAssembleSingle", CeedOperatorAssembleSingleAtPoints_Hip_gen));
890890
}
891891
if (!is_at_points) {
892892
CeedCallBackend(CeedSetBackendFunction(ceed, "Operator", op, "LinearAssembleQFunction", CeedOperatorLinearAssembleQFunction_Hip_gen));

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1498,7 +1498,7 @@ static int CeedOperatorLinearAssembleAddPointBlockDiagonal_Hip(CeedOperator op,
14981498
//------------------------------------------------------------------------------
14991499
// Single Operator Assembly Setup
15001500
//------------------------------------------------------------------------------
1501-
static int CeedSingleOperatorAssembleSetup_Hip(CeedOperator op, CeedInt use_ceedsize_idx) {
1501+
static int CeedOperatorAssembleSingleSetup_Hip(CeedOperator op, CeedInt use_ceedsize_idx) {
15021502
Ceed ceed;
15031503
Ceed_Hip *hip_data;
15041504
CeedInt num_input_fields, num_output_fields, num_eval_modes_in = 0, num_eval_modes_out = 0;
@@ -1704,7 +1704,7 @@ static int CeedSingleOperatorAssembleSetup_Hip(CeedOperator op, CeedInt use_ceed
17041704
// (could have multiple basis eval modes).
17051705
// TODO: allow multiple active input restrictions/basis objects
17061706
//------------------------------------------------------------------------------
1707-
static int CeedSingleOperatorAssemble_Hip(CeedOperator op, CeedInt offset, CeedVector values) {
1707+
static int CeedOperatorAssembleSingle_Hip(CeedOperator op, CeedInt offset, CeedVector values) {
17081708
Ceed ceed;
17091709
CeedSize values_length = 0, assembled_qf_length = 0;
17101710
CeedInt use_ceedsize_idx = 0, num_elem_in, num_elem_out, elem_size_in, elem_size_out;
@@ -1730,7 +1730,7 @@ static int CeedSingleOperatorAssemble_Hip(CeedOperator op, CeedInt offset, CeedV
17301730
if ((values_length > INT_MAX) || (assembled_qf_length > INT_MAX)) use_ceedsize_idx = 1;
17311731

17321732
// Setup
1733-
if (!impl->asmb) CeedCallBackend(CeedSingleOperatorAssembleSetup_Hip(op, use_ceedsize_idx));
1733+
if (!impl->asmb) CeedCallBackend(CeedOperatorAssembleSingleSetup_Hip(op, use_ceedsize_idx));
17341734
CeedOperatorAssemble_Hip *asmb = impl->asmb;
17351735

17361736
assert(asmb != NULL);
@@ -2076,7 +2076,7 @@ int CeedOperatorCreate_Hip(CeedOperator op) {
20762076
CeedCallBackend(CeedSetBackendFunction(ceed, "Operator", op, "LinearAssembleAddDiagonal", CeedOperatorLinearAssembleAddDiagonal_Hip));
20772077
CeedCallBackend(
20782078
CeedSetBackendFunction(ceed, "Operator", op, "LinearAssembleAddPointBlockDiagonal", CeedOperatorLinearAssembleAddPointBlockDiagonal_Hip));
2079-
CeedCallBackend(CeedSetBackendFunction(ceed, "Operator", op, "LinearAssembleSingle", CeedSingleOperatorAssemble_Hip));
2079+
CeedCallBackend(CeedSetBackendFunction(ceed, "Operator", op, "LinearAssembleSingle", CeedOperatorAssembleSingle_Hip));
20802080
CeedCallBackend(CeedSetBackendFunction(ceed, "Operator", op, "ApplyAdd", CeedOperatorApplyAdd_Hip));
20812081
CeedCallBackend(CeedSetBackendFunction(ceed, "Operator", op, "Destroy", CeedOperatorDestroy_Hip));
20822082
CeedCallBackend(CeedDestroy(&ceed));

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1527,7 +1527,7 @@ static int CeedOperatorLinearAssembleAddDiagonalAtPoints_Ref(CeedOperator op, Ce
15271527
//------------------------------------------------------------------------------
15281528
// Assemble Operator AtPoints
15291529
//------------------------------------------------------------------------------
1530-
static int CeedSingleOperatorAssembleAtPoints_Ref(CeedOperator op, CeedInt offset, CeedVector values) {
1530+
static int CeedOperatorAssembleSingleAtPoints_Ref(CeedOperator op, CeedInt offset, CeedVector values) {
15311531
CeedInt num_points_offset = 0, num_input_fields, num_output_fields, num_elem, num_comp_active = 1;
15321532
CeedScalar *e_data[2 * CEED_FIELD_MAX] = {0}, *assembled;
15331533
Ceed ceed;
@@ -1798,7 +1798,7 @@ int CeedOperatorCreateAtPoints_Ref(CeedOperator op) {
17981798
CeedCallBackend(
17991799
CeedSetBackendFunction(ceed, "Operator", op, "LinearAssembleQFunctionUpdate", CeedOperatorLinearAssembleQFunctionAtPointsUpdate_Ref));
18001800
CeedCallBackend(CeedSetBackendFunction(ceed, "Operator", op, "LinearAssembleAddDiagonal", CeedOperatorLinearAssembleAddDiagonalAtPoints_Ref));
1801-
CeedCallBackend(CeedSetBackendFunction(ceed, "Operator", op, "LinearAssembleSingle", CeedSingleOperatorAssembleAtPoints_Ref));
1801+
CeedCallBackend(CeedSetBackendFunction(ceed, "Operator", op, "LinearAssembleSingle", CeedOperatorAssembleSingleAtPoints_Ref));
18021802
CeedCallBackend(CeedSetBackendFunction(ceed, "Operator", op, "ApplyAdd", CeedOperatorApplyAddAtPoints_Ref));
18031803
CeedCallBackend(CeedSetBackendFunction(ceed, "Operator", op, "Destroy", CeedOperatorDestroy_Ref));
18041804
CeedCallBackend(CeedDestroy(&ceed));

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -997,7 +997,7 @@ static int CeedOperatorLinearAssembleAddPointBlockDiagonal_Sycl(CeedOperator op,
997997
//------------------------------------------------------------------------------
998998
// Single operator assembly setup
999999
//------------------------------------------------------------------------------
1000-
static int CeedSingleOperatorAssembleSetup_Sycl(CeedOperator op) {
1000+
static int CeedOperatorAssembleSingleSetup_Sycl(CeedOperator op) {
10011001
Ceed ceed;
10021002
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,
10031003
num_B_out_mats_to_load = 0, size_B_out = 0, num_qpts = 0, elem_size = 0, num_elem, num_comp,
@@ -1337,7 +1337,7 @@ static int CeedOperatorLinearAssembleFallback_Sycl(sycl::queue &sycl_queue, cons
13371337
// input restriction/basis per operator (could have multiple basis eval modes).
13381338
// TODO: allow multiple active input restrictions/basis objects
13391339
//------------------------------------------------------------------------------
1340-
static int CeedSingleOperatorAssemble_Sycl(CeedOperator op, CeedInt offset, CeedVector values) {
1340+
static int CeedOperatorAssembleSingle_Sycl(CeedOperator op, CeedInt offset, CeedVector values) {
13411341
Ceed ceed;
13421342
Ceed_Sycl *sycl_data;
13431343
CeedScalar *values_array;
@@ -1353,7 +1353,7 @@ static int CeedSingleOperatorAssemble_Sycl(CeedOperator op, CeedInt offset, Ceed
13531353

13541354
// Setup
13551355
if (!impl->asmb) {
1356-
CeedCallBackend(CeedSingleOperatorAssembleSetup_Sycl(op));
1356+
CeedCallBackend(CeedOperatorAssembleSingleSetup_Sycl(op));
13571357
assert(impl->asmb != NULL);
13581358
}
13591359

@@ -1397,7 +1397,7 @@ int CeedOperatorCreate_Sycl(CeedOperator op) {
13971397
CeedCallBackend(CeedSetBackendFunctionCpp(ceed, "Operator", op, "LinearAssembleAddDiagonal", CeedOperatorLinearAssembleAddDiagonal_Sycl));
13981398
CeedCallBackend(
13991399
CeedSetBackendFunctionCpp(ceed, "Operator", op, "LinearAssembleAddPointBlockDiagonal", CeedOperatorLinearAssembleAddPointBlockDiagonal_Sycl));
1400-
CeedCallBackend(CeedSetBackendFunctionCpp(ceed, "Operator", op, "LinearAssembleSingle", CeedSingleOperatorAssemble_Sycl));
1400+
CeedCallBackend(CeedSetBackendFunctionCpp(ceed, "Operator", op, "LinearAssembleSingle", CeedOperatorAssembleSingle_Sycl));
14011401
CeedCallBackend(CeedSetBackendFunctionCpp(ceed, "Operator", op, "ApplyAdd", CeedOperatorApplyAdd_Sycl));
14021402
CeedCallBackend(CeedSetBackendFunctionCpp(ceed, "Operator", op, "Destroy", CeedOperatorDestroy_Sycl));
14031403
CeedCallBackend(CeedDestroy(&ceed));

‎include/ceed/backend.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -463,7 +463,7 @@ CEED_EXTERN int CeedOperatorGetFallbackParent(CeedOperator op, CeedOperator *par
463463
CEED_EXTERN int CeedOperatorGetFallbackParentCeed(CeedOperator op, Ceed *parent);
464464
CEED_EXTERN int CeedOperatorFallbackLinearAssembleQFunctionBuildOrUpdate(CeedOperator op, CeedVector *assembled, CeedElemRestriction *rstr,
465465
CeedRequest *request);
466-
CEED_INTERN int CeedSingleOperatorAssemble(CeedOperator op, CeedInt offset, CeedVector values);
466+
CEED_INTERN int CeedOperatorAssembleSingle(CeedOperator op, CeedInt offset, CeedVector values);
467467
CEED_EXTERN int CeedOperatorSetSetupDone(CeedOperator op);
468468

469469
CEED_INTERN int CeedMatrixMatrixMultiply(Ceed ceed, const CeedScalar *mat_A, const CeedScalar *mat_B, CeedScalar *mat_C, CeedInt m, CeedInt n,

0 commit comments

Comments
 (0)