From e9790802f4c24802219567be2723874948cf66e6 Mon Sep 17 00:00:00 2001 From: Jeremy L Thompson Date: Thu, 17 Oct 2024 09:04:13 -0600 Subject: [PATCH] qf - prefer ceed/types.h over ceed.h in qf source --- examples/ceed/ex1-volume.h | 2 +- examples/ceed/ex2-surface.h | 2 +- examples/deal.II/bps-qfunctions.h | 2 +- examples/fluids/qfunctions/advection.h | 4 +++- examples/fluids/qfunctions/advection_types.h | 2 +- examples/fluids/qfunctions/blasius.h | 2 +- examples/fluids/qfunctions/channel.h | 4 +++- examples/fluids/qfunctions/densitycurrent.h | 4 +++- examples/fluids/qfunctions/differential_filter.h | 2 +- examples/fluids/qfunctions/eulervortex.h | 4 +++- examples/fluids/qfunctions/gaussianwave.h | 4 +++- examples/fluids/qfunctions/grid_anisotropy_tensor.h | 2 +- examples/fluids/qfunctions/inverse_multiplicity.h | 2 +- examples/fluids/qfunctions/mass.h | 4 +++- examples/fluids/qfunctions/newtonian.h | 4 +++- examples/fluids/qfunctions/newtonian_state.h | 5 ++++- examples/fluids/qfunctions/newtonian_types.h | 5 ++++- examples/fluids/qfunctions/setupgeo.h | 4 +++- examples/fluids/qfunctions/setupgeo2d.h | 2 +- examples/fluids/qfunctions/setupgeo_helpers.h | 4 +++- examples/fluids/qfunctions/shocktube.h | 4 +++- examples/fluids/qfunctions/stabilization.h | 2 +- examples/fluids/qfunctions/stg_shur14.h | 4 +++- examples/fluids/qfunctions/stg_shur14_type.h | 2 +- .../fluids/qfunctions/strong_boundary_conditions.h | 2 +- examples/fluids/qfunctions/taylorgreen.h | 4 +++- examples/fluids/qfunctions/turb_spanstats.h | 5 ++++- examples/fluids/qfunctions/utils.h | 4 +++- examples/fluids/qfunctions/utils_eigensolver_jacobi.h | 4 +++- .../fluids/qfunctions/velocity_gradient_projection.h | 2 +- examples/mfem/bp1.h | 2 +- examples/mfem/bp3.h | 2 +- examples/petsc/qfunctions/area/areacube.h | 4 +++- examples/petsc/qfunctions/area/areasphere.h | 4 +++- examples/petsc/qfunctions/bps/bp1.h | 4 +++- examples/petsc/qfunctions/bps/bp1sphere.h | 4 +++- examples/petsc/qfunctions/bps/bp2.h | 4 +++- examples/petsc/qfunctions/bps/bp2sphere.h | 4 +++- examples/petsc/qfunctions/bps/bp3.h | 4 +++- examples/petsc/qfunctions/bps/bp3sphere.h | 4 +++- examples/petsc/qfunctions/bps/bp4.h | 4 +++- examples/petsc/qfunctions/bps/bp4sphere.h | 4 +++- examples/petsc/qfunctions/bps/common.h | 2 +- examples/petsc/qfunctions/swarm/swarmmass.h | 2 +- examples/solids/qfunctions/common.h | 2 +- examples/solids/qfunctions/constant-force.h | 4 +++- .../solids/qfunctions/finite-strain-mooney-rivlin.h | 4 +++- examples/solids/qfunctions/finite-strain-neo-hookean.h | 4 +++- examples/solids/qfunctions/linear.h | 4 +++- examples/solids/qfunctions/manufactured-force.h | 4 +++- examples/solids/qfunctions/manufactured-true.h | 4 +++- examples/solids/qfunctions/traction-boundary.h | 2 +- .../ceed/jit-source/cuda/cuda-atomic-add-fallback.h | 2 +- include/ceed/jit-source/cuda/cuda-gen-templates.h | 2 +- .../cuda/cuda-ref-basis-nontensor-templates.h | 2 +- .../ceed/jit-source/cuda/cuda-ref-basis-nontensor.h | 2 +- .../jit-source/cuda/cuda-ref-basis-tensor-at-points.h | 2 +- include/ceed/jit-source/cuda/cuda-ref-basis-tensor.h | 2 +- .../cuda/cuda-ref-operator-assemble-diagonal.h | 2 +- .../ceed/jit-source/cuda/cuda-ref-operator-assemble.h | 2 +- include/ceed/jit-source/cuda/cuda-ref-qfunction.h | 2 +- .../jit-source/cuda/cuda-ref-restriction-at-points.h | 2 +- .../cuda/cuda-ref-restriction-curl-oriented.h | 2 +- .../ceed/jit-source/cuda/cuda-ref-restriction-offset.h | 2 +- .../jit-source/cuda/cuda-ref-restriction-oriented.h | 2 +- .../jit-source/cuda/cuda-ref-restriction-strided.h | 2 +- .../cuda/cuda-shared-basis-read-write-templates.h | 2 +- .../cuda/cuda-shared-basis-tensor-templates.h | 2 +- .../ceed/jit-source/cuda/cuda-shared-basis-tensor.h | 2 +- include/ceed/jit-source/gallery/ceed-identity.h | 2 +- include/ceed/jit-source/gallery/ceed-mass1dbuild.h | 2 +- include/ceed/jit-source/gallery/ceed-mass2dbuild.h | 2 +- include/ceed/jit-source/gallery/ceed-mass3dbuild.h | 2 +- include/ceed/jit-source/gallery/ceed-massapply.h | 2 +- include/ceed/jit-source/gallery/ceed-poisson1dapply.h | 2 +- include/ceed/jit-source/gallery/ceed-poisson1dbuild.h | 2 +- include/ceed/jit-source/gallery/ceed-poisson2dapply.h | 2 +- include/ceed/jit-source/gallery/ceed-poisson2dbuild.h | 2 +- include/ceed/jit-source/gallery/ceed-poisson3dapply.h | 2 +- include/ceed/jit-source/gallery/ceed-poisson3dbuild.h | 2 +- include/ceed/jit-source/gallery/ceed-scale.h | 2 +- include/ceed/jit-source/gallery/ceed-vectormassapply.h | 2 +- .../jit-source/gallery/ceed-vectorpoisson1dapply.h | 2 +- .../jit-source/gallery/ceed-vectorpoisson2dapply.h | 2 +- .../jit-source/gallery/ceed-vectorpoisson3dapply.h | 2 +- include/ceed/jit-source/hip/hip-gen-templates.h | 2 +- .../jit-source/hip/hip-ref-basis-nontensor-templates.h | 2 +- include/ceed/jit-source/hip/hip-ref-basis-nontensor.h | 2 +- .../jit-source/hip/hip-ref-basis-tensor-at-points.h | 2 +- include/ceed/jit-source/hip/hip-ref-basis-tensor.h | 2 +- .../hip/hip-ref-operator-assemble-diagonal.h | 2 +- .../ceed/jit-source/hip/hip-ref-operator-assemble.h | 2 +- include/ceed/jit-source/hip/hip-ref-qfunction.h | 2 +- .../jit-source/hip/hip-ref-restriction-at-points.h | 2 +- .../jit-source/hip/hip-ref-restriction-curl-oriented.h | 2 +- .../ceed/jit-source/hip/hip-ref-restriction-offset.h | 2 +- .../ceed/jit-source/hip/hip-ref-restriction-oriented.h | 2 +- .../ceed/jit-source/hip/hip-ref-restriction-strided.h | 2 +- .../hip/hip-shared-basis-read-write-templates.h | 2 +- .../jit-source/hip/hip-shared-basis-tensor-templates.h | 2 +- include/ceed/jit-source/hip/hip-shared-basis-tensor.h | 2 +- include/ceed/jit-source/sycl/sycl-gen-templates.h | 2 +- include/ceed/jit-source/sycl/sycl-ref-qfunction.h | 2 +- .../sycl/sycl-shared-basis-read-write-templates.h | 2 +- .../sycl/sycl-shared-basis-tensor-templates.h | 2 +- .../ceed/jit-source/sycl/sycl-shared-basis-tensor.h | 2 +- interface/ceed-qfunction.c | 2 ++ tests/t400-qfunction.h | 2 +- tests/t401-qfunction.h | 2 +- tests/t405-qfunction.h | 2 +- tests/t406-qfunction-helper.h | 1 + tests/t406-qfunction.h | 6 +++++- tests/t409-qfunction.h | 2 +- tests/t500-operator.h | 2 +- tests/t502-operator.h | 2 +- tests/t507-operator.h | 2 +- tests/t510-operator.h | 2 +- tests/t522-operator.h | 2 +- tests/t530-operator.h | 2 +- tests/t531-operator.h | 2 +- tests/t532-operator.h | 2 +- tests/t534-operator.h | 2 +- tests/t535-operator.h | 2 +- tests/t537-operator.h | 2 +- tests/t539-operator.h | 2 +- tests/t540-operator.h | 2 +- tests/t541-operator.h | 2 +- tests/t566-operator.h | 2 +- tests/t567-operator.h | 2 +- tests/t568-operator.h | 2 +- tests/t580-operator.h | 2 +- tests/t590-operator.h | 2 +- tests/t591-operator.h | 2 +- tests/test-include/fake-sys-include.h | 10 +++++++--- 134 files changed, 214 insertions(+), 134 deletions(-) diff --git a/examples/ceed/ex1-volume.h b/examples/ceed/ex1-volume.h index d78ea16c6f..3ec78c4366 100644 --- a/examples/ceed/ex1-volume.h +++ b/examples/ceed/ex1-volume.h @@ -5,7 +5,7 @@ // // This file is part of CEED: http://github.com/ceed -#include +#include /// A structure used to pass additional data to f_build_mass struct BuildContext { diff --git a/examples/ceed/ex2-surface.h b/examples/ceed/ex2-surface.h index 4258a1e944..1355918b70 100644 --- a/examples/ceed/ex2-surface.h +++ b/examples/ceed/ex2-surface.h @@ -5,7 +5,7 @@ // // This file is part of CEED: http://github.com/ceed -#include +#include /// A structure used to pass additional data to f_build_diff struct BuildContext { diff --git a/examples/deal.II/bps-qfunctions.h b/examples/deal.II/bps-qfunctions.h index 6161fdf840..b6a0c498c7 100644 --- a/examples/deal.II/bps-qfunctions.h +++ b/examples/deal.II/bps-qfunctions.h @@ -15,7 +15,7 @@ // // --------------------------------------------------------------------- -#include +#include diff --git a/examples/fluids/qfunctions/advection.h b/examples/fluids/qfunctions/advection.h index 43b5293837..70f222ee9f 100644 --- a/examples/fluids/qfunctions/advection.h +++ b/examples/fluids/qfunctions/advection.h @@ -7,8 +7,10 @@ /// @file /// Advection initial condition and operator for Navier-Stokes example using PETSc -#include +#include +#ifndef CEED_RUNNING_JIT_PASS #include +#endif #include "advection_types.h" #include "newtonian_state.h" diff --git a/examples/fluids/qfunctions/advection_types.h b/examples/fluids/qfunctions/advection_types.h index 838995191c..3bdfaba851 100644 --- a/examples/fluids/qfunctions/advection_types.h +++ b/examples/fluids/qfunctions/advection_types.h @@ -6,7 +6,7 @@ // This file is part of CEED: http://github.com/ceed #pragma once -#include +#include #include "stabilization_types.h" typedef enum { diff --git a/examples/fluids/qfunctions/blasius.h b/examples/fluids/qfunctions/blasius.h index 738af58898..74fac316ec 100644 --- a/examples/fluids/qfunctions/blasius.h +++ b/examples/fluids/qfunctions/blasius.h @@ -7,7 +7,7 @@ /// @file /// Operator for Navier-Stokes example using PETSc -#include +#include #include "newtonian_state.h" #include "newtonian_types.h" diff --git a/examples/fluids/qfunctions/channel.h b/examples/fluids/qfunctions/channel.h index 21db7c8dd6..dd96c62f52 100644 --- a/examples/fluids/qfunctions/channel.h +++ b/examples/fluids/qfunctions/channel.h @@ -7,8 +7,10 @@ /// @file /// Operator for Navier-Stokes example using PETSc -#include +#include +#ifndef CEED_RUNNING_JIT_PASS #include +#endif #include "newtonian_state.h" #include "newtonian_types.h" diff --git a/examples/fluids/qfunctions/densitycurrent.h b/examples/fluids/qfunctions/densitycurrent.h index c5fe3752a0..d1e61a0a10 100644 --- a/examples/fluids/qfunctions/densitycurrent.h +++ b/examples/fluids/qfunctions/densitycurrent.h @@ -11,8 +11,10 @@ // Model from: // Semi-Implicit Formulations of the Navier-Stokes Equations: Application to // Nonhydrostatic Atmospheric Modeling, Giraldo, Restelli, and Lauter (2010). -#include +#include +#ifndef CEED_RUNNING_JIT_PASS #include +#endif #include "newtonian_state.h" #include "newtonian_types.h" diff --git a/examples/fluids/qfunctions/differential_filter.h b/examples/fluids/qfunctions/differential_filter.h index 10b89b70c7..7c7ad5eae8 100644 --- a/examples/fluids/qfunctions/differential_filter.h +++ b/examples/fluids/qfunctions/differential_filter.h @@ -7,7 +7,7 @@ // /// @file /// Implementation of differential filtering -#include +#include #include "differential_filter_enums.h" #include "newtonian_state.h" diff --git a/examples/fluids/qfunctions/eulervortex.h b/examples/fluids/qfunctions/eulervortex.h index 308cb50cea..35eb30b518 100644 --- a/examples/fluids/qfunctions/eulervortex.h +++ b/examples/fluids/qfunctions/eulervortex.h @@ -11,8 +11,10 @@ // Model from: // On the Order of Accuracy and Numerical Performance of Two Classes of Finite Volume WENO Schemes, Zhang, Zhang, and Shu (2011). -#include +#include +#ifndef CEED_RUNNING_JIT_PASS #include +#endif #include "utils.h" diff --git a/examples/fluids/qfunctions/gaussianwave.h b/examples/fluids/qfunctions/gaussianwave.h index 88f9feb126..f48de3bcf2 100644 --- a/examples/fluids/qfunctions/gaussianwave.h +++ b/examples/fluids/qfunctions/gaussianwave.h @@ -7,8 +7,10 @@ /// @file /// Thermodynamic wave propogation for testing freestream/non-reflecting boundary conditions. Proposed in Mengaldo et. al. 2014 -#include +#include +#ifndef CEED_RUNNING_JIT_PASS #include +#endif #include "newtonian_state.h" #include "utils.h" diff --git a/examples/fluids/qfunctions/grid_anisotropy_tensor.h b/examples/fluids/qfunctions/grid_anisotropy_tensor.h index ef59a54c6d..cea712726f 100644 --- a/examples/fluids/qfunctions/grid_anisotropy_tensor.h +++ b/examples/fluids/qfunctions/grid_anisotropy_tensor.h @@ -8,7 +8,7 @@ /// @file /// Element anisotropy tensor, as defined in 'Invariant data-driven subgrid stress modeling in the strain-rate eigenframe for large eddy simulation' /// Prakash et al. 2022 -#include +#include #include "utils.h" #include "utils_eigensolver_jacobi.h" diff --git a/examples/fluids/qfunctions/inverse_multiplicity.h b/examples/fluids/qfunctions/inverse_multiplicity.h index c51fc0586b..6f83c7b39c 100644 --- a/examples/fluids/qfunctions/inverse_multiplicity.h +++ b/examples/fluids/qfunctions/inverse_multiplicity.h @@ -4,7 +4,7 @@ // SPDX-License-Identifier: BSD-2-Clause // // This file is part of CEED: http://github.com/ceed -#include +#include // @brief Calculate the inverse of the multiplicity, reducing to a single component CEED_QFUNCTION(InverseMultiplicity)(void *ctx, CeedInt Q, const CeedScalar *const *in, CeedScalar *const *out) { diff --git a/examples/fluids/qfunctions/mass.h b/examples/fluids/qfunctions/mass.h index 1147a2bb31..42d27b2f68 100644 --- a/examples/fluids/qfunctions/mass.h +++ b/examples/fluids/qfunctions/mass.h @@ -7,8 +7,10 @@ /// @file /// Mass operator for Navier-Stokes example using PETSc -#include +#include +#ifndef CEED_RUNNING_JIT_PASS #include +#endif // ***************************************************************************** // This QFunction applies the mass matrix to five interlaced fields. diff --git a/examples/fluids/qfunctions/newtonian.h b/examples/fluids/qfunctions/newtonian.h index 66fc309018..a5ca161b3b 100644 --- a/examples/fluids/qfunctions/newtonian.h +++ b/examples/fluids/qfunctions/newtonian.h @@ -7,9 +7,11 @@ /// @file /// Operator for Navier-Stokes example using PETSc -#include +#include +#ifndef CEED_RUNNING_JIT_PASS #include #include +#endif #include "newtonian_state.h" #include "newtonian_types.h" diff --git a/examples/fluids/qfunctions/newtonian_state.h b/examples/fluids/qfunctions/newtonian_state.h index fa38c45e68..cf9f9171f3 100644 --- a/examples/fluids/qfunctions/newtonian_state.h +++ b/examples/fluids/qfunctions/newtonian_state.h @@ -9,8 +9,11 @@ /// Structs and helper functions regarding the state of a newtonian simulation #pragma once -#include +#include +#ifndef CEED_RUNNING_JIT_PASS #include +#include +#endif #include "newtonian_types.h" #include "utils.h" diff --git a/examples/fluids/qfunctions/newtonian_types.h b/examples/fluids/qfunctions/newtonian_types.h index 60478c397b..b7c4e7e36e 100644 --- a/examples/fluids/qfunctions/newtonian_types.h +++ b/examples/fluids/qfunctions/newtonian_types.h @@ -6,7 +6,10 @@ // This file is part of CEED: http://github.com/ceed #pragma once -#include +#include +#ifndef CEED_RUNNING_JIT_PASS +#include +#endif #include "stabilization_types.h" diff --git a/examples/fluids/qfunctions/setupgeo.h b/examples/fluids/qfunctions/setupgeo.h index a4d5181ad7..4e8e9cf8f4 100644 --- a/examples/fluids/qfunctions/setupgeo.h +++ b/examples/fluids/qfunctions/setupgeo.h @@ -7,8 +7,10 @@ /// @file /// Geometric factors (3D) for Navier-Stokes example using PETSc -#include +#include +#ifndef CEED_RUNNING_JIT_PASS #include +#endif #include "setupgeo_helpers.h" #include "utils.h" diff --git a/examples/fluids/qfunctions/setupgeo2d.h b/examples/fluids/qfunctions/setupgeo2d.h index 4bbb39795c..d1cef0a8b0 100644 --- a/examples/fluids/qfunctions/setupgeo2d.h +++ b/examples/fluids/qfunctions/setupgeo2d.h @@ -7,7 +7,7 @@ /// @file /// Geometric factors (2D) for Navier-Stokes example using PETSc -#include +#include #include "setupgeo_helpers.h" #include "utils.h" diff --git a/examples/fluids/qfunctions/setupgeo_helpers.h b/examples/fluids/qfunctions/setupgeo_helpers.h index 930ff7bb72..b52c3cdcff 100644 --- a/examples/fluids/qfunctions/setupgeo_helpers.h +++ b/examples/fluids/qfunctions/setupgeo_helpers.h @@ -9,8 +9,10 @@ /// Geometric factors (3D) for Navier-Stokes example using PETSc #pragma once -#include +#include +#ifndef CEED_RUNNING_JIT_PASS #include +#endif #include "utils.h" diff --git a/examples/fluids/qfunctions/shocktube.h b/examples/fluids/qfunctions/shocktube.h index 87cdf73d4d..056b5adb41 100644 --- a/examples/fluids/qfunctions/shocktube.h +++ b/examples/fluids/qfunctions/shocktube.h @@ -10,8 +10,10 @@ // Model from: // On the Order of Accuracy and Numerical Performance of Two Classes of Finite Volume WENO Schemes, Zhang, Zhang, and Shu (2011). -#include +#include +#ifndef CEED_RUNNING_JIT_PASS #include +#endif #include "utils.h" diff --git a/examples/fluids/qfunctions/stabilization.h b/examples/fluids/qfunctions/stabilization.h index 55d99820c3..655d49e7a8 100644 --- a/examples/fluids/qfunctions/stabilization.h +++ b/examples/fluids/qfunctions/stabilization.h @@ -7,7 +7,7 @@ /// @file /// Helper functions for computing stabilization terms of a newtonian simulation -#include +#include #include "newtonian_state.h" diff --git a/examples/fluids/qfunctions/stg_shur14.h b/examples/fluids/qfunctions/stg_shur14.h index d1fec17ce5..28a779aa8c 100644 --- a/examples/fluids/qfunctions/stg_shur14.h +++ b/examples/fluids/qfunctions/stg_shur14.h @@ -12,9 +12,11 @@ /// SetupSTG_Rand reads in the input files and fills in STGShur14Context. /// Then STGShur14_CalcQF is run over quadrature points. /// Before the program exits, TearDownSTG is run to free the memory of the allocated arrays. -#include +#include +#ifndef CEED_RUNNING_JIT_PASS #include #include +#endif #include "newtonian_state.h" #include "setupgeo_helpers.h" diff --git a/examples/fluids/qfunctions/stg_shur14_type.h b/examples/fluids/qfunctions/stg_shur14_type.h index 5e369cd702..cfcedad28a 100644 --- a/examples/fluids/qfunctions/stg_shur14_type.h +++ b/examples/fluids/qfunctions/stg_shur14_type.h @@ -6,7 +6,7 @@ // This file is part of CEED: http://github.com/ceed #pragma once -#include +#include #include "newtonian_types.h" diff --git a/examples/fluids/qfunctions/strong_boundary_conditions.h b/examples/fluids/qfunctions/strong_boundary_conditions.h index a503a236d9..7bb0453796 100644 --- a/examples/fluids/qfunctions/strong_boundary_conditions.h +++ b/examples/fluids/qfunctions/strong_boundary_conditions.h @@ -4,7 +4,7 @@ // SPDX-License-Identifier: BSD-2-Clause // // This file is part of CEED: http://github.com/ceed -#include +#include #include "setupgeo_helpers.h" diff --git a/examples/fluids/qfunctions/taylorgreen.h b/examples/fluids/qfunctions/taylorgreen.h index ddf33e665b..3b42fe18d8 100644 --- a/examples/fluids/qfunctions/taylorgreen.h +++ b/examples/fluids/qfunctions/taylorgreen.h @@ -4,8 +4,10 @@ // SPDX-License-Identifier: BSD-2-Clause // // This file is part of CEED: http://github.com/ceed -#include +#include +#ifndef CEED_RUNNING_JIT_PASS #include +#endif #include "newtonian_state.h" #include "newtonian_types.h" diff --git a/examples/fluids/qfunctions/turb_spanstats.h b/examples/fluids/qfunctions/turb_spanstats.h index 344adeebaa..3b8374b7de 100644 --- a/examples/fluids/qfunctions/turb_spanstats.h +++ b/examples/fluids/qfunctions/turb_spanstats.h @@ -4,7 +4,10 @@ // SPDX-License-Identifier: BSD-2-Clause // // This file is part of CEED: http://github.com/ceed -#include +#include +#ifndef CEED_RUNNING_JIT_PASS +#include +#endif #include "newtonian_state.h" #include "turb_stats_types.h" diff --git a/examples/fluids/qfunctions/utils.h b/examples/fluids/qfunctions/utils.h index f414e14e9c..90f67fad24 100644 --- a/examples/fluids/qfunctions/utils.h +++ b/examples/fluids/qfunctions/utils.h @@ -6,8 +6,10 @@ // This file is part of CEED: http://github.com/ceed #pragma once -#include +#include +#ifndef CEED_RUNNING_JIT_PASS #include +#endif #ifndef M_PI #define M_PI 3.14159265358979323846 diff --git a/examples/fluids/qfunctions/utils_eigensolver_jacobi.h b/examples/fluids/qfunctions/utils_eigensolver_jacobi.h index b8236789d2..8d33c7e996 100644 --- a/examples/fluids/qfunctions/utils_eigensolver_jacobi.h +++ b/examples/fluids/qfunctions/utils_eigensolver_jacobi.h @@ -9,8 +9,10 @@ /// Eigen system solver for symmetric NxN matrices. Modified from the CC0 code provided at https://github.com/jewettaij/jacobi_pd #pragma once -#include +#include +#ifndef CEED_RUNNING_JIT_PASS #include +#endif #include "utils.h" diff --git a/examples/fluids/qfunctions/velocity_gradient_projection.h b/examples/fluids/qfunctions/velocity_gradient_projection.h index c21bb68adc..28914c13d9 100644 --- a/examples/fluids/qfunctions/velocity_gradient_projection.h +++ b/examples/fluids/qfunctions/velocity_gradient_projection.h @@ -4,7 +4,7 @@ // SPDX-License-Identifier: BSD-2-Clause // // This file is part of CEED: http://github.com/ceed -#include +#include #include "newtonian_state.h" #include "newtonian_types.h" diff --git a/examples/mfem/bp1.h b/examples/mfem/bp1.h index 332340340f..df23dd4b51 100644 --- a/examples/mfem/bp1.h +++ b/examples/mfem/bp1.h @@ -5,7 +5,7 @@ // // This file is part of CEED: http://github.com/ceed -#include +#include /// A structure used to pass additional data to f_build_mass struct BuildContext { diff --git a/examples/mfem/bp3.h b/examples/mfem/bp3.h index dde37b7446..a546d8aea6 100644 --- a/examples/mfem/bp3.h +++ b/examples/mfem/bp3.h @@ -5,7 +5,7 @@ // // This file is part of CEED: http://github.com/ceed -#include +#include /// A structure used to pass additional data to f_build_diff and f_apply_diff struct BuildContext { diff --git a/examples/petsc/qfunctions/area/areacube.h b/examples/petsc/qfunctions/area/areacube.h index 93be0594b6..1cc7fcccab 100644 --- a/examples/petsc/qfunctions/area/areacube.h +++ b/examples/petsc/qfunctions/area/areacube.h @@ -8,8 +8,10 @@ /// @file /// libCEED QFunctions for mass operator example for a scalar field on the sphere using PETSc -#include +#include +#ifndef CEED_RUNNING_JIT_PASS #include +#endif // ----------------------------------------------------------------------------- // This QFunction sets up the geometric factor required for integration when reference coordinates have a different dimension than the one of physical diff --git a/examples/petsc/qfunctions/area/areasphere.h b/examples/petsc/qfunctions/area/areasphere.h index 7cd73ca354..88ee221a7f 100644 --- a/examples/petsc/qfunctions/area/areasphere.h +++ b/examples/petsc/qfunctions/area/areasphere.h @@ -8,8 +8,10 @@ /// @file /// libCEED QFunctions for mass operator example for a scalar field on the sphere using PETSc -#include +#include +#ifndef CEED_RUNNING_JIT_PASS #include +#endif // ----------------------------------------------------------------------------- // This QFunction sets up the geometric factor required for integration when reference coordinates have a different dimension than the one of physical diff --git a/examples/petsc/qfunctions/bps/bp1.h b/examples/petsc/qfunctions/bps/bp1.h index a902b29f7c..b5a1f0ad11 100644 --- a/examples/petsc/qfunctions/bps/bp1.h +++ b/examples/petsc/qfunctions/bps/bp1.h @@ -8,8 +8,10 @@ /// @file /// libCEED QFunctions for mass operator example using PETSc -#include +#include +#ifndef CEED_RUNNING_JIT_PASS #include +#endif // ----------------------------------------------------------------------------- // This QFunction sets up the geometric factors required to apply the mass operator diff --git a/examples/petsc/qfunctions/bps/bp1sphere.h b/examples/petsc/qfunctions/bps/bp1sphere.h index d604406f29..0129a3ba66 100644 --- a/examples/petsc/qfunctions/bps/bp1sphere.h +++ b/examples/petsc/qfunctions/bps/bp1sphere.h @@ -8,8 +8,10 @@ /// @file /// libCEED QFunctions for mass operator example for a scalar field on the sphere using PETSc -#include +#include +#ifndef CEED_RUNNING_JIT_PASS #include +#endif // ----------------------------------------------------------------------------- // This QFunction sets up the geometric factors required for integration and coordinate transformations when reference coordinates have a different diff --git a/examples/petsc/qfunctions/bps/bp2.h b/examples/petsc/qfunctions/bps/bp2.h index 22ba9fb788..12c5fc3521 100644 --- a/examples/petsc/qfunctions/bps/bp2.h +++ b/examples/petsc/qfunctions/bps/bp2.h @@ -8,8 +8,10 @@ /// @file /// libCEED QFunctions for mass operator example using PETSc -#include +#include +#ifndef CEED_RUNNING_JIT_PASS #include +#endif // ----------------------------------------------------------------------------- // This QFunction sets up the rhs and true solution for the problem diff --git a/examples/petsc/qfunctions/bps/bp2sphere.h b/examples/petsc/qfunctions/bps/bp2sphere.h index 36a8e95778..2ebff9ef91 100644 --- a/examples/petsc/qfunctions/bps/bp2sphere.h +++ b/examples/petsc/qfunctions/bps/bp2sphere.h @@ -8,8 +8,10 @@ /// @file /// libCEED QFunctions for mass operator example for a vector field on the sphere using PETSc -#include +#include +#ifndef CEED_RUNNING_JIT_PASS #include +#endif // ----------------------------------------------------------------------------- // This QFunction sets up the rhs and true solution for the problem diff --git a/examples/petsc/qfunctions/bps/bp3.h b/examples/petsc/qfunctions/bps/bp3.h index dcf84defae..a3674ed031 100644 --- a/examples/petsc/qfunctions/bps/bp3.h +++ b/examples/petsc/qfunctions/bps/bp3.h @@ -8,8 +8,10 @@ /// @file /// libCEED QFunctions for diffusion operator example using PETSc -#include +#include +#ifndef CEED_RUNNING_JIT_PASS #include +#endif // ----------------------------------------------------------------------------- // This QFunction sets up the geometric factors required to apply the diffusion operator diff --git a/examples/petsc/qfunctions/bps/bp3sphere.h b/examples/petsc/qfunctions/bps/bp3sphere.h index 1f901dd97a..fdc16b4c84 100644 --- a/examples/petsc/qfunctions/bps/bp3sphere.h +++ b/examples/petsc/qfunctions/bps/bp3sphere.h @@ -8,8 +8,10 @@ /// @file /// libCEED QFunctions for diffusion operator example for a scalar field on the sphere using PETSc -#include +#include +#ifndef CEED_RUNNING_JIT_PASS #include +#endif // ----------------------------------------------------------------------------- // This QFunction sets up the geometric factors required for integration and coordinate transformations when reference coordinates have a different diff --git a/examples/petsc/qfunctions/bps/bp4.h b/examples/petsc/qfunctions/bps/bp4.h index 46307c338a..4f8f6fd58d 100644 --- a/examples/petsc/qfunctions/bps/bp4.h +++ b/examples/petsc/qfunctions/bps/bp4.h @@ -8,8 +8,10 @@ /// @file /// libCEED QFunctions for diffusion operator example using PETSc -#include +#include +#ifndef CEED_RUNNING_JIT_PASS #include +#endif // ----------------------------------------------------------------------------- // This QFunction sets up the rhs and true solution for the problem diff --git a/examples/petsc/qfunctions/bps/bp4sphere.h b/examples/petsc/qfunctions/bps/bp4sphere.h index 517f353371..39b631173b 100644 --- a/examples/petsc/qfunctions/bps/bp4sphere.h +++ b/examples/petsc/qfunctions/bps/bp4sphere.h @@ -8,8 +8,10 @@ /// @file /// libCEED QFunctions for mass operator example for a vector field on the sphere using PETSc -#include +#include +#ifndef CEED_RUNNING_JIT_PASS #include +#endif // ----------------------------------------------------------------------------- // This QFunction sets up the rhs and true solution for the problem diff --git a/examples/petsc/qfunctions/bps/common.h b/examples/petsc/qfunctions/bps/common.h index 26f374d5d4..fd38dbc13d 100644 --- a/examples/petsc/qfunctions/bps/common.h +++ b/examples/petsc/qfunctions/bps/common.h @@ -8,7 +8,7 @@ /// @file /// libCEED QFunctions for BP examples using PETSc -#include +#include // ----------------------------------------------------------------------------- CEED_QFUNCTION(Error)(void *ctx, CeedInt Q, const CeedScalar *const *in, CeedScalar *const *out) { diff --git a/examples/petsc/qfunctions/swarm/swarmmass.h b/examples/petsc/qfunctions/swarm/swarmmass.h index e355eff8d7..4c321871fe 100644 --- a/examples/petsc/qfunctions/swarm/swarmmass.h +++ b/examples/petsc/qfunctions/swarm/swarmmass.h @@ -5,7 +5,7 @@ // // This file is part of CEED: http://github.com/ceed -#include +#include CEED_QFUNCTION(SetupMass)(void *ctx, const CeedInt Q, const CeedScalar *const *in, CeedScalar *const *out) { const CeedScalar(*J)[3][CEED_Q_VLA] = (const CeedScalar(*)[3][CEED_Q_VLA])in[0]; diff --git a/examples/solids/qfunctions/common.h b/examples/solids/qfunctions/common.h index bfdb92522f..acaa815cc5 100644 --- a/examples/solids/qfunctions/common.h +++ b/examples/solids/qfunctions/common.h @@ -8,7 +8,7 @@ /// @file /// Geometric factors for solid mechanics example using PETSc -#include +#include // ----------------------------------------------------------------------------- // This QFunction sets up the geometric factors required for integration and coordinate transformations diff --git a/examples/solids/qfunctions/constant-force.h b/examples/solids/qfunctions/constant-force.h index a94dc4f3bf..232f97588e 100644 --- a/examples/solids/qfunctions/constant-force.h +++ b/examples/solids/qfunctions/constant-force.h @@ -8,8 +8,10 @@ /// @file /// Constant forcing term for solid mechanics example using PETSc -#include +#include +#ifndef CEED_RUNNING_JIT_PASS #include +#endif #ifndef PHYSICS_STRUCT #define PHYSICS_STRUCT diff --git a/examples/solids/qfunctions/finite-strain-mooney-rivlin.h b/examples/solids/qfunctions/finite-strain-mooney-rivlin.h index f9c19e81b1..7a802693d2 100644 --- a/examples/solids/qfunctions/finite-strain-mooney-rivlin.h +++ b/examples/solids/qfunctions/finite-strain-mooney-rivlin.h @@ -8,8 +8,10 @@ /// @file /// Hyperelasticity, finite strain for solid mechanics example using PETSc -#include +#include +#ifndef CEED_RUNNING_JIT_PASS #include +#endif // ----------------------------------------------------------------------------- // Mooney-Rivlin context diff --git a/examples/solids/qfunctions/finite-strain-neo-hookean.h b/examples/solids/qfunctions/finite-strain-neo-hookean.h index 42b2b46e2c..9b1ff27979 100644 --- a/examples/solids/qfunctions/finite-strain-neo-hookean.h +++ b/examples/solids/qfunctions/finite-strain-neo-hookean.h @@ -8,8 +8,10 @@ /// @file /// Hyperelasticity, finite strain for solid mechanics example using PETSc -#include +#include +#ifndef CEED_RUNNING_JIT_PASS #include +#endif #ifndef PHYSICS_STRUCT #define PHYSICS_STRUCT diff --git a/examples/solids/qfunctions/linear.h b/examples/solids/qfunctions/linear.h index 20b293b6f1..57f5fe4f61 100644 --- a/examples/solids/qfunctions/linear.h +++ b/examples/solids/qfunctions/linear.h @@ -8,8 +8,10 @@ /// @file /// Linear elasticity for solid mechanics example using PETSc -#include +#include +#ifndef CEED_RUNNING_JIT_PASS #include +#endif #ifndef PHYSICS_STRUCT #define PHYSICS_STRUCT diff --git a/examples/solids/qfunctions/manufactured-force.h b/examples/solids/qfunctions/manufactured-force.h index 0764d103e3..de48be4ba3 100644 --- a/examples/solids/qfunctions/manufactured-force.h +++ b/examples/solids/qfunctions/manufactured-force.h @@ -8,8 +8,10 @@ /// @file /// Linear elasticity manufactured solution forcing term for solid mechanics example using PETSc -#include +#include +#ifndef CEED_RUNNING_JIT_PASS #include +#endif #ifndef PHYSICS_STRUCT #define PHYSICS_STRUCT diff --git a/examples/solids/qfunctions/manufactured-true.h b/examples/solids/qfunctions/manufactured-true.h index 389fb6596f..6fd97c1b13 100644 --- a/examples/solids/qfunctions/manufactured-true.h +++ b/examples/solids/qfunctions/manufactured-true.h @@ -8,8 +8,10 @@ /// @file /// Linear elasticity manufactured solution true solution for solid mechanics example using PETSc -#include +#include +#ifndef CEED_RUNNING_JIT_PASS #include +#endif // ----------------------------------------------------------------------------- // True solution for linear elasticity manufactured solution diff --git a/examples/solids/qfunctions/traction-boundary.h b/examples/solids/qfunctions/traction-boundary.h index 181b176d0a..7fd59c742c 100644 --- a/examples/solids/qfunctions/traction-boundary.h +++ b/examples/solids/qfunctions/traction-boundary.h @@ -8,7 +8,7 @@ /// @file /// Geometric factors for solid mechanics example using PETSc -#include +#include // ----------------------------------------------------------------------------- // This QFunction computes the surface integral of the user traction vector on the constrained faces. diff --git a/include/ceed/jit-source/cuda/cuda-atomic-add-fallback.h b/include/ceed/jit-source/cuda/cuda-atomic-add-fallback.h index da92667707..c566147adb 100644 --- a/include/ceed/jit-source/cuda/cuda-atomic-add-fallback.h +++ b/include/ceed/jit-source/cuda/cuda-atomic-add-fallback.h @@ -8,7 +8,7 @@ /// @file /// Internal header for CUDA atomic add fallback definition -#include +#include //------------------------------------------------------------------------------ // Atomic add, for older CUDA diff --git a/include/ceed/jit-source/cuda/cuda-gen-templates.h b/include/ceed/jit-source/cuda/cuda-gen-templates.h index f3d7052e3c..a7fd0f7072 100644 --- a/include/ceed/jit-source/cuda/cuda-gen-templates.h +++ b/include/ceed/jit-source/cuda/cuda-gen-templates.h @@ -8,7 +8,7 @@ /// @file /// Internal header for CUDA backend macro and type definitions for JiT source -#include +#include //------------------------------------------------------------------------------ // Load matrices for basis actions diff --git a/include/ceed/jit-source/cuda/cuda-ref-basis-nontensor-templates.h b/include/ceed/jit-source/cuda/cuda-ref-basis-nontensor-templates.h index 6b19ad448d..e4c6f1d165 100644 --- a/include/ceed/jit-source/cuda/cuda-ref-basis-nontensor-templates.h +++ b/include/ceed/jit-source/cuda/cuda-ref-basis-nontensor-templates.h @@ -8,7 +8,7 @@ /// @file /// Internal header for CUDA non-tensor product basis templates -#include +#include //------------------------------------------------------------------------------ // Tensor contraction diff --git a/include/ceed/jit-source/cuda/cuda-ref-basis-nontensor.h b/include/ceed/jit-source/cuda/cuda-ref-basis-nontensor.h index 6dbf8771d8..a68b2fd3d6 100644 --- a/include/ceed/jit-source/cuda/cuda-ref-basis-nontensor.h +++ b/include/ceed/jit-source/cuda/cuda-ref-basis-nontensor.h @@ -8,7 +8,7 @@ /// @file /// Internal header for CUDA non-tensor product basis -#include +#include #include "cuda-ref-basis-nontensor-templates.h" diff --git a/include/ceed/jit-source/cuda/cuda-ref-basis-tensor-at-points.h b/include/ceed/jit-source/cuda/cuda-ref-basis-tensor-at-points.h index 7355705660..1ce11dacfd 100644 --- a/include/ceed/jit-source/cuda/cuda-ref-basis-tensor-at-points.h +++ b/include/ceed/jit-source/cuda/cuda-ref-basis-tensor-at-points.h @@ -8,7 +8,7 @@ /// @file /// Internal header for CUDA tensor product basis with AtPoints evaluation -#include +#include //------------------------------------------------------------------------------ // Chebyshev values diff --git a/include/ceed/jit-source/cuda/cuda-ref-basis-tensor.h b/include/ceed/jit-source/cuda/cuda-ref-basis-tensor.h index 4c8c2f447c..71d8ee8c34 100644 --- a/include/ceed/jit-source/cuda/cuda-ref-basis-tensor.h +++ b/include/ceed/jit-source/cuda/cuda-ref-basis-tensor.h @@ -8,7 +8,7 @@ /// @file /// Internal header for CUDA tensor product basis -#include +#include //------------------------------------------------------------------------------ // Tensor Basis Kernels diff --git a/include/ceed/jit-source/cuda/cuda-ref-operator-assemble-diagonal.h b/include/ceed/jit-source/cuda/cuda-ref-operator-assemble-diagonal.h index df5b9ad338..7a74ea9723 100644 --- a/include/ceed/jit-source/cuda/cuda-ref-operator-assemble-diagonal.h +++ b/include/ceed/jit-source/cuda/cuda-ref-operator-assemble-diagonal.h @@ -7,7 +7,7 @@ /// @file /// Internal header for CUDA operator diagonal assembly -#include +#include #if USE_CEEDSIZE typedef CeedSize IndexType; diff --git a/include/ceed/jit-source/cuda/cuda-ref-operator-assemble.h b/include/ceed/jit-source/cuda/cuda-ref-operator-assemble.h index 9fc02a1c7a..8c35dc1ee7 100644 --- a/include/ceed/jit-source/cuda/cuda-ref-operator-assemble.h +++ b/include/ceed/jit-source/cuda/cuda-ref-operator-assemble.h @@ -8,7 +8,7 @@ /// @file /// Internal header for CUDA operator full assembly -#include +#include #if USE_CEEDSIZE typedef CeedSize IndexType; diff --git a/include/ceed/jit-source/cuda/cuda-ref-qfunction.h b/include/ceed/jit-source/cuda/cuda-ref-qfunction.h index 7fbf7901bc..5bde9a99f7 100644 --- a/include/ceed/jit-source/cuda/cuda-ref-qfunction.h +++ b/include/ceed/jit-source/cuda/cuda-ref-qfunction.h @@ -8,7 +8,7 @@ /// @file /// Internal header for CUDA backend QFunction read/write kernels -#include +#include //------------------------------------------------------------------------------ // Read from quadrature points diff --git a/include/ceed/jit-source/cuda/cuda-ref-restriction-at-points.h b/include/ceed/jit-source/cuda/cuda-ref-restriction-at-points.h index 87aeda2e3b..be23954097 100644 --- a/include/ceed/jit-source/cuda/cuda-ref-restriction-at-points.h +++ b/include/ceed/jit-source/cuda/cuda-ref-restriction-at-points.h @@ -8,7 +8,7 @@ /// @file /// Internal header for CUDA offset element restriction kernels -#include +#include //------------------------------------------------------------------------------ // E-vector -> L-vector, standard (with offsets) diff --git a/include/ceed/jit-source/cuda/cuda-ref-restriction-curl-oriented.h b/include/ceed/jit-source/cuda/cuda-ref-restriction-curl-oriented.h index 86a4b53545..5a7a8c29e6 100644 --- a/include/ceed/jit-source/cuda/cuda-ref-restriction-curl-oriented.h +++ b/include/ceed/jit-source/cuda/cuda-ref-restriction-curl-oriented.h @@ -8,7 +8,7 @@ /// @file /// Internal header for CUDA curl-oriented element restriction kernels -#include +#include //------------------------------------------------------------------------------ // L-vector -> E-vector, curl-oriented diff --git a/include/ceed/jit-source/cuda/cuda-ref-restriction-offset.h b/include/ceed/jit-source/cuda/cuda-ref-restriction-offset.h index 9492b31984..f93c872ace 100644 --- a/include/ceed/jit-source/cuda/cuda-ref-restriction-offset.h +++ b/include/ceed/jit-source/cuda/cuda-ref-restriction-offset.h @@ -8,7 +8,7 @@ /// @file /// Internal header for CUDA offset element restriction kernels -#include +#include //------------------------------------------------------------------------------ // L-vector -> E-vector, standard (with offsets) diff --git a/include/ceed/jit-source/cuda/cuda-ref-restriction-oriented.h b/include/ceed/jit-source/cuda/cuda-ref-restriction-oriented.h index 7c667922bf..a1fda87b40 100644 --- a/include/ceed/jit-source/cuda/cuda-ref-restriction-oriented.h +++ b/include/ceed/jit-source/cuda/cuda-ref-restriction-oriented.h @@ -8,7 +8,7 @@ /// @file /// Internal header for CUDA oriented element restriction kernels -#include +#include //------------------------------------------------------------------------------ // L-vector -> E-vector, oriented diff --git a/include/ceed/jit-source/cuda/cuda-ref-restriction-strided.h b/include/ceed/jit-source/cuda/cuda-ref-restriction-strided.h index d10f73c11d..59243fd30a 100644 --- a/include/ceed/jit-source/cuda/cuda-ref-restriction-strided.h +++ b/include/ceed/jit-source/cuda/cuda-ref-restriction-strided.h @@ -8,7 +8,7 @@ /// @file /// Internal header for CUDA strided element restriction kernels -#include +#include //------------------------------------------------------------------------------ // L-vector -> E-vector, strided diff --git a/include/ceed/jit-source/cuda/cuda-shared-basis-read-write-templates.h b/include/ceed/jit-source/cuda/cuda-shared-basis-read-write-templates.h index 56234c28e4..f7e2a74db0 100644 --- a/include/ceed/jit-source/cuda/cuda-shared-basis-read-write-templates.h +++ b/include/ceed/jit-source/cuda/cuda-shared-basis-read-write-templates.h @@ -8,7 +8,7 @@ /// @file /// Internal header for CUDA shared memory basis read/write templates -#include +#include //------------------------------------------------------------------------------ // 1D diff --git a/include/ceed/jit-source/cuda/cuda-shared-basis-tensor-templates.h b/include/ceed/jit-source/cuda/cuda-shared-basis-tensor-templates.h index 56989f2b69..f09677828a 100644 --- a/include/ceed/jit-source/cuda/cuda-shared-basis-tensor-templates.h +++ b/include/ceed/jit-source/cuda/cuda-shared-basis-tensor-templates.h @@ -8,7 +8,7 @@ /// @file /// Internal header for CUDA shared memory tensor product basis templates -#include +#include //------------------------------------------------------------------------------ // 1D diff --git a/include/ceed/jit-source/cuda/cuda-shared-basis-tensor.h b/include/ceed/jit-source/cuda/cuda-shared-basis-tensor.h index c295362978..5f801cf81c 100644 --- a/include/ceed/jit-source/cuda/cuda-shared-basis-tensor.h +++ b/include/ceed/jit-source/cuda/cuda-shared-basis-tensor.h @@ -8,7 +8,7 @@ /// @file /// Internal header for CUDA shared memory tensor product basis -#include +#include #include "cuda-shared-basis-read-write-templates.h" #include "cuda-shared-basis-tensor-templates.h" diff --git a/include/ceed/jit-source/gallery/ceed-identity.h b/include/ceed/jit-source/gallery/ceed-identity.h index 1a84718f4a..45c4ebf827 100644 --- a/include/ceed/jit-source/gallery/ceed-identity.h +++ b/include/ceed/jit-source/gallery/ceed-identity.h @@ -9,7 +9,7 @@ @brief Identity QFunction that copies inputs directly into outputs **/ -#include +#include typedef struct { CeedInt size; diff --git a/include/ceed/jit-source/gallery/ceed-mass1dbuild.h b/include/ceed/jit-source/gallery/ceed-mass1dbuild.h index c266beff64..4b2f60a135 100644 --- a/include/ceed/jit-source/gallery/ceed-mass1dbuild.h +++ b/include/ceed/jit-source/gallery/ceed-mass1dbuild.h @@ -9,7 +9,7 @@ @brief Ceed QFunction for building the geometric data for the 1D mass matrix **/ -#include +#include CEED_QFUNCTION(Mass1DBuild)(void *ctx, const CeedInt Q, const CeedScalar *const *in, CeedScalar *const *out) { // in[0] is Jacobians, size (Q) diff --git a/include/ceed/jit-source/gallery/ceed-mass2dbuild.h b/include/ceed/jit-source/gallery/ceed-mass2dbuild.h index 7e5f6fbd34..3d24858bca 100644 --- a/include/ceed/jit-source/gallery/ceed-mass2dbuild.h +++ b/include/ceed/jit-source/gallery/ceed-mass2dbuild.h @@ -9,7 +9,7 @@ @brief Ceed QFunction for building the geometric data for the 2D mass matrix **/ -#include +#include CEED_QFUNCTION(Mass2DBuild)(void *ctx, const CeedInt Q, const CeedScalar *const *in, CeedScalar *const *out) { // in[0] is Jacobians with shape [2, nc=2, Q] diff --git a/include/ceed/jit-source/gallery/ceed-mass3dbuild.h b/include/ceed/jit-source/gallery/ceed-mass3dbuild.h index 71dc961215..81a23aaff9 100644 --- a/include/ceed/jit-source/gallery/ceed-mass3dbuild.h +++ b/include/ceed/jit-source/gallery/ceed-mass3dbuild.h @@ -9,7 +9,7 @@ @brief Ceed QFunction for building the geometric data for the 3D mass matrix **/ -#include +#include CEED_QFUNCTION(Mass3DBuild)(void *ctx, const CeedInt Q, const CeedScalar *const *in, CeedScalar *const *out) { // in[0] is Jacobians with shape [2, nc=3, Q] diff --git a/include/ceed/jit-source/gallery/ceed-massapply.h b/include/ceed/jit-source/gallery/ceed-massapply.h index 8559ce8a26..9d1f172190 100644 --- a/include/ceed/jit-source/gallery/ceed-massapply.h +++ b/include/ceed/jit-source/gallery/ceed-massapply.h @@ -9,7 +9,7 @@ @brief Ceed QFunction for applying the mass matrix **/ -#include +#include CEED_QFUNCTION(MassApply)(void *ctx, const CeedInt Q, const CeedScalar *const *in, CeedScalar *const *out) { // in[0] is u, size (Q) diff --git a/include/ceed/jit-source/gallery/ceed-poisson1dapply.h b/include/ceed/jit-source/gallery/ceed-poisson1dapply.h index dc38d4f21a..0a9dbfd9da 100644 --- a/include/ceed/jit-source/gallery/ceed-poisson1dapply.h +++ b/include/ceed/jit-source/gallery/ceed-poisson1dapply.h @@ -9,7 +9,7 @@ @brief Ceed QFunction for applying the 1D Poisson operator **/ -#include +#include CEED_QFUNCTION(Poisson1DApply)(void *ctx, const CeedInt Q, const CeedScalar *const *in, CeedScalar *const *out) { // in[0] is gradient u, size (Q) diff --git a/include/ceed/jit-source/gallery/ceed-poisson1dbuild.h b/include/ceed/jit-source/gallery/ceed-poisson1dbuild.h index dce08aabb2..cad2d5c672 100644 --- a/include/ceed/jit-source/gallery/ceed-poisson1dbuild.h +++ b/include/ceed/jit-source/gallery/ceed-poisson1dbuild.h @@ -9,7 +9,7 @@ @brief Ceed QFunction for building the geometric data for the 1D Poisson operator **/ -#include +#include CEED_QFUNCTION(Poisson1DBuild)(void *ctx, const CeedInt Q, const CeedScalar *const *in, CeedScalar *const *out) { // At every quadrature point, compute w/det(J).adj(J).adj(J)^T and store diff --git a/include/ceed/jit-source/gallery/ceed-poisson2dapply.h b/include/ceed/jit-source/gallery/ceed-poisson2dapply.h index dab64be671..e140c8cc8b 100644 --- a/include/ceed/jit-source/gallery/ceed-poisson2dapply.h +++ b/include/ceed/jit-source/gallery/ceed-poisson2dapply.h @@ -9,7 +9,7 @@ @brief Ceed QFunction for applying the 2D Poisson operator **/ -#include +#include CEED_QFUNCTION(Poisson2DApply)(void *ctx, const CeedInt Q, const CeedScalar *const *in, CeedScalar *const *out) { // in[0] is gradient u, shape [2, nc=1, Q] diff --git a/include/ceed/jit-source/gallery/ceed-poisson2dbuild.h b/include/ceed/jit-source/gallery/ceed-poisson2dbuild.h index 11e15255ad..91a1736748 100644 --- a/include/ceed/jit-source/gallery/ceed-poisson2dbuild.h +++ b/include/ceed/jit-source/gallery/ceed-poisson2dbuild.h @@ -9,7 +9,7 @@ @brief Ceed QFunction for building the geometric data for the 2D Poisson operator **/ -#include +#include CEED_QFUNCTION(Poisson2DBuild)(void *ctx, const CeedInt Q, const CeedScalar *const *in, CeedScalar *const *out) { // At every quadrature point, compute w/det(J).adj(J).adj(J)^T and store diff --git a/include/ceed/jit-source/gallery/ceed-poisson3dapply.h b/include/ceed/jit-source/gallery/ceed-poisson3dapply.h index 71e76926e7..ba25506034 100644 --- a/include/ceed/jit-source/gallery/ceed-poisson3dapply.h +++ b/include/ceed/jit-source/gallery/ceed-poisson3dapply.h @@ -9,7 +9,7 @@ @brief Ceed QFunction for applying the geometric data for the 3D Poisson operator **/ -#include +#include CEED_QFUNCTION(Poisson3DApply)(void *ctx, const CeedInt Q, const CeedScalar *const *in, CeedScalar *const *out) { // in[0] is gradient u, shape [3, nc=1, Q] diff --git a/include/ceed/jit-source/gallery/ceed-poisson3dbuild.h b/include/ceed/jit-source/gallery/ceed-poisson3dbuild.h index 2d4e0621e4..640d1e91e7 100644 --- a/include/ceed/jit-source/gallery/ceed-poisson3dbuild.h +++ b/include/ceed/jit-source/gallery/ceed-poisson3dbuild.h @@ -9,7 +9,7 @@ @brief Ceed QFunction for building the geometric data for the 3D Poisson operator **/ -#include +#include CEED_QFUNCTION(Poisson3DBuild)(void *ctx, const CeedInt Q, const CeedScalar *const *in, CeedScalar *const *out) { // At every quadrature point, compute w/det(J).adj(J).adj(J)^T and store the symmetric part of the result. diff --git a/include/ceed/jit-source/gallery/ceed-scale.h b/include/ceed/jit-source/gallery/ceed-scale.h index 1249810987..bdf7d7ee1c 100644 --- a/include/ceed/jit-source/gallery/ceed-scale.h +++ b/include/ceed/jit-source/gallery/ceed-scale.h @@ -9,7 +9,7 @@ @brief Scaling QFunction that scales inputs **/ -#include +#include CEED_QFUNCTION(Scale)(void *ctx, const CeedInt Q, const CeedScalar *const *in, CeedScalar *const *out) { // Ctx holds field size diff --git a/include/ceed/jit-source/gallery/ceed-vectormassapply.h b/include/ceed/jit-source/gallery/ceed-vectormassapply.h index 70a2f3e25c..1486a038b3 100644 --- a/include/ceed/jit-source/gallery/ceed-vectormassapply.h +++ b/include/ceed/jit-source/gallery/ceed-vectormassapply.h @@ -9,7 +9,7 @@ @brief Ceed QFunction for applying the mass matrix on a vector system with three components **/ -#include +#include CEED_QFUNCTION(Vector3MassApply)(void *ctx, const CeedInt Q, const CeedScalar *const *in, CeedScalar *const *out) { // in[0] is u, size (Q) diff --git a/include/ceed/jit-source/gallery/ceed-vectorpoisson1dapply.h b/include/ceed/jit-source/gallery/ceed-vectorpoisson1dapply.h index e056729422..e5f37c3f79 100644 --- a/include/ceed/jit-source/gallery/ceed-vectorpoisson1dapply.h +++ b/include/ceed/jit-source/gallery/ceed-vectorpoisson1dapply.h @@ -9,7 +9,7 @@ @brief Ceed QFunction for applying the 1D Poisson operator on a vector system with three components **/ -#include +#include CEED_QFUNCTION(Vector3Poisson1DApply)(void *ctx, const CeedInt Q, const CeedScalar *const *in, CeedScalar *const *out) { // in[0] is gradient u, shape [1, nc=3, Q] diff --git a/include/ceed/jit-source/gallery/ceed-vectorpoisson2dapply.h b/include/ceed/jit-source/gallery/ceed-vectorpoisson2dapply.h index 1b56240048..3742c67dbb 100644 --- a/include/ceed/jit-source/gallery/ceed-vectorpoisson2dapply.h +++ b/include/ceed/jit-source/gallery/ceed-vectorpoisson2dapply.h @@ -9,7 +9,7 @@ @brief Ceed QFunction for applying the 2D Poisson operator on a vector system with three components **/ -#include +#include CEED_QFUNCTION(Vector3Poisson2DApply)(void *ctx, const CeedInt Q, const CeedScalar *const *in, CeedScalar *const *out) { // in[0] is gradient u, shape [2, nc=3, Q] diff --git a/include/ceed/jit-source/gallery/ceed-vectorpoisson3dapply.h b/include/ceed/jit-source/gallery/ceed-vectorpoisson3dapply.h index 9ca86dba01..29545099b9 100644 --- a/include/ceed/jit-source/gallery/ceed-vectorpoisson3dapply.h +++ b/include/ceed/jit-source/gallery/ceed-vectorpoisson3dapply.h @@ -9,7 +9,7 @@ @brief Ceed QFunction for applying the geometric data for the 3D Poisson on a vector system with three components operator **/ -#include +#include CEED_QFUNCTION(Vector3Poisson3DApply)(void *ctx, const CeedInt Q, const CeedScalar *const *in, CeedScalar *const *out) { // in[0] is gradient u, shape [3, nc=3, Q] diff --git a/include/ceed/jit-source/hip/hip-gen-templates.h b/include/ceed/jit-source/hip/hip-gen-templates.h index 812e901866..fd014dbb8a 100644 --- a/include/ceed/jit-source/hip/hip-gen-templates.h +++ b/include/ceed/jit-source/hip/hip-gen-templates.h @@ -8,7 +8,7 @@ /// @file /// Internal header for HIP backend macro and type definitions for JiT source -#include +#include //------------------------------------------------------------------------------ // Load matrices for basis actions diff --git a/include/ceed/jit-source/hip/hip-ref-basis-nontensor-templates.h b/include/ceed/jit-source/hip/hip-ref-basis-nontensor-templates.h index 0374d459d5..c8160badf1 100644 --- a/include/ceed/jit-source/hip/hip-ref-basis-nontensor-templates.h +++ b/include/ceed/jit-source/hip/hip-ref-basis-nontensor-templates.h @@ -8,7 +8,7 @@ /// @file /// Internal header for HIP non-tensor product basis templates -#include +#include //------------------------------------------------------------------------------ // Tensor contraction diff --git a/include/ceed/jit-source/hip/hip-ref-basis-nontensor.h b/include/ceed/jit-source/hip/hip-ref-basis-nontensor.h index 953f6f48e3..bf950e11ab 100644 --- a/include/ceed/jit-source/hip/hip-ref-basis-nontensor.h +++ b/include/ceed/jit-source/hip/hip-ref-basis-nontensor.h @@ -8,7 +8,7 @@ /// @file /// Internal header for HIP non-tensor product basis -#include +#include #include "hip-ref-basis-nontensor-templates.h" diff --git a/include/ceed/jit-source/hip/hip-ref-basis-tensor-at-points.h b/include/ceed/jit-source/hip/hip-ref-basis-tensor-at-points.h index 4744b17eb2..42e63cab65 100644 --- a/include/ceed/jit-source/hip/hip-ref-basis-tensor-at-points.h +++ b/include/ceed/jit-source/hip/hip-ref-basis-tensor-at-points.h @@ -8,7 +8,7 @@ /// @file /// Internal header for CUDA tensor product basis with AtPoints evaluation -#include +#include //------------------------------------------------------------------------------ // Chebyshev values diff --git a/include/ceed/jit-source/hip/hip-ref-basis-tensor.h b/include/ceed/jit-source/hip/hip-ref-basis-tensor.h index db509ac2a0..8ddb3552b1 100644 --- a/include/ceed/jit-source/hip/hip-ref-basis-tensor.h +++ b/include/ceed/jit-source/hip/hip-ref-basis-tensor.h @@ -8,7 +8,7 @@ /// @file /// Internal header for HIP tensor product basis -#include +#include //------------------------------------------------------------------------------ // Tensor Basis Kernels diff --git a/include/ceed/jit-source/hip/hip-ref-operator-assemble-diagonal.h b/include/ceed/jit-source/hip/hip-ref-operator-assemble-diagonal.h index e6a8b6e6a1..9e4fef865c 100644 --- a/include/ceed/jit-source/hip/hip-ref-operator-assemble-diagonal.h +++ b/include/ceed/jit-source/hip/hip-ref-operator-assemble-diagonal.h @@ -8,7 +8,7 @@ /// @file /// Internal header for HIP operator diagonal assembly -#include +#include #if USE_CEEDSIZE typedef CeedSize IndexType; diff --git a/include/ceed/jit-source/hip/hip-ref-operator-assemble.h b/include/ceed/jit-source/hip/hip-ref-operator-assemble.h index 838dcfd4a5..a9b5bd7bc4 100644 --- a/include/ceed/jit-source/hip/hip-ref-operator-assemble.h +++ b/include/ceed/jit-source/hip/hip-ref-operator-assemble.h @@ -8,7 +8,7 @@ /// @file /// Internal header for HIP operator full assembly -#include +#include #if USE_CEEDSIZE typedef CeedSize IndexType; diff --git a/include/ceed/jit-source/hip/hip-ref-qfunction.h b/include/ceed/jit-source/hip/hip-ref-qfunction.h index 1b423072af..6524f74dfd 100644 --- a/include/ceed/jit-source/hip/hip-ref-qfunction.h +++ b/include/ceed/jit-source/hip/hip-ref-qfunction.h @@ -8,7 +8,7 @@ /// @file /// Internal header for HIP backend QFunction read/write kernels -#include +#include //------------------------------------------------------------------------------ // Read from quadrature points diff --git a/include/ceed/jit-source/hip/hip-ref-restriction-at-points.h b/include/ceed/jit-source/hip/hip-ref-restriction-at-points.h index f4cb95993b..5d5b3f9812 100644 --- a/include/ceed/jit-source/hip/hip-ref-restriction-at-points.h +++ b/include/ceed/jit-source/hip/hip-ref-restriction-at-points.h @@ -8,7 +8,7 @@ /// @file /// Internal header for HIP offset element restriction kernels -#include +#include //------------------------------------------------------------------------------ // E-vector -> L-vector, standard (with offsets) diff --git a/include/ceed/jit-source/hip/hip-ref-restriction-curl-oriented.h b/include/ceed/jit-source/hip/hip-ref-restriction-curl-oriented.h index 76d9758828..33b03ab673 100644 --- a/include/ceed/jit-source/hip/hip-ref-restriction-curl-oriented.h +++ b/include/ceed/jit-source/hip/hip-ref-restriction-curl-oriented.h @@ -8,7 +8,7 @@ /// @file /// Internal header for HIP curl-oriented element restriction kernels -#include +#include //------------------------------------------------------------------------------ // L-vector -> E-vector, curl-oriented diff --git a/include/ceed/jit-source/hip/hip-ref-restriction-offset.h b/include/ceed/jit-source/hip/hip-ref-restriction-offset.h index 65283b7193..a10c7fe957 100644 --- a/include/ceed/jit-source/hip/hip-ref-restriction-offset.h +++ b/include/ceed/jit-source/hip/hip-ref-restriction-offset.h @@ -8,7 +8,7 @@ /// @file /// Internal header for HIP offset element restriction kernels -#include +#include //------------------------------------------------------------------------------ // L-vector -> E-vector, standard (with offsets) diff --git a/include/ceed/jit-source/hip/hip-ref-restriction-oriented.h b/include/ceed/jit-source/hip/hip-ref-restriction-oriented.h index f983a24fc0..07d13d6515 100644 --- a/include/ceed/jit-source/hip/hip-ref-restriction-oriented.h +++ b/include/ceed/jit-source/hip/hip-ref-restriction-oriented.h @@ -8,7 +8,7 @@ /// @file /// Internal header for HIP oriented element restriction kernels -#include +#include //------------------------------------------------------------------------------ // L-vector -> E-vector, oriented diff --git a/include/ceed/jit-source/hip/hip-ref-restriction-strided.h b/include/ceed/jit-source/hip/hip-ref-restriction-strided.h index de1335c117..2f8bd18446 100644 --- a/include/ceed/jit-source/hip/hip-ref-restriction-strided.h +++ b/include/ceed/jit-source/hip/hip-ref-restriction-strided.h @@ -8,7 +8,7 @@ /// @file /// Internal header for HIP strided element restriction kernels -#include +#include //------------------------------------------------------------------------------ // L-vector -> E-vector, strided diff --git a/include/ceed/jit-source/hip/hip-shared-basis-read-write-templates.h b/include/ceed/jit-source/hip/hip-shared-basis-read-write-templates.h index 379d52d13b..47311c3361 100644 --- a/include/ceed/jit-source/hip/hip-shared-basis-read-write-templates.h +++ b/include/ceed/jit-source/hip/hip-shared-basis-read-write-templates.h @@ -8,7 +8,7 @@ /// @file /// Internal header for HIP shared memory basis read/write templates -#include +#include //------------------------------------------------------------------------------ // Helper function: load matrices for basis actions diff --git a/include/ceed/jit-source/hip/hip-shared-basis-tensor-templates.h b/include/ceed/jit-source/hip/hip-shared-basis-tensor-templates.h index 8dc50e4ed8..ef2ea90ec6 100644 --- a/include/ceed/jit-source/hip/hip-shared-basis-tensor-templates.h +++ b/include/ceed/jit-source/hip/hip-shared-basis-tensor-templates.h @@ -8,7 +8,7 @@ /// @file /// Internal header for HIP shared memory tensor product basis templates -#include +#include //------------------------------------------------------------------------------ // 1D diff --git a/include/ceed/jit-source/hip/hip-shared-basis-tensor.h b/include/ceed/jit-source/hip/hip-shared-basis-tensor.h index d052e53bf1..9c33a96b51 100644 --- a/include/ceed/jit-source/hip/hip-shared-basis-tensor.h +++ b/include/ceed/jit-source/hip/hip-shared-basis-tensor.h @@ -8,7 +8,7 @@ /// @file /// Internal header for HIP shared memory tensor product basis -#include +#include #include "hip-shared-basis-read-write-templates.h" #include "hip-shared-basis-tensor-templates.h" diff --git a/include/ceed/jit-source/sycl/sycl-gen-templates.h b/include/ceed/jit-source/sycl/sycl-gen-templates.h index aa54232c2d..cf6f6cbc15 100644 --- a/include/ceed/jit-source/sycl/sycl-gen-templates.h +++ b/include/ceed/jit-source/sycl/sycl-gen-templates.h @@ -7,7 +7,7 @@ /// @file /// Internal header for SYCL backend macro and type definitions for JiT source -#include +#include #pragma OPENCL EXTENSION cl_khr_int64_base_atomics : enable #pragma OPENCL EXTENSION cl_khr_int64_extended_atomics : enable diff --git a/include/ceed/jit-source/sycl/sycl-ref-qfunction.h b/include/ceed/jit-source/sycl/sycl-ref-qfunction.h index d62de2533a..4a2ae56e94 100644 --- a/include/ceed/jit-source/sycl/sycl-ref-qfunction.h +++ b/include/ceed/jit-source/sycl/sycl-ref-qfunction.h @@ -8,7 +8,7 @@ /// @file /// Internal header for SYCL backend QFunction read/write kernels -#include +#include //------------------------------------------------------------------------------ // Read from quadrature points diff --git a/include/ceed/jit-source/sycl/sycl-shared-basis-read-write-templates.h b/include/ceed/jit-source/sycl/sycl-shared-basis-read-write-templates.h index 421875b509..5ddc1e84c8 100644 --- a/include/ceed/jit-source/sycl/sycl-shared-basis-read-write-templates.h +++ b/include/ceed/jit-source/sycl/sycl-shared-basis-read-write-templates.h @@ -8,7 +8,7 @@ /// @file /// Internal header for SYCL shared memory basis read/write templates -#include +#include #include "sycl-types.h" //------------------------------------------------------------------------------ diff --git a/include/ceed/jit-source/sycl/sycl-shared-basis-tensor-templates.h b/include/ceed/jit-source/sycl/sycl-shared-basis-tensor-templates.h index 28bd24d9f9..9933b2f5f0 100644 --- a/include/ceed/jit-source/sycl/sycl-shared-basis-tensor-templates.h +++ b/include/ceed/jit-source/sycl/sycl-shared-basis-tensor-templates.h @@ -8,7 +8,7 @@ /// @file /// Internal header for SYCL shared memory tensor product basis templates -#include +#include //------------------------------------------------------------------------------ // 1D diff --git a/include/ceed/jit-source/sycl/sycl-shared-basis-tensor.h b/include/ceed/jit-source/sycl/sycl-shared-basis-tensor.h index f8e4ccdc0a..60b8bf531d 100644 --- a/include/ceed/jit-source/sycl/sycl-shared-basis-tensor.h +++ b/include/ceed/jit-source/sycl/sycl-shared-basis-tensor.h @@ -8,7 +8,7 @@ /// @file /// Internal header for SYCL shared memory tensor product basis -#include +#include #include "sycl-shared-basis-read-write-templates.h" #include "sycl-shared-basis-tensor-templates.h" diff --git a/interface/ceed-qfunction.c b/interface/ceed-qfunction.c index 02715249d4..7c0cf3a285 100644 --- a/interface/ceed-qfunction.c +++ b/interface/ceed-qfunction.c @@ -608,6 +608,8 @@ int CeedQFunctionGetFlopsEstimate(CeedQFunction qf, CeedSize *flops) { @param[in] source Absolute path to source of `CeedQFunctionUser`, "\abs_path\file.h:function_name". The entire source file must only contain constructs supported by all targeted backends (i.e. CUDA for `/gpu/cuda`, OpenCL/SYCL for `/gpu/sycl`, etc.). The entire contents of this file and all locally included files are used during JiT compilation for GPU backends. + The header `ceed/types.h` is preferred over `ceed.h` or `ceed/ceed.h` for `CeedQFunction` source files. + The macro `CEED_RUNNING_JIT_PASS` is set during JiT and can be used to guard include statements that JiT compilers cannot use, such as `math.h` or `std*.h`. All source files must be at the provided filepath at runtime for JiT to function. @param[out] qf Address of the variable where the newly created `CeedQFunction` will be stored diff --git a/tests/t400-qfunction.h b/tests/t400-qfunction.h index 1fb64842fd..b3e226df14 100644 --- a/tests/t400-qfunction.h +++ b/tests/t400-qfunction.h @@ -5,7 +5,7 @@ // // This file is part of CEED: http://github.com/ceed -#include +#include CEED_QFUNCTION(setup)(void *ctx, const CeedInt Q, const CeedScalar *const *in, CeedScalar *const *out) { const CeedScalar *w = in[0]; diff --git a/tests/t401-qfunction.h b/tests/t401-qfunction.h index c61cdb8ac6..465ec0b119 100644 --- a/tests/t401-qfunction.h +++ b/tests/t401-qfunction.h @@ -5,7 +5,7 @@ // // This file is part of CEED: http://github.com/ceed -#include +#include CEED_QFUNCTION(setup)(void *ctx, const CeedInt Q, const CeedScalar *const *in, CeedScalar *const *out) { const CeedScalar *w = in[0]; diff --git a/tests/t405-qfunction.h b/tests/t405-qfunction.h index eaf261791f..40be19b47d 100644 --- a/tests/t405-qfunction.h +++ b/tests/t405-qfunction.h @@ -5,7 +5,7 @@ // // This file is part of CEED: http://github.com/ceed -#include +#include CEED_QFUNCTION(setup)(void *ctx, const CeedInt Q, const CeedScalar *const *in, CeedScalar *const *out) { const CeedScalar *w = in[0]; diff --git a/tests/t406-qfunction-helper.h b/tests/t406-qfunction-helper.h index 4c41de3a33..85fdf9999c 100644 --- a/tests/t406-qfunction-helper.h +++ b/tests/t406-qfunction-helper.h @@ -10,6 +10,7 @@ # pragma once // clang-format on +// Note - ceed/types.h should be used over ceed.h #include // Test include path with "/./" diff --git a/tests/t406-qfunction.h b/tests/t406-qfunction.h index 8be7fd8d34..642de84a67 100644 --- a/tests/t406-qfunction.h +++ b/tests/t406-qfunction.h @@ -7,8 +7,12 @@ // Note: intentionally testing strange spacing in include's // clang-format off +// Note - ceed/types.h should be used over ceed.h #include -# include +// Note - system headers like math.h and std*.h should be guarded +#ifndef CEED_RUNNING_JIT_PASS +# include +#endif #include "t406-qfunction-helper.h" // Test duplicate includes of guarded files diff --git a/tests/t409-qfunction.h b/tests/t409-qfunction.h index 27e2c6585e..5348ffeb9d 100644 --- a/tests/t409-qfunction.h +++ b/tests/t409-qfunction.h @@ -5,7 +5,7 @@ // // This file is part of CEED: http://github.com/ceed -#include +#include CEED_QFUNCTION(scale)(void *ctx, const CeedInt Q, const CeedScalar *const *in, CeedScalar *const *out) { CeedScalar *scale = (CeedScalar *)ctx; diff --git a/tests/t500-operator.h b/tests/t500-operator.h index de9ca8966a..777978bc34 100644 --- a/tests/t500-operator.h +++ b/tests/t500-operator.h @@ -5,7 +5,7 @@ // // This file is part of CEED: http://github.com/ceed -#include +#include CEED_QFUNCTION(setup)(void *ctx, const CeedInt Q, const CeedScalar *const *in, CeedScalar *const *out) { const CeedScalar *weight = in[0], *dxdX = in[1]; diff --git a/tests/t502-operator.h b/tests/t502-operator.h index 9d343b5ab9..9915ee4282 100644 --- a/tests/t502-operator.h +++ b/tests/t502-operator.h @@ -5,7 +5,7 @@ // // This file is part of CEED: http://github.com/ceed -#include +#include CEED_QFUNCTION(setup)(void *ctx, const CeedInt Q, const CeedScalar *const *in, CeedScalar *const *out) { const CeedScalar *weight = in[0], *dxdX = in[1]; diff --git a/tests/t507-operator.h b/tests/t507-operator.h index 5d245534be..3166f2ee69 100644 --- a/tests/t507-operator.h +++ b/tests/t507-operator.h @@ -5,7 +5,7 @@ // // This file is part of CEED: http://github.com/ceed -#include +#include CEED_QFUNCTION(setup)(void *ctx, const CeedInt Q, const CeedScalar *const *in, CeedScalar *const *out) { const CeedScalar *weight = in[0], *dxdX = in[1]; diff --git a/tests/t510-operator.h b/tests/t510-operator.h index 01cf47450c..20677b157a 100644 --- a/tests/t510-operator.h +++ b/tests/t510-operator.h @@ -5,7 +5,7 @@ // // This file is part of CEED: http://github.com/ceed -#include +#include CEED_QFUNCTION(setup)(void *ctx, const CeedInt Q, const CeedScalar *const *in, CeedScalar *const *out) { const CeedScalar *weight = in[0], *J = in[1]; diff --git a/tests/t522-operator.h b/tests/t522-operator.h index 3f70b7d354..52aa9bae28 100644 --- a/tests/t522-operator.h +++ b/tests/t522-operator.h @@ -5,7 +5,7 @@ // // This file is part of CEED: http://github.com/ceed -#include +#include CEED_QFUNCTION(setup)(void *ctx, const CeedInt Q, const CeedScalar *const *in, CeedScalar *const *out) { const CeedScalar *qw = in[0], *J = in[1]; diff --git a/tests/t530-operator.h b/tests/t530-operator.h index 01cf47450c..20677b157a 100644 --- a/tests/t530-operator.h +++ b/tests/t530-operator.h @@ -5,7 +5,7 @@ // // This file is part of CEED: http://github.com/ceed -#include +#include CEED_QFUNCTION(setup)(void *ctx, const CeedInt Q, const CeedScalar *const *in, CeedScalar *const *out) { const CeedScalar *weight = in[0], *J = in[1]; diff --git a/tests/t531-operator.h b/tests/t531-operator.h index 4050ca35dc..79a083f032 100644 --- a/tests/t531-operator.h +++ b/tests/t531-operator.h @@ -5,7 +5,7 @@ // // This file is part of CEED: http://github.com/ceed -#include +#include CEED_QFUNCTION(setup)(void *ctx, const CeedInt Q, const CeedScalar *const *in, CeedScalar *const *out) { // At every quadrature point, compute qw/det(J).adj(J).adj(J)^T and store diff --git a/tests/t532-operator.h b/tests/t532-operator.h index e15e3aed19..6de6e8b669 100644 --- a/tests/t532-operator.h +++ b/tests/t532-operator.h @@ -5,7 +5,7 @@ // // This file is part of CEED: http://github.com/ceed -#include +#include CEED_QFUNCTION(setup_mass)(void *ctx, const CeedInt Q, const CeedScalar *const *in, CeedScalar *const *out) { const CeedScalar *J = in[0], *weight = in[1]; diff --git a/tests/t534-operator.h b/tests/t534-operator.h index 3fc4c58887..cfe2bf73ac 100644 --- a/tests/t534-operator.h +++ b/tests/t534-operator.h @@ -5,7 +5,7 @@ // // This file is part of CEED: http://github.com/ceed -#include +#include CEED_QFUNCTION(setup)(void *ctx, const CeedInt Q, const CeedScalar *const *in, CeedScalar *const *out) { // At every quadrature point, compute qw/det(J).adj(J).adj(J)^T and store diff --git a/tests/t535-operator.h b/tests/t535-operator.h index 7f6797608c..ba3d5498cb 100644 --- a/tests/t535-operator.h +++ b/tests/t535-operator.h @@ -5,7 +5,7 @@ // // This file is part of CEED: http://github.com/ceed -#include +#include CEED_QFUNCTION(setup_mass)(void *ctx, const CeedInt Q, const CeedScalar *const *in, CeedScalar *const *out) { const CeedScalar *J = in[0], *weight = in[1]; diff --git a/tests/t537-operator.h b/tests/t537-operator.h index 80b2d22d73..f42f4fc1e4 100644 --- a/tests/t537-operator.h +++ b/tests/t537-operator.h @@ -5,7 +5,7 @@ // // This file is part of CEED: http://github.com/ceed -#include +#include CEED_QFUNCTION(setup)(void *ctx, const CeedInt Q, const CeedScalar *const *in, CeedScalar *const *out) { const CeedScalar *weight = in[0], *J = in[1]; diff --git a/tests/t539-operator.h b/tests/t539-operator.h index 3a4fda2475..c51487250b 100644 --- a/tests/t539-operator.h +++ b/tests/t539-operator.h @@ -5,7 +5,7 @@ // // This file is part of CEED: http://github.com/ceed -#include +#include CEED_QFUNCTION(apply)(void *ctx, const CeedInt Q, const CeedScalar *const *in, CeedScalar *const *out) { // in[0] is gradient u_0, shape [2, num_comp=2, Q] diff --git a/tests/t540-operator.h b/tests/t540-operator.h index 79f5006719..f6052946aa 100644 --- a/tests/t540-operator.h +++ b/tests/t540-operator.h @@ -5,7 +5,7 @@ // // This file is part of CEED: http://github.com/ceed -#include +#include CEED_QFUNCTION(setup_mass)(void *ctx, const CeedInt Q, const CeedScalar *const *in, CeedScalar *const *out) { const CeedScalar *J = in[0], *weight = in[1]; diff --git a/tests/t541-operator.h b/tests/t541-operator.h index 7eaa675c97..2f588f76be 100644 --- a/tests/t541-operator.h +++ b/tests/t541-operator.h @@ -5,7 +5,7 @@ // // This file is part of CEED: http://github.com/ceed -#include +#include CEED_QFUNCTION(setup_diff)(void *ctx, const CeedInt Q, const CeedScalar *const *in, CeedScalar *const *out) { // in[0] is Jacobians with shape [2, nc=2, Q] diff --git a/tests/t566-operator.h b/tests/t566-operator.h index dfd0da43a2..a1c57cae55 100644 --- a/tests/t566-operator.h +++ b/tests/t566-operator.h @@ -5,7 +5,7 @@ // // This file is part of CEED: http://github.com/ceed -#include +#include CEED_QFUNCTION(setup)(void *ctx, const CeedInt Q, const CeedScalar *const *in, CeedScalar *const *out) { const CeedScalar *weight = in[0], *J = in[1]; diff --git a/tests/t567-operator.h b/tests/t567-operator.h index 6b645272dc..faee0aa5ac 100644 --- a/tests/t567-operator.h +++ b/tests/t567-operator.h @@ -5,7 +5,7 @@ // // This file is part of CEED: http://github.com/ceed -#include +#include CEED_QFUNCTION(setup)(void *ctx, const CeedInt Q, const CeedScalar *const *in, CeedScalar *const *out) { const CeedScalar *w = in[0], (*J)[2][CEED_Q_VLA] = (const CeedScalar(*)[2][CEED_Q_VLA])in[1]; diff --git a/tests/t568-operator.h b/tests/t568-operator.h index d52bc2d800..8cbb0ba8bf 100644 --- a/tests/t568-operator.h +++ b/tests/t568-operator.h @@ -5,7 +5,7 @@ // // This file is part of CEED: http://github.com/ceed -#include +#include CEED_QFUNCTION(setup)(void *ctx, const CeedInt Q, const CeedScalar *const *in, CeedScalar *const *out) { // At every quadrature point, compute qw/det(J).adj(J).adj(J)^T and store diff --git a/tests/t580-operator.h b/tests/t580-operator.h index 940a3605fc..e53f7817de 100644 --- a/tests/t580-operator.h +++ b/tests/t580-operator.h @@ -5,7 +5,7 @@ // // This file is part of CEED: http://github.com/ceed -#include +#include // Compute det(A) CEED_QFUNCTION_HELPER CeedScalar MatDet2x2(const CeedScalar A[2][2]) { return A[0][0] * A[1][1] - A[1][0] * A[0][1]; } diff --git a/tests/t590-operator.h b/tests/t590-operator.h index a2018718f8..d4c45b3735 100644 --- a/tests/t590-operator.h +++ b/tests/t590-operator.h @@ -5,7 +5,7 @@ // // This file is part of CEED: http://github.com/ceed -#include +#include CEED_QFUNCTION(mass)(void *ctx, const CeedInt Q, const CeedScalar *const *in, CeedScalar *const *out) { const CeedScalar *u = in[0]; diff --git a/tests/t591-operator.h b/tests/t591-operator.h index 1c64f1181f..3385bf9dcc 100644 --- a/tests/t591-operator.h +++ b/tests/t591-operator.h @@ -5,7 +5,7 @@ // // This file is part of CEED: http://github.com/ceed -#include +#include CEED_QFUNCTION(setup)(void *ctx, const CeedInt Q, const CeedScalar *const *in, CeedScalar *const *out) { const CeedScalar(*J)[2][CEED_Q_VLA] = (const CeedScalar(*)[2][CEED_Q_VLA])in[0]; diff --git a/tests/test-include/fake-sys-include.h b/tests/test-include/fake-sys-include.h index ec1c9b2c56..edb954cb54 100644 --- a/tests/test-include/fake-sys-include.h +++ b/tests/test-include/fake-sys-include.h @@ -1,10 +1,14 @@ #define FAKE_SYS_SCALE_ONE 1 // Note - files included this way cannot transitively include any files CUDA/ROCm won't compile -// These are bad -// #include -// #include +// These are bad and need to be guarded +#ifndef CEED_RUNNING_JIT_PASS +#include +#include +#endif // These are ok +// Note - ceed/types.h should be used over ceed.h +// ceed.h is replaced with ceed/types.h during JiT #include #include