From daac3559c5f8326c66fd7b6de17ab3659010c206 Mon Sep 17 00:00:00 2001 From: Claude Date: Thu, 20 Aug 2026 11:23:39 +0000 Subject: [PATCH] refactor: spell the public interface 437 includes named the public prefix as "fastfields/..." and not one used . That is carryover rather than a decision: the consolidation script rewrote the *path* in every #include and left the delimiter alone, because that was the minimal textual change. include/fastfields/ is the public installed interface -- it is what gets copied to an install prefix, and what fastfields-dlpack puts on the compiler's include path via include_dirs. The ordinary convention spells a dependency found on the include path with <> and a dependency found next to the includer with "", and this tree was writing both categories the same way. The clearest evidence that the result reads wrong is downstream, in fastfields-dlpack/src/ext.cpp, which writes and "fastfields/api/distance.h" ten lines apart -- two spellings for the same category of dependency. So: everywhere for the public prefix, and the ~135 genuinely relative includes ("../utils.h", "flow/2d.h", "utils.h") stay quoted, because they are private to their component and correctly spelled already. WHY THIS CHANGES NOTHING AT COMPILE TIME "" searches the including file's own directory first and then falls back to exactly the <> search, so the two differ only when a quoted include is resolved by that first step. make/common.mk's INCLUDES += -I$(ROOTDIR)/include is the entire include configuration -- all four Makefiles compile with $(INCLUDES) and nothing else, and there is no -iquote anywhere in the tree -- so "" and <> share one search path here. The script does not ask anyone to take that on trust. Its --check re-derives it from the sources: it verifies that every quoted include really does resolve beside its includer (so no quoted include was relying on the include path, and the rewrite cannot have changed which file any of them names), and the converse, that no angle-bracket include of ours resolves beside its includer. Both invariants already held on main before this commit, which is what makes the conversion mechanical. NOT TOUCHED tools/consolidate.sh and tools/dedup-dispatch-helpers.py quote include lines as literals of the tree at their own parent commit; their documented contract is to be replayed against that parent, not against today's main. Rewriting those literals would break the replay, so they are left alone. REPRODUCIBILITY tools/normalise-include-delimiters.py is committed, following tools/rename-macros.py and tools/dedup-dispatch-helpers.py, so a 147-file rewrite can be replayed instead of read: git checkout HEAD~1 -- include src tests python3 tools/normalise-include-delimiters.py git diff # empty --check exits non-zero on any violation, so a rebase does not need a hand audit. The rule is recorded in CLAUDE.md. --- CLAUDE.md | 10 + include/fastfields/api/checks.h | 4 +- include/fastfields/api/cpu/distance.h | 2 +- include/fastfields/api/cpu/posdef.h | 2 +- include/fastfields/api/cpu/pushpull.h | 2 +- .../fastfields/api/cpu/pushpull_dispatch.h | 12 +- include/fastfields/api/cpu/reg_field.h | 2 +- include/fastfields/api/cpu/reg_flow.h | 2 +- include/fastfields/api/cpu/resize.h | 2 +- include/fastfields/api/cpu/restrict.h | 2 +- include/fastfields/api/cpu/solve_field.h | 2 +- include/fastfields/api/cpu/splinc.h | 2 +- include/fastfields/api/cuda/distance.h | 2 +- include/fastfields/api/cuda/posdef.h | 2 +- include/fastfields/api/cuda/pushpull.h | 2 +- .../fastfields/api/cuda/pushpull_dispatch.h | 12 +- include/fastfields/api/cuda/reg_field.h | 2 +- include/fastfields/api/cuda/reg_flow.h | 2 +- include/fastfields/api/cuda/resize.h | 2 +- include/fastfields/api/cuda/restrict.h | 2 +- include/fastfields/api/cuda/splinc.h | 2 +- include/fastfields/api/cuda/stream.h | 2 +- include/fastfields/api/distance.h | 4 +- include/fastfields/api/posdef.h | 4 +- include/fastfields/api/pushpull.h | 4 +- include/fastfields/api/reg_field.h | 4 +- include/fastfields/api/reg_flow.h | 4 +- include/fastfields/api/resize.h | 4 +- include/fastfields/api/restrict.h | 4 +- include/fastfields/api/solve_field.h | 4 +- include/fastfields/api/splinc.h | 4 +- include/fastfields/core/autocast.h | 4 +- include/fastfields/core/cuda_switch.h | 2 +- include/fastfields/core/dispatch.h | 6 +- .../fastfields/impl/cpu/distance_euclidean.h | 10 +- include/fastfields/impl/cpu/distance_l1.h | 10 +- include/fastfields/impl/cpu/distance_mesh.h | 10 +- include/fastfields/impl/cpu/distance_spline.h | 8 +- include/fastfields/impl/cpu/posdef.h | 8 +- include/fastfields/impl/cpu/pushpull.h | 10 +- include/fastfields/impl/cpu/reg_field.h | 14 +- include/fastfields/impl/cpu/reg_flow.h | 14 +- include/fastfields/impl/cpu/resize.h | 8 +- include/fastfields/impl/cpu/restrict.h | 8 +- include/fastfields/impl/cpu/solve_field.h | 8 +- include/fastfields/impl/cpu/splinc.h | 10 +- .../fastfields/impl/cuda/distance_euclidean.h | 6 +- include/fastfields/impl/cuda/distance_l1.h | 6 +- include/fastfields/impl/cuda/distance_mesh.h | 8 +- .../fastfields/impl/cuda/distance_spline.h | 8 +- include/fastfields/impl/cuda/posdef.h | 6 +- include/fastfields/impl/cuda/pushpull.h | 10 +- include/fastfields/impl/cuda/reg_field.h | 12 +- include/fastfields/impl/cuda/reg_flow.h | 12 +- include/fastfields/impl/cuda/resize.h | 10 +- include/fastfields/impl/cuda/restrict.h | 10 +- include/fastfields/impl/cuda/splinc.h | 8 +- include/fastfields/impl/cuda/utils.h | 2 +- include/fastfields/impl/kernels/atomic.h | 2 +- include/fastfields/impl/kernels/batch.h | 2 +- include/fastfields/impl/kernels/bounds.h | 2 +- .../impl/kernels/distance/euclidean.h | 2 +- include/fastfields/impl/kernels/distance/l1.h | 2 +- .../fastfields/impl/kernels/distance/mesh.h | 2 +- .../impl/kernels/distance/mesh_utils.h | 2 +- .../fastfields/impl/kernels/distance/spline.h | 2 +- include/fastfields/impl/kernels/meta.h | 2 +- include/fastfields/impl/kernels/parallel.h | 2 +- .../fastfields/impl/kernels/parallel_impl.h | 2 +- .../fastfields/impl/kernels/posdef/cholesky.h | 2 +- .../fastfields/impl/kernels/posdef/posdef.h | 2 +- .../fastfields/impl/kernels/posdef/utils.h | 2 +- include/fastfields/impl/kernels/pushpull/1d.h | 2 +- include/fastfields/impl/kernels/pushpull/2d.h | 2 +- include/fastfields/impl/kernels/pushpull/3d.h | 2 +- include/fastfields/impl/kernels/pushpull/nd.h | 2 +- .../fastfields/impl/kernels/pushpull/utils.h | 2 +- .../impl/kernels/regularisers/field/1d.h | 2 +- .../impl/kernels/regularisers/field/2d.h | 2 +- .../impl/kernels/regularisers/field/3d.h | 2 +- .../impl/kernels/regularisers/field/utils.h | 2 +- .../impl/kernels/regularisers/flow/1d.h | 2 +- .../impl/kernels/regularisers/flow/2d.h | 2 +- .../impl/kernels/regularisers/flow/3d.h | 2 +- .../impl/kernels/regularisers/flow/utils.h | 2 +- include/fastfields/impl/kernels/resize.h | 2 +- include/fastfields/impl/kernels/restrict.h | 2 +- include/fastfields/impl/kernels/splinc.h | 2 +- include/fastfields/impl/kernels/spline.h | 2 +- include/fastfields/impl/kernels/tetrahedron.h | 2 +- include/fastfields/impl/kernels/threadpool.h | 2 +- .../fastfields/impl/kernels/threadpool.inl | 2 +- include/fastfields/impl/kernels/utils.h | 2 +- .../impl/kernels/vector/abstract_ptr.h | 2 +- .../impl/kernels/vector/abstract_sized.h | 2 +- .../impl/kernels/vector/abstract_vector.h | 2 +- .../impl/kernels/vector/concrete_vector.h | 2 +- .../fastfields/impl/kernels/vector/weak_ref.h | 2 +- .../impl/kernels/vector/weak_sized.h | 2 +- .../impl/kernels/vector/weak_vector.h | 2 +- src/lib-cpu/distance.cpp | 20 +- src/lib-cpu/posdef.cpp | 14 +- src/lib-cpu/pushpull.cpp | 4 +- src/lib-cpu/pushpull_backward.cpp | 4 +- src/lib-cpu/reg_field.cpp | 18 +- src/lib-cpu/reg_flow.cpp | 18 +- src/lib-cpu/resize.cpp | 14 +- src/lib-cpu/restrict.cpp | 14 +- src/lib-cpu/solve_field.cpp | 18 +- src/lib-cpu/splinc.cpp | 14 +- src/lib-cuda/distance.cpp | 20 +- src/lib-cuda/posdef.cpp | 14 +- src/lib-cuda/pushpull.cpp | 4 +- src/lib-cuda/pushpull_backward.cpp | 4 +- src/lib-cuda/reg_field.cpp | 20 +- src/lib-cuda/reg_field_rls.cpp | 20 +- src/lib-cuda/reg_flow.cpp | 20 +- src/lib-cuda/reg_flow_rls.cpp | 20 +- src/lib-cuda/resize.cpp | 14 +- src/lib-cuda/restrict.cpp | 14 +- src/lib-cuda/splinc.cpp | 14 +- src/lib/distance.cpp | 8 +- src/lib/posdef.cpp | 8 +- src/lib/pushpull.cpp | 8 +- src/lib/reg_field.cpp | 8 +- src/lib/reg_flow.cpp | 8 +- src/lib/resize.cpp | 8 +- src/lib/restrict.cpp | 8 +- src/lib/solve_field.cpp | 6 +- src/lib/splinc.cpp | 8 +- tests/impl-cuda/compile_probe_mesh.cu | 2 +- tests/kernels/atomic/test.cpp | 4 +- tests/kernels/vector/test.cpp | 4 +- tests/lib-cpu/test_distance.cpp | 4 +- tests/lib-cpu/test_distance_mesh.cpp | 4 +- tests/lib-cpu/test_distance_spline.cpp | 8 +- tests/lib-cpu/test_posdef.cpp | 4 +- tests/lib-cpu/test_pushpull.cpp | 4 +- tests/lib-cpu/test_pushpull_backward.cpp | 4 +- tests/lib-cpu/test_reg_field.cpp | 6 +- tests/lib-cpu/test_reg_flow.cpp | 6 +- tests/lib-cpu/test_reg_op.cpp | 10 +- tests/lib-cpu/test_resize.cpp | 4 +- tests/lib-cpu/test_restrict.cpp | 6 +- tests/lib-cpu/test_solve_field.cpp | 8 +- tests/lib-cpu/test_splinc.cpp | 8 +- tests/lib/test_device_check.cpp | 2 +- tests/lib/test_splinc_bound.cpp | 2 +- tools/normalise-include-delimiters.py | 185 ++++++++++++++++++ 149 files changed, 632 insertions(+), 437 deletions(-) create mode 100644 tools/normalise-include-delimiters.py diff --git a/CLAUDE.md b/CLAUDE.md index 2da0ea4..f74c190 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -182,6 +182,16 @@ pushpull's fully-static order×bound compile is nightly library, so those *are* `` there) and the non-nvcc `__device__` / `__host__` fallbacks. Prefer an `inline` function to a macro where one will do — a function in `ff::` is collision-safe without any prefix. +- **`` for the public interface, `"…"` for private headers.** + `include/fastfields/` is what gets installed and what `fastfields-dlpack` + puts on its include path, so it is spelled with angle brackets like any other + installed dependency; a header reached relative to the including file + (`"../utils.h"`, `"flow/2d.h"`) keeps quotes. The two resolve identically + here — `make/common.mk`'s `-I$(ROOTDIR)/include` is the entire include + configuration and there is no `-iquote` anywhere — so this is about saying + which category a dependency is in, not about lookup. + `tools/normalise-include-delimiters.py --check` enforces it, and also checks + the converse: every quoted include must resolve beside its includer. - `include/fastfields/core/dlpack.h` is vendored upstream code: do not edit it, and it is skipped by `codespell` (see `.codespellrc`). diff --git a/include/fastfields/api/checks.h b/include/fastfields/api/checks.h index 9369c1d..6b41d68 100644 --- a/include/fastfields/api/checks.h +++ b/include/fastfields/api/checks.h @@ -1,8 +1,8 @@ #ifndef FF_LIB_CHECKS #define FF_LIB_CHECKS #include -#include "fastfields/core/dlpack.h" -#include "fastfields/core/defines.h" +#include +#include FF_NAMESPACE_BEGIN(FF_NS) diff --git a/include/fastfields/api/cpu/distance.h b/include/fastfields/api/cpu/distance.h index 8e96e6d..9382753 100644 --- a/include/fastfields/api/cpu/distance.h +++ b/include/fastfields/api/cpu/distance.h @@ -1,6 +1,6 @@ #ifndef FF_CPU_DISTANCE #define FF_CPU_DISTANCE -#include "fastfields/core/dlpack.h" +#include #include namespace ff { diff --git a/include/fastfields/api/cpu/posdef.h b/include/fastfields/api/cpu/posdef.h index 5331d10..74452e5 100644 --- a/include/fastfields/api/cpu/posdef.h +++ b/include/fastfields/api/cpu/posdef.h @@ -1,6 +1,6 @@ #ifndef FF_CPU_POSDEF #define FF_CPU_POSDEF -#include "fastfields/core/dlpack.h" +#include #include namespace ff { diff --git a/include/fastfields/api/cpu/pushpull.h b/include/fastfields/api/cpu/pushpull.h index 26087fc..6a33df3 100644 --- a/include/fastfields/api/cpu/pushpull.h +++ b/include/fastfields/api/cpu/pushpull.h @@ -1,6 +1,6 @@ #ifndef FF_CPU_PUSHPULL #define FF_CPU_PUSHPULL -#include "fastfields/core/dlpack.h" +#include #include namespace ff { diff --git a/include/fastfields/api/cpu/pushpull_dispatch.h b/include/fastfields/api/cpu/pushpull_dispatch.h index a8790c0..61581c0 100644 --- a/include/fastfields/api/cpu/pushpull_dispatch.h +++ b/include/fastfields/api/cpu/pushpull_dispatch.h @@ -16,12 +16,12 @@ */ #include #include -#include "fastfields/core/autocast.h" -#include "fastfields/core/dispatch.h" -#include "fastfields/core/dlpack.h" -#include "fastfields/core/cuda_switch.h" -#include "fastfields/impl/kernels/utils.h" -#include "fastfields/impl/cpu/pushpull.h" +#include +#include +#include +#include +#include +#include FF_NAMESPACE_BEGIN(FF_NS) FF_NAMESPACE_BEGIN(FF_DEVICE) diff --git a/include/fastfields/api/cpu/reg_field.h b/include/fastfields/api/cpu/reg_field.h index b6069c5..ed3abb5 100644 --- a/include/fastfields/api/cpu/reg_field.h +++ b/include/fastfields/api/cpu/reg_field.h @@ -1,6 +1,6 @@ #ifndef FF_CPU_REG_FIELD #define FF_CPU_REG_FIELD -#include "fastfields/core/dlpack.h" +#include #include namespace ff { diff --git a/include/fastfields/api/cpu/reg_flow.h b/include/fastfields/api/cpu/reg_flow.h index dfaca6e..e19c798 100644 --- a/include/fastfields/api/cpu/reg_flow.h +++ b/include/fastfields/api/cpu/reg_flow.h @@ -1,6 +1,6 @@ #ifndef FF_CPU_REG_FLOW #define FF_CPU_REG_FLOW -#include "fastfields/core/dlpack.h" +#include #include namespace ff { diff --git a/include/fastfields/api/cpu/resize.h b/include/fastfields/api/cpu/resize.h index b0252ae..e67ef75 100644 --- a/include/fastfields/api/cpu/resize.h +++ b/include/fastfields/api/cpu/resize.h @@ -1,6 +1,6 @@ #ifndef FF_CPU_RESIZE #define FF_CPU_RESIZE -#include "fastfields/core/dlpack.h" +#include #include namespace ff { diff --git a/include/fastfields/api/cpu/restrict.h b/include/fastfields/api/cpu/restrict.h index 4863c2a..a1c0c95 100644 --- a/include/fastfields/api/cpu/restrict.h +++ b/include/fastfields/api/cpu/restrict.h @@ -1,6 +1,6 @@ #ifndef FF_CPU_RESTRICT #define FF_CPU_RESTRICT -#include "fastfields/core/dlpack.h" +#include #include namespace ff { diff --git a/include/fastfields/api/cpu/solve_field.h b/include/fastfields/api/cpu/solve_field.h index 92a3b80..31d4ec3 100644 --- a/include/fastfields/api/cpu/solve_field.h +++ b/include/fastfields/api/cpu/solve_field.h @@ -1,6 +1,6 @@ #ifndef FF_CPU_SOLVE_FIELD #define FF_CPU_SOLVE_FIELD -#include "fastfields/core/dlpack.h" +#include #include namespace ff { diff --git a/include/fastfields/api/cpu/splinc.h b/include/fastfields/api/cpu/splinc.h index abd49f2..f2acc00 100644 --- a/include/fastfields/api/cpu/splinc.h +++ b/include/fastfields/api/cpu/splinc.h @@ -1,6 +1,6 @@ #ifndef FF_CPU_SPLINC #define FF_CPU_SPLINC -#include "fastfields/core/dlpack.h" +#include #include namespace ff { diff --git a/include/fastfields/api/cuda/distance.h b/include/fastfields/api/cuda/distance.h index a59a1dc..70b8350 100644 --- a/include/fastfields/api/cuda/distance.h +++ b/include/fastfields/api/cuda/distance.h @@ -1,6 +1,6 @@ #ifndef FF_CUDA_DISTANCE #define FF_CUDA_DISTANCE -#include "fastfields/core/dlpack.h" +#include #include namespace ff { diff --git a/include/fastfields/api/cuda/posdef.h b/include/fastfields/api/cuda/posdef.h index 12018eb..7f3cab6 100644 --- a/include/fastfields/api/cuda/posdef.h +++ b/include/fastfields/api/cuda/posdef.h @@ -1,6 +1,6 @@ #ifndef FF_CUDA_POSDEF #define FF_CUDA_POSDEF -#include "fastfields/core/dlpack.h" +#include #include namespace ff { diff --git a/include/fastfields/api/cuda/pushpull.h b/include/fastfields/api/cuda/pushpull.h index ee399b4..4f64e26 100644 --- a/include/fastfields/api/cuda/pushpull.h +++ b/include/fastfields/api/cuda/pushpull.h @@ -1,6 +1,6 @@ #ifndef FF_CUDA_PUSHPULL #define FF_CUDA_PUSHPULL -#include "fastfields/core/dlpack.h" +#include #include namespace ff { diff --git a/include/fastfields/api/cuda/pushpull_dispatch.h b/include/fastfields/api/cuda/pushpull_dispatch.h index a8117b1..1c4eac3 100644 --- a/include/fastfields/api/cuda/pushpull_dispatch.h +++ b/include/fastfields/api/cuda/pushpull_dispatch.h @@ -16,12 +16,12 @@ */ #include #include -#include "fastfields/core/autocast.h" -#include "fastfields/core/dispatch.h" -#include "fastfields/core/dlpack.h" -#include "fastfields/core/cuda_switch.h" -#include "fastfields/impl/kernels/utils.h" -#include "fastfields/impl/cuda/pushpull.h" +#include +#include +#include +#include +#include +#include FF_NAMESPACE_BEGIN(FF_NS) FF_NAMESPACE_BEGIN(FF_DEVICE) diff --git a/include/fastfields/api/cuda/reg_field.h b/include/fastfields/api/cuda/reg_field.h index 1293f5f..f797a9b 100644 --- a/include/fastfields/api/cuda/reg_field.h +++ b/include/fastfields/api/cuda/reg_field.h @@ -1,6 +1,6 @@ #ifndef FF_CUDA_REG_FIELD #define FF_CUDA_REG_FIELD -#include "fastfields/core/dlpack.h" +#include #include namespace ff { diff --git a/include/fastfields/api/cuda/reg_flow.h b/include/fastfields/api/cuda/reg_flow.h index a02fbfe..8c7d78f 100644 --- a/include/fastfields/api/cuda/reg_flow.h +++ b/include/fastfields/api/cuda/reg_flow.h @@ -1,6 +1,6 @@ #ifndef FF_CUDA_REG_FLOW #define FF_CUDA_REG_FLOW -#include "fastfields/core/dlpack.h" +#include #include namespace ff { diff --git a/include/fastfields/api/cuda/resize.h b/include/fastfields/api/cuda/resize.h index 899965d..119f3bf 100644 --- a/include/fastfields/api/cuda/resize.h +++ b/include/fastfields/api/cuda/resize.h @@ -1,6 +1,6 @@ #ifndef FF_CUDA_RESIZE #define FF_CUDA_RESIZE -#include "fastfields/core/dlpack.h" +#include #include namespace ff { diff --git a/include/fastfields/api/cuda/restrict.h b/include/fastfields/api/cuda/restrict.h index 4d6c45e..d75a99b 100644 --- a/include/fastfields/api/cuda/restrict.h +++ b/include/fastfields/api/cuda/restrict.h @@ -1,6 +1,6 @@ #ifndef FF_CUDA_RESTRICT #define FF_CUDA_RESTRICT -#include "fastfields/core/dlpack.h" +#include #include namespace ff { diff --git a/include/fastfields/api/cuda/splinc.h b/include/fastfields/api/cuda/splinc.h index cfb4f9f..5cc7c12 100644 --- a/include/fastfields/api/cuda/splinc.h +++ b/include/fastfields/api/cuda/splinc.h @@ -1,6 +1,6 @@ #ifndef FF_CUDA_SPLINC #define FF_CUDA_SPLINC -#include "fastfields/core/dlpack.h" +#include #include namespace ff { diff --git a/include/fastfields/api/cuda/stream.h b/include/fastfields/api/cuda/stream.h index a37975a..07a6ead 100644 --- a/include/fastfields/api/cuda/stream.h +++ b/include/fastfields/api/cuda/stream.h @@ -16,7 +16,7 @@ */ #include -#include "fastfields/core/cuda_switch.h" +#include FF_NAMESPACE_BEGIN(FF_NS) FF_NAMESPACE_BEGIN(FF_DEVICE) diff --git a/include/fastfields/api/distance.h b/include/fastfields/api/distance.h index 1244cfb..1d9a2db 100644 --- a/include/fastfields/api/distance.h +++ b/include/fastfields/api/distance.h @@ -1,8 +1,8 @@ #ifndef FF_LIB_DISTANCE #define FF_LIB_DISTANCE -#include "fastfields/core/dlpack.h" +#include #include -#include "fastfields/core/defines.h" +#include FF_NAMESPACE_BEGIN(FF_NS) diff --git a/include/fastfields/api/posdef.h b/include/fastfields/api/posdef.h index 2230b5f..666454a 100644 --- a/include/fastfields/api/posdef.h +++ b/include/fastfields/api/posdef.h @@ -1,8 +1,8 @@ #ifndef FF_LIB_POSDEF #define FF_LIB_POSDEF -#include "fastfields/core/dlpack.h" +#include #include -#include "fastfields/core/defines.h" +#include FF_NAMESPACE_BEGIN(FF_NS) diff --git a/include/fastfields/api/pushpull.h b/include/fastfields/api/pushpull.h index 6743e40..f71ebb2 100644 --- a/include/fastfields/api/pushpull.h +++ b/include/fastfields/api/pushpull.h @@ -1,8 +1,8 @@ #ifndef FF_LIB_PUSHPULL #define FF_LIB_PUSHPULL -#include "fastfields/core/dlpack.h" +#include #include -#include "fastfields/core/defines.h" +#include #ifndef FF_LIB_BOUND_SPLINE_T #define FF_LIB_BOUND_SPLINE_T diff --git a/include/fastfields/api/reg_field.h b/include/fastfields/api/reg_field.h index ebd0bba..3b43c1b 100644 --- a/include/fastfields/api/reg_field.h +++ b/include/fastfields/api/reg_field.h @@ -1,8 +1,8 @@ #ifndef FF_LIB_REG_FIELD #define FF_LIB_REG_FIELD -#include "fastfields/core/dlpack.h" +#include #include -#include "fastfields/core/defines.h" +#include #ifndef FF_LIB_BOUND_SPLINE_T #define FF_LIB_BOUND_SPLINE_T diff --git a/include/fastfields/api/reg_flow.h b/include/fastfields/api/reg_flow.h index d092bbe..5b42602 100644 --- a/include/fastfields/api/reg_flow.h +++ b/include/fastfields/api/reg_flow.h @@ -1,8 +1,8 @@ #ifndef FF_LIB_REG_FLOW #define FF_LIB_REG_FLOW -#include "fastfields/core/dlpack.h" +#include #include -#include "fastfields/core/defines.h" +#include #ifndef FF_LIB_BOUND_SPLINE_T #define FF_LIB_BOUND_SPLINE_T diff --git a/include/fastfields/api/resize.h b/include/fastfields/api/resize.h index e8d8456..c8de089 100644 --- a/include/fastfields/api/resize.h +++ b/include/fastfields/api/resize.h @@ -1,8 +1,8 @@ #ifndef FF_LIB_RESIZE #define FF_LIB_RESIZE -#include "fastfields/core/dlpack.h" +#include #include -#include "fastfields/core/defines.h" +#include #ifndef FF_LIB_BOUND_SPLINE_T #define FF_LIB_BOUND_SPLINE_T diff --git a/include/fastfields/api/restrict.h b/include/fastfields/api/restrict.h index f438f10..7461f71 100644 --- a/include/fastfields/api/restrict.h +++ b/include/fastfields/api/restrict.h @@ -1,8 +1,8 @@ #ifndef FF_LIB_RESTRICT #define FF_LIB_RESTRICT -#include "fastfields/core/dlpack.h" +#include #include -#include "fastfields/core/defines.h" +#include #ifndef FF_LIB_BOUND_SPLINE_T #define FF_LIB_BOUND_SPLINE_T diff --git a/include/fastfields/api/solve_field.h b/include/fastfields/api/solve_field.h index 4bfa7d8..6bc8c21 100644 --- a/include/fastfields/api/solve_field.h +++ b/include/fastfields/api/solve_field.h @@ -1,7 +1,7 @@ #ifndef FF_LIB_SOLVE_FIELD #define FF_LIB_SOLVE_FIELD -#include "fastfields/core/dlpack.h" -#include "fastfields/core/defines.h" +#include +#include #ifndef FF_LIB_BOUND_SPLINE_T #define FF_LIB_BOUND_SPLINE_T diff --git a/include/fastfields/api/splinc.h b/include/fastfields/api/splinc.h index fb6b436..07f32fa 100644 --- a/include/fastfields/api/splinc.h +++ b/include/fastfields/api/splinc.h @@ -1,10 +1,10 @@ #ifndef FF_LIB_SPLINC #define FF_LIB_SPLINC -#include "fastfields/core/dlpack.h" +#include #include #include #include -#include "fastfields/core/defines.h" +#include #ifndef FF_LIB_BOUND_SPLINE_T #define FF_LIB_BOUND_SPLINE_T diff --git a/include/fastfields/core/autocast.h b/include/fastfields/core/autocast.h index 88c6c7b..e730a66 100644 --- a/include/fastfields/core/autocast.h +++ b/include/fastfields/core/autocast.h @@ -3,8 +3,8 @@ #define FF_AUTOCAST #include #include -#include "fastfields/core/dlpack.h" -#include "fastfields/core/cuda_switch.h" +#include +#include FF_NAMESPACE_BEGIN(FF_NS) FF_NAMESPACE_BEGIN(FF_DEVICE) diff --git a/include/fastfields/core/cuda_switch.h b/include/fastfields/core/cuda_switch.h index d85669b..e302a00 100755 --- a/include/fastfields/core/cuda_switch.h +++ b/include/fastfields/core/cuda_switch.h @@ -49,6 +49,6 @@ #endif -#include "fastfields/core/defines.h" +#include #endif // FF_CUDA_SWITCH diff --git a/include/fastfields/core/dispatch.h b/include/fastfields/core/dispatch.h index c164876..43a079a 100644 --- a/include/fastfields/core/dispatch.h +++ b/include/fastfields/core/dispatch.h @@ -43,9 +43,9 @@ #include // int32_t (the shape loops), int64_t #include // std::invalid_argument #include // as_weights -#include "fastfields/core/dlpack.h" -#include "fastfields/core/defines.h" // FF_NAMESPACE_* -#include "fastfields/core/autocast.h" // canUse32BitIndexMath +#include +#include // FF_NAMESPACE_* +#include // canUse32BitIndexMath /*********************************************************************** * POINTER MARSHALLING * diff --git a/include/fastfields/impl/cpu/distance_euclidean.h b/include/fastfields/impl/cpu/distance_euclidean.h index 1ffc483..c55f9f2 100755 --- a/include/fastfields/impl/cpu/distance_euclidean.h +++ b/include/fastfields/impl/cpu/distance_euclidean.h @@ -1,10 +1,10 @@ #ifndef FF_CPU_DISTANCE_EUCLIDEAN #define FF_CPU_DISTANCE_EUCLIDEAN -#include "fastfields/core/cuda_switch.h" -#include "fastfields/impl/kernels/distance.h" -#include "fastfields/impl/kernels/batch.h" -#include "fastfields/impl/kernels/parallel.h" -#include "fastfields/impl/kernels/utils.h" +#include +#include +#include +#include +#include FF_NAMESPACE_BEGIN(FF_NS) FF_NAMESPACE_BEGIN(FF_DEVICE) diff --git a/include/fastfields/impl/cpu/distance_l1.h b/include/fastfields/impl/cpu/distance_l1.h index 7597a4e..3a5a5b2 100755 --- a/include/fastfields/impl/cpu/distance_l1.h +++ b/include/fastfields/impl/cpu/distance_l1.h @@ -1,10 +1,10 @@ #ifndef FF_CPU_DISTANCE_L1 #define FF_CPU_DISTANCE_L1 -#include "fastfields/core/cuda_switch.h" -#include "fastfields/impl/kernels/distance.h" -#include "fastfields/impl/kernels/batch.h" -#include "fastfields/impl/kernels/parallel.h" -#include "fastfields/impl/kernels/utils.h" +#include +#include +#include +#include +#include FF_NAMESPACE_BEGIN(FF_NS) FF_NAMESPACE_BEGIN(FF_DEVICE) diff --git a/include/fastfields/impl/cpu/distance_mesh.h b/include/fastfields/impl/cpu/distance_mesh.h index 452396a..7484800 100755 --- a/include/fastfields/impl/cpu/distance_mesh.h +++ b/include/fastfields/impl/cpu/distance_mesh.h @@ -1,10 +1,10 @@ #ifndef FF_CPU_DISTANCE_MESH #define FF_CPU_DISTANCE_MESH -#include "fastfields/core/cuda_switch.h" -#include "fastfields/impl/kernels/distance.h" -#include "fastfields/impl/kernels/distance/mesh_utils.h" -#include "fastfields/impl/kernels/batch.h" -#include "fastfields/impl/kernels/parallel.h" +#include +#include +#include +#include +#include FF_NAMESPACE_BEGIN(FF_NS) FF_NAMESPACE_BEGIN(FF_DEVICE) diff --git a/include/fastfields/impl/cpu/distance_spline.h b/include/fastfields/impl/cpu/distance_spline.h index 73eaf98..a04e340 100755 --- a/include/fastfields/impl/cpu/distance_spline.h +++ b/include/fastfields/impl/cpu/distance_spline.h @@ -1,9 +1,9 @@ #ifndef FF_CPU_DISTANCE_SPLINE #define FF_CPU_DISTANCE_SPLINE -#include "fastfields/core/cuda_switch.h" -#include "fastfields/impl/kernels/distance.h" -#include "fastfields/impl/kernels/batch.h" -#include "fastfields/impl/kernels/parallel.h" +#include +#include +#include +#include FF_NAMESPACE_BEGIN(FF_NS) FF_NAMESPACE_BEGIN(FF_DEVICE) diff --git a/include/fastfields/impl/cpu/posdef.h b/include/fastfields/impl/cpu/posdef.h index b658d8f..a467164 100755 --- a/include/fastfields/impl/cpu/posdef.h +++ b/include/fastfields/impl/cpu/posdef.h @@ -1,9 +1,9 @@ #ifndef FF_POSDEF_CPU #define FF_POSDEF_CPU -#include "fastfields/core/cuda_switch.h" -#include "fastfields/impl/kernels/posdef.h" -#include "fastfields/impl/kernels/batch.h" -#include "fastfields/impl/kernels/parallel.h" +#include +#include +#include +#include FF_NAMESPACE_BEGIN(FF_NS) FF_NAMESPACE_BEGIN(FF_DEVICE) diff --git a/include/fastfields/impl/cpu/pushpull.h b/include/fastfields/impl/cpu/pushpull.h index 769f403..89bd380 100755 --- a/include/fastfields/impl/cpu/pushpull.h +++ b/include/fastfields/impl/cpu/pushpull.h @@ -1,10 +1,10 @@ #ifndef FF_PUSHPULL_CPU #define FF_PUSHPULL_CPU -#include "fastfields/core/cuda_switch.h" -#include "fastfields/impl/kernels/pushpull.h" -#include "fastfields/impl/kernels/batch.h" -#include "fastfields/impl/kernels/parallel.h" -#include "fastfields/impl/kernels/utils.h" +#include +#include +#include +#include +#include FF_NAMESPACE_BEGIN(FF_NS) FF_NAMESPACE_BEGIN(FF_DEVICE) diff --git a/include/fastfields/impl/cpu/reg_field.h b/include/fastfields/impl/cpu/reg_field.h index 4fada7b..5990f6e 100755 --- a/include/fastfields/impl/cpu/reg_field.h +++ b/include/fastfields/impl/cpu/reg_field.h @@ -1,13 +1,13 @@ #ifndef FF_REGULARISERS_FIELD_CPU #define FF_REGULARISERS_FIELD_CPU #include -#include "fastfields/core/cuda_switch.h" -#include "fastfields/impl/kernels/bounds.h" -#include "fastfields/impl/kernels/utils.h" -#include "fastfields/impl/kernels/batch.h" -#include "fastfields/impl/kernels/parallel.h" -#include "fastfields/impl/kernels/regularisers/field.h" -#include "fastfields/impl/kernels/posdef.h" +#include +#include +#include +#include +#include +#include +#include FF_NAMESPACE_BEGIN(FF_NS) FF_NAMESPACE_BEGIN(FF_DEVICE) diff --git a/include/fastfields/impl/cpu/reg_flow.h b/include/fastfields/impl/cpu/reg_flow.h index 0f075c0..f29ec0e 100755 --- a/include/fastfields/impl/cpu/reg_flow.h +++ b/include/fastfields/impl/cpu/reg_flow.h @@ -1,13 +1,13 @@ #ifndef FF_REGULARISERS_FLOW_CPU #define FF_REGULARISERS_FLOW_CPU #include -#include "fastfields/core/cuda_switch.h" -#include "fastfields/impl/kernels/bounds.h" -#include "fastfields/impl/kernels/utils.h" -#include "fastfields/impl/kernels/batch.h" -#include "fastfields/impl/kernels/parallel.h" -#include "fastfields/impl/kernels/regularisers/flow.h" -#include "fastfields/impl/kernels/posdef.h" +#include +#include +#include +#include +#include +#include +#include FF_NAMESPACE_BEGIN(FF_NS) FF_NAMESPACE_BEGIN(FF_DEVICE) diff --git a/include/fastfields/impl/cpu/resize.h b/include/fastfields/impl/cpu/resize.h index b9f55cf..4973fc1 100755 --- a/include/fastfields/impl/cpu/resize.h +++ b/include/fastfields/impl/cpu/resize.h @@ -1,9 +1,9 @@ #ifndef FF_RESIZE_LOOP #define FF_RESIZE_LOOP -#include "fastfields/core/cuda_switch.h" -#include "fastfields/impl/kernels/resize.h" -#include "fastfields/impl/kernels/batch.h" -#include "fastfields/impl/kernels/parallel.h" +#include +#include +#include +#include FF_NAMESPACE_BEGIN(FF_NS) FF_NAMESPACE_BEGIN(FF_DEVICE) diff --git a/include/fastfields/impl/cpu/restrict.h b/include/fastfields/impl/cpu/restrict.h index 505e6d5..a3e9798 100755 --- a/include/fastfields/impl/cpu/restrict.h +++ b/include/fastfields/impl/cpu/restrict.h @@ -1,9 +1,9 @@ #ifndef FF_RESTRICT_LOOP #define FF_RESTRICT_LOOP -#include "fastfields/core/cuda_switch.h" -#include "fastfields/impl/kernels/restrict.h" -#include "fastfields/impl/kernels/batch.h" -#include "fastfields/impl/kernels/parallel.h" +#include +#include +#include +#include FF_NAMESPACE_BEGIN(FF_NS) FF_NAMESPACE_BEGIN(FF_DEVICE) diff --git a/include/fastfields/impl/cpu/solve_field.h b/include/fastfields/impl/cpu/solve_field.h index d6fd080..2b06aa0 100644 --- a/include/fastfields/impl/cpu/solve_field.h +++ b/include/fastfields/impl/cpu/solve_field.h @@ -1,10 +1,10 @@ #ifndef FF_SOLVE_FIELD_CPU #define FF_SOLVE_FIELD_CPU #include -#include "fastfields/core/cuda_switch.h" -#include "fastfields/impl/kernels/utils.h" -#include "fastfields/impl/kernels/batch.h" -#include "fastfields/impl/kernels/parallel.h" +#include +#include +#include +#include FF_NAMESPACE_BEGIN(FF_NS) FF_NAMESPACE_BEGIN(FF_DEVICE) diff --git a/include/fastfields/impl/cpu/splinc.h b/include/fastfields/impl/cpu/splinc.h index e723887..759d525 100755 --- a/include/fastfields/impl/cpu/splinc.h +++ b/include/fastfields/impl/cpu/splinc.h @@ -1,10 +1,10 @@ #ifndef FF_SPLINC_LOOP #define FF_SPLINC_LOOP -#include "fastfields/core/cuda_switch.h" -#include "fastfields/impl/kernels/splinc.h" -#include "fastfields/impl/kernels/batch.h" -#include "fastfields/impl/kernels/utils.h" -#include "fastfields/impl/kernels/parallel.h" +#include +#include +#include +#include +#include FF_NAMESPACE_BEGIN(FF_NS) FF_NAMESPACE_BEGIN(FF_DEVICE) diff --git a/include/fastfields/impl/cuda/distance_euclidean.h b/include/fastfields/impl/cuda/distance_euclidean.h index 3708f88..eefea71 100755 --- a/include/fastfields/impl/cuda/distance_euclidean.h +++ b/include/fastfields/impl/cuda/distance_euclidean.h @@ -1,7 +1,7 @@ #pragma once -#include "fastfields/core/cuda_switch.h" -#include "fastfields/impl/kernels/distance.h" -#include "fastfields/impl/kernels/batch.h" +#include +#include +#include #include "utils.h" #include #include diff --git a/include/fastfields/impl/cuda/distance_l1.h b/include/fastfields/impl/cuda/distance_l1.h index 6f7e86c..f2d46c6 100755 --- a/include/fastfields/impl/cuda/distance_l1.h +++ b/include/fastfields/impl/cuda/distance_l1.h @@ -1,7 +1,7 @@ #pragma once -#include "fastfields/core/cuda_switch.h" -#include "fastfields/impl/kernels/distance.h" -#include "fastfields/impl/kernels/batch.h" +#include +#include +#include #include "utils.h" #include #include diff --git a/include/fastfields/impl/cuda/distance_mesh.h b/include/fastfields/impl/cuda/distance_mesh.h index 7775e5e..04075c9 100755 --- a/include/fastfields/impl/cuda/distance_mesh.h +++ b/include/fastfields/impl/cuda/distance_mesh.h @@ -1,8 +1,8 @@ #pragma once -#include "fastfields/core/cuda_switch.h" -#include "fastfields/impl/kernels/distance.h" -#include "fastfields/impl/kernels/batch.h" -#include "fastfields/impl/kernels/utils.h" +#include +#include +#include +#include #include "utils.h" #include #include // std::unique_ptr diff --git a/include/fastfields/impl/cuda/distance_spline.h b/include/fastfields/impl/cuda/distance_spline.h index 0a91431..472167d 100755 --- a/include/fastfields/impl/cuda/distance_spline.h +++ b/include/fastfields/impl/cuda/distance_spline.h @@ -1,9 +1,9 @@ #pragma once #include -#include "fastfields/core/cuda_switch.h" -#include "fastfields/impl/kernels/distance.h" -#include "fastfields/impl/kernels/batch.h" -#include "fastfields/impl/kernels/utils.h" +#include +#include +#include +#include using namespace std; FF_NAMESPACE_BEGIN(FF_NS) diff --git a/include/fastfields/impl/cuda/posdef.h b/include/fastfields/impl/cuda/posdef.h index 9061096..5ca2d48 100755 --- a/include/fastfields/impl/cuda/posdef.h +++ b/include/fastfields/impl/cuda/posdef.h @@ -1,7 +1,7 @@ #pragma once -#include "fastfields/core/cuda_switch.h" -#include "fastfields/impl/kernels/posdef.h" -#include "fastfields/impl/kernels/batch.h" +#include +#include +#include #include "utils.h" #include #include diff --git a/include/fastfields/impl/cuda/pushpull.h b/include/fastfields/impl/cuda/pushpull.h index bdf79a7..9267001 100755 --- a/include/fastfields/impl/cuda/pushpull.h +++ b/include/fastfields/impl/cuda/pushpull.h @@ -1,9 +1,9 @@ #pragma once -#include "fastfields/core/cuda_switch.h" -#include "fastfields/impl/kernels/spline.h" -#include "fastfields/impl/kernels/bounds.h" -#include "fastfields/impl/kernels/batch.h" -#include "fastfields/impl/kernels/pushpull.h" +#include +#include +#include +#include +#include #include "utils.h" // allocDevice / copyToDevice / freeDevice / GET_BLOCKS #include // std::intptr_t #include // std::logic_error diff --git a/include/fastfields/impl/cuda/reg_field.h b/include/fastfields/impl/cuda/reg_field.h index 51f817d..d59f44e 100755 --- a/include/fastfields/impl/cuda/reg_field.h +++ b/include/fastfields/impl/cuda/reg_field.h @@ -1,10 +1,10 @@ #pragma once -#include "fastfields/core/cuda_switch.h" -#include "fastfields/impl/kernels/bounds.h" -#include "fastfields/impl/kernels/utils.h" -#include "fastfields/impl/kernels/batch.h" -#include "fastfields/impl/kernels/regularisers/field.h" -#include "fastfields/impl/kernels/posdef.h" +#include +#include +#include +#include +#include +#include #include "utils.h" // allocDevice / copyToDevice / freeDevice / GET_BLOCKS #include // std::logic_error diff --git a/include/fastfields/impl/cuda/reg_flow.h b/include/fastfields/impl/cuda/reg_flow.h index fd58a60..ebe71e3 100755 --- a/include/fastfields/impl/cuda/reg_flow.h +++ b/include/fastfields/impl/cuda/reg_flow.h @@ -1,10 +1,10 @@ #pragma once -#include "fastfields/core/cuda_switch.h" -#include "fastfields/impl/kernels/bounds.h" -#include "fastfields/impl/kernels/utils.h" -#include "fastfields/impl/kernels/batch.h" -#include "fastfields/impl/kernels/regularisers/flow.h" -#include "fastfields/impl/kernels/posdef.h" +#include +#include +#include +#include +#include +#include #include "utils.h" // allocDevice / copyToDevice / freeDevice / GET_BLOCKS #include // std::logic_error diff --git a/include/fastfields/impl/cuda/resize.h b/include/fastfields/impl/cuda/resize.h index 4214b26..5be012f 100755 --- a/include/fastfields/impl/cuda/resize.h +++ b/include/fastfields/impl/cuda/resize.h @@ -4,11 +4,11 @@ * (we currently use an outer loop, so we recompute indices many times) */ -#include "fastfields/core/cuda_switch.h" -#include "fastfields/impl/kernels/spline.h" -#include "fastfields/impl/kernels/bounds.h" -#include "fastfields/impl/kernels/batch.h" -#include "fastfields/impl/kernels/resize.h" +#include +#include +#include +#include +#include #include "utils.h" #include #include diff --git a/include/fastfields/impl/cuda/restrict.h b/include/fastfields/impl/cuda/restrict.h index 0d58f38..d43d5d3 100755 --- a/include/fastfields/impl/cuda/restrict.h +++ b/include/fastfields/impl/cuda/restrict.h @@ -5,11 +5,11 @@ * (we currently use an outer loop, so we recompute indices many times) */ -#include "fastfields/core/cuda_switch.h" -#include "fastfields/impl/kernels/spline.h" -#include "fastfields/impl/kernels/bounds.h" -#include "fastfields/impl/kernels/batch.h" -#include "fastfields/impl/kernels/restrict.h" +#include +#include +#include +#include +#include #include "utils.h" #include #include diff --git a/include/fastfields/impl/cuda/splinc.h b/include/fastfields/impl/cuda/splinc.h index 07cc934..02a99ed 100755 --- a/include/fastfields/impl/cuda/splinc.h +++ b/include/fastfields/impl/cuda/splinc.h @@ -1,8 +1,8 @@ #pragma once -#include "fastfields/core/cuda_switch.h" -#include "fastfields/impl/kernels/splinc.h" -#include "fastfields/impl/kernels/bounds.h" -#include "fastfields/impl/kernels/batch.h" +#include +#include +#include +#include #include "utils.h" #include #include diff --git a/include/fastfields/impl/cuda/utils.h b/include/fastfields/impl/cuda/utils.h index 54d2901..61b20e7 100644 --- a/include/fastfields/impl/cuda/utils.h +++ b/include/fastfields/impl/cuda/utils.h @@ -1,5 +1,5 @@ #pragma once -#include "fastfields/core/cuda_switch.h" +#include #include // int64_t #include // std::bad_alloc #include // std::range_error diff --git a/include/fastfields/impl/kernels/atomic.h b/include/fastfields/impl/kernels/atomic.h index 751fde3..4f9df1e 100755 --- a/include/fastfields/impl/kernels/atomic.h +++ b/include/fastfields/impl/kernels/atomic.h @@ -5,7 +5,7 @@ #ifndef FF_ATOMIC #define FF_ATOMIC -#include "fastfields/core/cuda_switch.h" +#include /*********************************************************************** * CPU diff --git a/include/fastfields/impl/kernels/batch.h b/include/fastfields/impl/kernels/batch.h index ea5ea55..8cdceea 100755 --- a/include/fastfields/impl/kernels/batch.h +++ b/include/fastfields/impl/kernels/batch.h @@ -21,7 +21,7 @@ */ #ifndef FF_BATCH #define FF_BATCH -#include "fastfields/core/cuda_switch.h" +#include #include "utils.h" FF_NAMESPACE_BEGIN(FF_NS) diff --git a/include/fastfields/impl/kernels/bounds.h b/include/fastfields/impl/kernels/bounds.h index 1cdecae..199f285 100755 --- a/include/fastfields/impl/kernels/bounds.h +++ b/include/fastfields/impl/kernels/bounds.h @@ -1,6 +1,6 @@ #ifndef FF_BOUNDS #define FF_BOUNDS -#include "fastfields/core/cuda_switch.h" +#include #include "atomic.h" #include "utils.h" #include "meta.h" diff --git a/include/fastfields/impl/kernels/distance/euclidean.h b/include/fastfields/impl/kernels/distance/euclidean.h index 9e99bed..b5a6127 100755 --- a/include/fastfields/impl/kernels/distance/euclidean.h +++ b/include/fastfields/impl/kernels/distance/euclidean.h @@ -7,7 +7,7 @@ // the lower envelope of a series of parabolas. #ifndef FF_DISTANCE_E #define FF_DISTANCE_E -#include "fastfields/core/cuda_switch.h" +#include #include "../utils.h" FF_NAMESPACE_BEGIN(FF_NS) diff --git a/include/fastfields/impl/kernels/distance/l1.h b/include/fastfields/impl/kernels/distance/l1.h index 155d767..f80459d 100755 --- a/include/fastfields/impl/kernels/distance/l1.h +++ b/include/fastfields/impl/kernels/distance/l1.h @@ -4,7 +4,7 @@ // https://www.theoryofcomputing.org/articles/v008a019/v008a019.pdf #ifndef FF_DISTANCE_L1 #define FF_DISTANCE_L1 -#include "fastfields/core/cuda_switch.h" +#include #include "../utils.h" FF_NAMESPACE_BEGIN(FF_NS) diff --git a/include/fastfields/impl/kernels/distance/mesh.h b/include/fastfields/impl/kernels/distance/mesh.h index 8f75de5..0737766 100755 --- a/include/fastfields/impl/kernels/distance/mesh.h +++ b/include/fastfields/impl/kernels/distance/mesh.h @@ -4,7 +4,7 @@ */ #ifndef FF_DISTANCE_MESH_H #define FF_DISTANCE_MESH_H -#include "fastfields/core/cuda_switch.h" +#include #include "../utils.h" #include "mesh_utils.h" #include diff --git a/include/fastfields/impl/kernels/distance/mesh_utils.h b/include/fastfields/impl/kernels/distance/mesh_utils.h index f8bcb44..c67aaa3 100755 --- a/include/fastfields/impl/kernels/distance/mesh_utils.h +++ b/include/fastfields/impl/kernels/distance/mesh_utils.h @@ -1,6 +1,6 @@ #ifndef FF_DISTANCE_MESH_UTILS_H #define FF_DISTANCE_MESH_UTILS_H -#include "fastfields/core/cuda_switch.h" +#include #include "../utils.h" // ============================================================================= diff --git a/include/fastfields/impl/kernels/distance/spline.h b/include/fastfields/impl/kernels/distance/spline.h index 91eb961..df9b174 100755 --- a/include/fastfields/impl/kernels/distance/spline.h +++ b/include/fastfields/impl/kernels/distance/spline.h @@ -1,6 +1,6 @@ #ifndef FF_DISTANCE_SPLINE_H #define FF_DISTANCE_SPLINE_H -#include "fastfields/core/cuda_switch.h" +#include #include "../spline.h" #include "../bounds.h" #include "../pushpull.h" diff --git a/include/fastfields/impl/kernels/meta.h b/include/fastfields/impl/kernels/meta.h index ca161db..dcb2705 100644 --- a/include/fastfields/impl/kernels/meta.h +++ b/include/fastfields/impl/kernels/meta.h @@ -1,6 +1,6 @@ #ifndef FF_META #define FF_META -#include "fastfields/core/defines.h" +#include FF_NAMESPACE_BEGIN(FF_NS) FF_NAMESPACE_BEGIN(meta) diff --git a/include/fastfields/impl/kernels/parallel.h b/include/fastfields/impl/kernels/parallel.h index 41e27d9..e91a405 100755 --- a/include/fastfields/impl/kernels/parallel.h +++ b/include/fastfields/impl/kernels/parallel.h @@ -5,7 +5,7 @@ #ifndef FF_PARALLEL_H #define FF_PARALLEL_H #include -#include "fastfields/core/defines.h" +#include #include "parallel_impl.h" /* The minimum number of elements a `parallel_for` must cover before it is diff --git a/include/fastfields/impl/kernels/parallel_impl.h b/include/fastfields/impl/kernels/parallel_impl.h index 0a32a9d..2fcdb78 100755 --- a/include/fastfields/impl/kernels/parallel_impl.h +++ b/include/fastfields/impl/kernels/parallel_impl.h @@ -4,7 +4,7 @@ */ #ifndef FF_PARALLEL_IMPL_H #define FF_PARALLEL_IMPL_H -#include "fastfields/core/defines.h" +#include #include #include diff --git a/include/fastfields/impl/kernels/posdef/cholesky.h b/include/fastfields/impl/kernels/posdef/cholesky.h index 72e331c..f3a7eff 100755 --- a/include/fastfields/impl/kernels/posdef/cholesky.h +++ b/include/fastfields/impl/kernels/posdef/cholesky.h @@ -1,6 +1,6 @@ #ifndef FF_POSDEF_CHOLESKY #define FF_POSDEF_CHOLESKY -#include "fastfields/core/cuda_switch.h" +#include #include "../utils.h" #include "utils.h" diff --git a/include/fastfields/impl/kernels/posdef/posdef.h b/include/fastfields/impl/kernels/posdef/posdef.h index edbaaa5..62e0dfa 100755 --- a/include/fastfields/impl/kernels/posdef/posdef.h +++ b/include/fastfields/impl/kernels/posdef/posdef.h @@ -1,6 +1,6 @@ #ifndef FF_POSDEF #define FF_POSDEF -#include "fastfields/core/cuda_switch.h" +#include #include "../utils.h" #include "utils.h" #include "cholesky.h" diff --git a/include/fastfields/impl/kernels/posdef/utils.h b/include/fastfields/impl/kernels/posdef/utils.h index 98a2afd..0788372 100755 --- a/include/fastfields/impl/kernels/posdef/utils.h +++ b/include/fastfields/impl/kernels/posdef/utils.h @@ -1,6 +1,6 @@ #ifndef FF_POSDEF_UTILS #define FF_POSDEF_UTILS -#include "fastfields/core/cuda_switch.h" +#include #include "../utils.h" #define FF_ONE_PLUS_TINY 1.000001 diff --git a/include/fastfields/impl/kernels/pushpull/1d.h b/include/fastfields/impl/kernels/pushpull/1d.h index 60dcf60..e4d7e6f 100755 --- a/include/fastfields/impl/kernels/pushpull/1d.h +++ b/include/fastfields/impl/kernels/pushpull/1d.h @@ -5,7 +5,7 @@ **********************************************************************/ #ifndef FF_PUSHPULL_1D #define FF_PUSHPULL_1D -#include "fastfields/core/cuda_switch.h" +#include #include "../spline.h" #include "../bounds.h" #include "utils.h" diff --git a/include/fastfields/impl/kernels/pushpull/2d.h b/include/fastfields/impl/kernels/pushpull/2d.h index 4818578..a9e81a7 100755 --- a/include/fastfields/impl/kernels/pushpull/2d.h +++ b/include/fastfields/impl/kernels/pushpull/2d.h @@ -5,7 +5,7 @@ **********************************************************************/ #ifndef FF_PUSHPULL_2D #define FF_PUSHPULL_2D -#include "fastfields/core/cuda_switch.h" +#include #include "../spline.h" #include "../bounds.h" #include "utils.h" diff --git a/include/fastfields/impl/kernels/pushpull/3d.h b/include/fastfields/impl/kernels/pushpull/3d.h index bbc8da0..9b01dfe 100755 --- a/include/fastfields/impl/kernels/pushpull/3d.h +++ b/include/fastfields/impl/kernels/pushpull/3d.h @@ -5,7 +5,7 @@ **********************************************************************/ #ifndef FF_PUSHPULL_3D #define FF_PUSHPULL_3D -#include "fastfields/core/cuda_switch.h" +#include #include "../spline.h" #include "../bounds.h" #include "utils.h" diff --git a/include/fastfields/impl/kernels/pushpull/nd.h b/include/fastfields/impl/kernels/pushpull/nd.h index 9776580..03df18a 100755 --- a/include/fastfields/impl/kernels/pushpull/nd.h +++ b/include/fastfields/impl/kernels/pushpull/nd.h @@ -5,7 +5,7 @@ **********************************************************************/ #ifndef FF_PUSHPULL_ND #define FF_PUSHPULL_ND -#include "fastfields/core/cuda_switch.h" +#include #include "../spline.h" #include "../bounds.h" #include "utils.h" diff --git a/include/fastfields/impl/kernels/pushpull/utils.h b/include/fastfields/impl/kernels/pushpull/utils.h index c7313df..6d3e67c 100755 --- a/include/fastfields/impl/kernels/pushpull/utils.h +++ b/include/fastfields/impl/kernels/pushpull/utils.h @@ -1,6 +1,6 @@ #ifndef FF_PUSHPULL_UTILS #define FF_PUSHPULL_UTILS -#include "fastfields/core/cuda_switch.h" +#include #include "../spline.h" #include "../bounds.h" #include "../meta.h" diff --git a/include/fastfields/impl/kernels/regularisers/field/1d.h b/include/fastfields/impl/kernels/regularisers/field/1d.h index ab2b795..625e419 100755 --- a/include/fastfields/impl/kernels/regularisers/field/1d.h +++ b/include/fastfields/impl/kernels/regularisers/field/1d.h @@ -1,6 +1,6 @@ #ifndef FF_REGULARISERS_FIELD_1D #define FF_REGULARISERS_FIELD_1D -#include "fastfields/core/cuda_switch.h" +#include #include "../../bounds.h" #include "../../utils.h" #include "utils.h" diff --git a/include/fastfields/impl/kernels/regularisers/field/2d.h b/include/fastfields/impl/kernels/regularisers/field/2d.h index fb6c01c..1f307ea 100755 --- a/include/fastfields/impl/kernels/regularisers/field/2d.h +++ b/include/fastfields/impl/kernels/regularisers/field/2d.h @@ -1,6 +1,6 @@ #ifndef FF_REGULARISERS_FIELD_2D #define FF_REGULARISERS_FIELD_2D -#include "fastfields/core/cuda_switch.h" +#include #include "../../bounds.h" #include "../../utils.h" #include "utils.h" diff --git a/include/fastfields/impl/kernels/regularisers/field/3d.h b/include/fastfields/impl/kernels/regularisers/field/3d.h index 9eb62b8..083a44d 100755 --- a/include/fastfields/impl/kernels/regularisers/field/3d.h +++ b/include/fastfields/impl/kernels/regularisers/field/3d.h @@ -1,6 +1,6 @@ #ifndef FF_REGULARISERS_FIELD_3D #define FF_REGULARISERS_FIELD_3D -#include "fastfields/core/cuda_switch.h" +#include #include "../../bounds.h" #include "../../utils.h" #include "utils.h" diff --git a/include/fastfields/impl/kernels/regularisers/field/utils.h b/include/fastfields/impl/kernels/regularisers/field/utils.h index 4c58910..14e7c2a 100755 --- a/include/fastfields/impl/kernels/regularisers/field/utils.h +++ b/include/fastfields/impl/kernels/regularisers/field/utils.h @@ -1,6 +1,6 @@ #ifndef FF_REGULARISERS_UTILS #define FF_REGULARISERS_UTILS -#include "fastfields/core/cuda_switch.h" +#include #include "../../bounds.h" #include "../../utils.h" #include "../../meta.h" diff --git a/include/fastfields/impl/kernels/regularisers/flow/1d.h b/include/fastfields/impl/kernels/regularisers/flow/1d.h index d321cbf..388b988 100755 --- a/include/fastfields/impl/kernels/regularisers/flow/1d.h +++ b/include/fastfields/impl/kernels/regularisers/flow/1d.h @@ -1,6 +1,6 @@ #ifndef FF_REGULARISERS_FLOW_1D #define FF_REGULARISERS_FLOW_1D -#include "fastfields/core/cuda_switch.h" +#include #include "../../bounds.h" #include "../../utils.h" #include "utils.h" diff --git a/include/fastfields/impl/kernels/regularisers/flow/2d.h b/include/fastfields/impl/kernels/regularisers/flow/2d.h index a9fcd92..1af7a05 100755 --- a/include/fastfields/impl/kernels/regularisers/flow/2d.h +++ b/include/fastfields/impl/kernels/regularisers/flow/2d.h @@ -1,6 +1,6 @@ #ifndef FF_REGULARISERS_FLOW_2D #define FF_REGULARISERS_FLOW_2D -#include "fastfields/core/cuda_switch.h" +#include #include "../../bounds.h" #include "../../utils.h" #include "utils.h" diff --git a/include/fastfields/impl/kernels/regularisers/flow/3d.h b/include/fastfields/impl/kernels/regularisers/flow/3d.h index 05cf366..9fc6159 100755 --- a/include/fastfields/impl/kernels/regularisers/flow/3d.h +++ b/include/fastfields/impl/kernels/regularisers/flow/3d.h @@ -1,6 +1,6 @@ #ifndef FF_REGULARISERS_FLOW_3D #define FF_REGULARISERS_FLOW_3D -#include "fastfields/core/cuda_switch.h" +#include #include "../../bounds.h" #include "../../utils.h" #include "utils.h" diff --git a/include/fastfields/impl/kernels/regularisers/flow/utils.h b/include/fastfields/impl/kernels/regularisers/flow/utils.h index 7c4a6da..394b858 100755 --- a/include/fastfields/impl/kernels/regularisers/flow/utils.h +++ b/include/fastfields/impl/kernels/regularisers/flow/utils.h @@ -1,6 +1,6 @@ #ifndef FF_REGULARISERS_FLOW_UTILS #define FF_REGULARISERS_FLOW_UTILS -#include "fastfields/core/cuda_switch.h" +#include #include "../../bounds.h" #include "../../utils.h" diff --git a/include/fastfields/impl/kernels/resize.h b/include/fastfields/impl/kernels/resize.h index 3993de1..6162df7 100755 --- a/include/fastfields/impl/kernels/resize.h +++ b/include/fastfields/impl/kernels/resize.h @@ -1,6 +1,6 @@ #ifndef FF_RESIZE #define FF_RESIZE -#include "fastfields/core/cuda_switch.h" +#include #include "spline.h" #include "bounds.h" #include "utils.h" // prod diff --git a/include/fastfields/impl/kernels/restrict.h b/include/fastfields/impl/kernels/restrict.h index 9e0f5a6..10d6c49 100755 --- a/include/fastfields/impl/kernels/restrict.h +++ b/include/fastfields/impl/kernels/restrict.h @@ -1,6 +1,6 @@ #ifndef FF_RESTRICT #define FF_RESTRICT -#include "fastfields/core/cuda_switch.h" +#include #include "spline.h" #include "bounds.h" #include "batch.h" // index2sub diff --git a/include/fastfields/impl/kernels/splinc.h b/include/fastfields/impl/kernels/splinc.h index 2a93158..b65e901 100755 --- a/include/fastfields/impl/kernels/splinc.h +++ b/include/fastfields/impl/kernels/splinc.h @@ -26,7 +26,7 @@ #ifndef FF_SPLINC #define FF_SPLINC -#include "fastfields/core/cuda_switch.h" +#include #include "spline.h" #include "bounds.h" #include "utils.h" diff --git a/include/fastfields/impl/kernels/spline.h b/include/fastfields/impl/kernels/spline.h index 81f9d4e..89d7364 100755 --- a/include/fastfields/impl/kernels/spline.h +++ b/include/fastfields/impl/kernels/spline.h @@ -25,7 +25,7 @@ #ifndef FF_SPLINE #define FF_SPLINE -#include "fastfields/core/cuda_switch.h" +#include #include "meta.h" FF_NAMESPACE_BEGIN(FF_NS) diff --git a/include/fastfields/impl/kernels/tetrahedron.h b/include/fastfields/impl/kernels/tetrahedron.h index 553494b..ffd8f12 100755 --- a/include/fastfields/impl/kernels/tetrahedron.h +++ b/include/fastfields/impl/kernels/tetrahedron.h @@ -1,6 +1,6 @@ #ifndef FF_TETRAHEDRON #define FF_TETRAHEDRON -#include "fastfields/core/cuda_switch.h" +#include #include "utils.h" diff --git a/include/fastfields/impl/kernels/threadpool.h b/include/fastfields/impl/kernels/threadpool.h index 3b6cb7f..4948eeb 100755 --- a/include/fastfields/impl/kernels/threadpool.h +++ b/include/fastfields/impl/kernels/threadpool.h @@ -14,7 +14,7 @@ #include #include #include -#include "fastfields/core/defines.h" +#include FF_NAMESPACE_BEGIN(FF_NS) diff --git a/include/fastfields/impl/kernels/threadpool.inl b/include/fastfields/impl/kernels/threadpool.inl index a782b06..3f3bc4a 100755 --- a/include/fastfields/impl/kernels/threadpool.inl +++ b/include/fastfields/impl/kernels/threadpool.inl @@ -3,7 +3,7 @@ #include #include #include -#include "fastfields/core/defines.h" +#include FF_NAMESPACE_BEGIN(FF_NS) FF_NAMESPACE_BEGIN(internal) diff --git a/include/fastfields/impl/kernels/utils.h b/include/fastfields/impl/kernels/utils.h index 0705507..ab0cf7c 100755 --- a/include/fastfields/impl/kernels/utils.h +++ b/include/fastfields/impl/kernels/utils.h @@ -1,7 +1,7 @@ #ifndef FF_UTILS #define FF_UTILS #include -#include "fastfields/core/cuda_switch.h" +#include #ifndef __CUDACC__ # include diff --git a/include/fastfields/impl/kernels/vector/abstract_ptr.h b/include/fastfields/impl/kernels/vector/abstract_ptr.h index c46e24d..0fcf3a9 100755 --- a/include/fastfields/impl/kernels/vector/abstract_ptr.h +++ b/include/fastfields/impl/kernels/vector/abstract_ptr.h @@ -3,7 +3,7 @@ #include #include "forward.h" #include "traits.h" -#include "fastfields/core/cuda_switch.h" +#include // Abstract base class for objects on which pointer arithmetic can be // performed. diff --git a/include/fastfields/impl/kernels/vector/abstract_sized.h b/include/fastfields/impl/kernels/vector/abstract_sized.h index 7f64617..e59d08b 100755 --- a/include/fastfields/impl/kernels/vector/abstract_sized.h +++ b/include/fastfields/impl/kernels/vector/abstract_sized.h @@ -3,7 +3,7 @@ #include #include "forward.h" #include "abstract_ptr.h" -#include "fastfields/core/cuda_switch.h" +#include // Abstract base class for "sized" pointers. // diff --git a/include/fastfields/impl/kernels/vector/abstract_vector.h b/include/fastfields/impl/kernels/vector/abstract_vector.h index 5c8cec7..9e386b4 100755 --- a/include/fastfields/impl/kernels/vector/abstract_vector.h +++ b/include/fastfields/impl/kernels/vector/abstract_vector.h @@ -3,7 +3,7 @@ #include "forward.h" #include "traits.h" #include "weak_sized.h" -#include "fastfields/core/cuda_switch.h" +#include #include namespace ff { diff --git a/include/fastfields/impl/kernels/vector/concrete_vector.h b/include/fastfields/impl/kernels/vector/concrete_vector.h index 0dffc8c..e20824c 100755 --- a/include/fastfields/impl/kernels/vector/concrete_vector.h +++ b/include/fastfields/impl/kernels/vector/concrete_vector.h @@ -5,7 +5,7 @@ #include "traits.h" #include "abstract_vector.h" #include "weak_vector.h" -#include "fastfields/core/cuda_switch.h" +#include namespace ff { diff --git a/include/fastfields/impl/kernels/vector/weak_ref.h b/include/fastfields/impl/kernels/vector/weak_ref.h index 27b5b05..3e2eac4 100755 --- a/include/fastfields/impl/kernels/vector/weak_ref.h +++ b/include/fastfields/impl/kernels/vector/weak_ref.h @@ -3,7 +3,7 @@ #include "forward.h" #include "traits.h" #include "abstract_ptr.h" -#include "fastfields/core/cuda_switch.h" +#include namespace ff { diff --git a/include/fastfields/impl/kernels/vector/weak_sized.h b/include/fastfields/impl/kernels/vector/weak_sized.h index bc6b78b..226c87d 100755 --- a/include/fastfields/impl/kernels/vector/weak_sized.h +++ b/include/fastfields/impl/kernels/vector/weak_sized.h @@ -2,7 +2,7 @@ #define FF_VECTOR_WEAKSIZEDREF_H #include "forward.h" #include "abstract_sized.h" -#include "fastfields/core/cuda_switch.h" +#include namespace ff { diff --git a/include/fastfields/impl/kernels/vector/weak_vector.h b/include/fastfields/impl/kernels/vector/weak_vector.h index 9f628a9..c8d754b 100755 --- a/include/fastfields/impl/kernels/vector/weak_vector.h +++ b/include/fastfields/impl/kernels/vector/weak_vector.h @@ -3,7 +3,7 @@ #include "forward.h" #include "traits.h" #include "abstract_vector.h" -#include "fastfields/core/cuda_switch.h" +#include namespace ff { diff --git a/src/lib-cpu/distance.cpp b/src/lib-cpu/distance.cpp index 0636621..21b1e95 100644 --- a/src/lib-cpu/distance.cpp +++ b/src/lib-cpu/distance.cpp @@ -1,15 +1,15 @@ #include #include -#include "fastfields/api/cpu/distance.h" -#include "fastfields/core/autocast.h" -#include "fastfields/core/dispatch.h" -#include "fastfields/core/dlpack.h" -#include "fastfields/core/cuda_switch.h" -#include "fastfields/impl/kernels/utils.h" -#include "fastfields/impl/cpu/distance_euclidean.h" -#include "fastfields/impl/cpu/distance_l1.h" -#include "fastfields/impl/cpu/distance_spline.h" -#include "fastfields/impl/cpu/distance_mesh.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include FF_NAMESPACE_BEGIN(FF_NS) FF_NAMESPACE_BEGIN(FF_DEVICE) diff --git a/src/lib-cpu/posdef.cpp b/src/lib-cpu/posdef.cpp index 02b9882..1a768f2 100644 --- a/src/lib-cpu/posdef.cpp +++ b/src/lib-cpu/posdef.cpp @@ -1,13 +1,13 @@ #include #include #include -#include "fastfields/api/cpu/posdef.h" -#include "fastfields/core/autocast.h" -#include "fastfields/core/dispatch.h" -#include "fastfields/core/dlpack.h" -#include "fastfields/core/cuda_switch.h" -#include "fastfields/impl/kernels/utils.h" -#include "fastfields/impl/cpu/posdef.h" +#include +#include +#include +#include +#include +#include +#include FF_NAMESPACE_BEGIN(FF_NS) FF_NAMESPACE_BEGIN(FF_DEVICE) diff --git a/src/lib-cpu/pushpull.cpp b/src/lib-cpu/pushpull.cpp index 161752f..d0f66f7 100644 --- a/src/lib-cpu/pushpull.cpp +++ b/src/lib-cpu/pushpull.cpp @@ -1,9 +1,9 @@ -#include "fastfields/api/cpu/pushpull.h" +#include #include // FF_VOIDPTR / CHECK_* / FF_DISPATCH_PP and the reduce_t typedef, shared with // pushpull_backward.cpp so the two translation units cannot drift apart on // which (order, bound) pairs are statically instantiated. -#include "fastfields/api/cpu/pushpull_dispatch.h" +#include FF_NAMESPACE_BEGIN(FF_NS) FF_NAMESPACE_BEGIN(FF_DEVICE) diff --git a/src/lib-cpu/pushpull_backward.cpp b/src/lib-cpu/pushpull_backward.cpp index 1585075..53c8df9 100644 --- a/src/lib-cpu/pushpull_backward.cpp +++ b/src/lib-cpu/pushpull_backward.cpp @@ -5,9 +5,9 @@ // time, and `pushpull` is already the most expensive module here (and by a // wide margin on the CUDA side, where ptxas memory -- not just wall time -- // is the binding constraint; cf. the reg_field / reg_field_rls split). -#include "fastfields/api/cpu/pushpull.h" +#include #include -#include "fastfields/api/cpu/pushpull_dispatch.h" +#include FF_NAMESPACE_BEGIN(FF_NS) FF_NAMESPACE_BEGIN(FF_DEVICE) diff --git a/src/lib-cpu/reg_field.cpp b/src/lib-cpu/reg_field.cpp index ef2b97c..407ac7c 100644 --- a/src/lib-cpu/reg_field.cpp +++ b/src/lib-cpu/reg_field.cpp @@ -2,15 +2,15 @@ #include #include #include -#include "fastfields/api/cpu/reg_field.h" -#include "fastfields/api/cpu/posdef.h" -#include "fastfields/core/autocast.h" -#include "fastfields/core/dispatch.h" -#include "fastfields/core/dlpack.h" -#include "fastfields/core/cuda_switch.h" -#include "fastfields/impl/kernels/bounds.h" -#include "fastfields/impl/kernels/utils.h" -#include "fastfields/impl/cpu/reg_field.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include FF_NAMESPACE_BEGIN(FF_NS) FF_NAMESPACE_BEGIN(FF_DEVICE) diff --git a/src/lib-cpu/reg_flow.cpp b/src/lib-cpu/reg_flow.cpp index eff02e9..ae3bdae 100644 --- a/src/lib-cpu/reg_flow.cpp +++ b/src/lib-cpu/reg_flow.cpp @@ -2,15 +2,15 @@ #include #include #include -#include "fastfields/api/cpu/reg_flow.h" -#include "fastfields/api/cpu/posdef.h" -#include "fastfields/core/autocast.h" -#include "fastfields/core/dispatch.h" -#include "fastfields/core/dlpack.h" -#include "fastfields/core/cuda_switch.h" -#include "fastfields/impl/kernels/bounds.h" -#include "fastfields/impl/kernels/utils.h" -#include "fastfields/impl/cpu/reg_flow.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include FF_NAMESPACE_BEGIN(FF_NS) FF_NAMESPACE_BEGIN(FF_DEVICE) diff --git a/src/lib-cpu/resize.cpp b/src/lib-cpu/resize.cpp index 4b4d80d..513d509 100644 --- a/src/lib-cpu/resize.cpp +++ b/src/lib-cpu/resize.cpp @@ -1,12 +1,12 @@ #include #include -#include "fastfields/api/cpu/resize.h" -#include "fastfields/core/autocast.h" -#include "fastfields/core/dispatch.h" -#include "fastfields/core/dlpack.h" -#include "fastfields/core/cuda_switch.h" -#include "fastfields/impl/kernels/utils.h" -#include "fastfields/impl/cpu/resize.h" +#include +#include +#include +#include +#include +#include +#include FF_NAMESPACE_BEGIN(FF_NS) FF_NAMESPACE_BEGIN(FF_DEVICE) diff --git a/src/lib-cpu/restrict.cpp b/src/lib-cpu/restrict.cpp index b78e947..15dc6b7 100644 --- a/src/lib-cpu/restrict.cpp +++ b/src/lib-cpu/restrict.cpp @@ -1,12 +1,12 @@ #include #include -#include "fastfields/api/cpu/restrict.h" -#include "fastfields/core/autocast.h" -#include "fastfields/core/dispatch.h" -#include "fastfields/core/dlpack.h" -#include "fastfields/core/cuda_switch.h" -#include "fastfields/impl/kernels/utils.h" -#include "fastfields/impl/cpu/restrict.h" +#include +#include +#include +#include +#include +#include +#include FF_NAMESPACE_BEGIN(FF_NS) FF_NAMESPACE_BEGIN(FF_DEVICE) diff --git a/src/lib-cpu/solve_field.cpp b/src/lib-cpu/solve_field.cpp index 13e0912..253247d 100644 --- a/src/lib-cpu/solve_field.cpp +++ b/src/lib-cpu/solve_field.cpp @@ -1,15 +1,15 @@ #include #include #include -#include "fastfields/api/cpu/solve_field.h" -#include "fastfields/api/cpu/reg_field.h" -#include "fastfields/api/cpu/posdef.h" -#include "fastfields/core/autocast.h" -#include "fastfields/core/dispatch.h" -#include "fastfields/core/dlpack.h" -#include "fastfields/core/cuda_switch.h" -#include "fastfields/impl/kernels/utils.h" -#include "fastfields/impl/cpu/solve_field.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include FF_NAMESPACE_BEGIN(FF_NS) FF_NAMESPACE_BEGIN(FF_DEVICE) diff --git a/src/lib-cpu/splinc.cpp b/src/lib-cpu/splinc.cpp index a418562..120ce73 100644 --- a/src/lib-cpu/splinc.cpp +++ b/src/lib-cpu/splinc.cpp @@ -1,13 +1,13 @@ #include #include #include -#include "fastfields/api/cpu/splinc.h" -#include "fastfields/core/autocast.h" -#include "fastfields/core/dispatch.h" -#include "fastfields/core/dlpack.h" -#include "fastfields/core/cuda_switch.h" -#include "fastfields/impl/kernels/utils.h" -#include "fastfields/impl/cpu/splinc.h" +#include +#include +#include +#include +#include +#include +#include FF_NAMESPACE_BEGIN(FF_NS) FF_NAMESPACE_BEGIN(FF_DEVICE) diff --git a/src/lib-cuda/distance.cpp b/src/lib-cuda/distance.cpp index 21a26ea..2ee1af4 100644 --- a/src/lib-cuda/distance.cpp +++ b/src/lib-cuda/distance.cpp @@ -1,15 +1,15 @@ #include #include -#include "fastfields/api/cuda/distance.h" -#include "fastfields/core/autocast.h" -#include "fastfields/core/dispatch.h" -#include "fastfields/core/dlpack.h" -#include "fastfields/core/cuda_switch.h" -#include "fastfields/impl/kernels/utils.h" -#include "fastfields/impl/cuda/distance_euclidean.h" -#include "fastfields/impl/cuda/distance_l1.h" -#include "fastfields/impl/cuda/distance_spline.h" -#include "fastfields/impl/cuda/distance_mesh.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include FF_NAMESPACE_BEGIN(FF_NS) FF_NAMESPACE_BEGIN(FF_DEVICE) diff --git a/src/lib-cuda/posdef.cpp b/src/lib-cuda/posdef.cpp index 77fa26a..a8c4460 100644 --- a/src/lib-cuda/posdef.cpp +++ b/src/lib-cuda/posdef.cpp @@ -1,13 +1,13 @@ #include #include #include -#include "fastfields/api/cuda/posdef.h" -#include "fastfields/core/autocast.h" -#include "fastfields/core/dispatch.h" -#include "fastfields/core/dlpack.h" -#include "fastfields/core/cuda_switch.h" -#include "fastfields/impl/kernels/utils.h" -#include "fastfields/impl/cuda/posdef.h" +#include +#include +#include +#include +#include +#include +#include FF_NAMESPACE_BEGIN(FF_NS) FF_NAMESPACE_BEGIN(FF_DEVICE) diff --git a/src/lib-cuda/pushpull.cpp b/src/lib-cuda/pushpull.cpp index 48f2509..eaa27d2 100644 --- a/src/lib-cuda/pushpull.cpp +++ b/src/lib-cuda/pushpull.cpp @@ -1,9 +1,9 @@ -#include "fastfields/api/cuda/pushpull.h" +#include #include // FF_VOIDPTR / CHECK_* / FF_DISPATCH_PP and the reduce_t typedef, shared with // pushpull_backward.cpp so the two translation units cannot drift apart on // which (order, bound) pairs are statically instantiated. -#include "fastfields/api/cuda/pushpull_dispatch.h" +#include FF_NAMESPACE_BEGIN(FF_NS) FF_NAMESPACE_BEGIN(FF_DEVICE) diff --git a/src/lib-cuda/pushpull_backward.cpp b/src/lib-cuda/pushpull_backward.cpp index 63ee477..d4eed80 100644 --- a/src/lib-cuda/pushpull_backward.cpp +++ b/src/lib-cuda/pushpull_backward.cpp @@ -9,9 +9,9 @@ // Compile+link only: there is no GPU in CI, so the *math* is validated by // fastfields-cpu-lib/tests/test_pushpull_backward.cpp against the shared // kernels, and this file is validated by nvcc accepting it. -#include "fastfields/api/cuda/pushpull.h" +#include #include -#include "fastfields/api/cuda/pushpull_dispatch.h" +#include FF_NAMESPACE_BEGIN(FF_NS) FF_NAMESPACE_BEGIN(FF_DEVICE) diff --git a/src/lib-cuda/reg_field.cpp b/src/lib-cuda/reg_field.cpp index aad45d9..14a1265 100644 --- a/src/lib-cuda/reg_field.cpp +++ b/src/lib-cuda/reg_field.cpp @@ -2,16 +2,16 @@ #include #include #include -#include "fastfields/api/cuda/reg_field.h" -#include "fastfields/api/cuda/posdef.h" -#include "fastfields/core/autocast.h" -#include "fastfields/core/dispatch.h" -#include "fastfields/api/cuda/stream.h" -#include "fastfields/core/dlpack.h" -#include "fastfields/core/cuda_switch.h" -#include "fastfields/impl/kernels/bounds.h" -#include "fastfields/impl/kernels/utils.h" -#include "fastfields/impl/cuda/reg_field.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include FF_NAMESPACE_BEGIN(FF_NS) FF_NAMESPACE_BEGIN(FF_DEVICE) diff --git a/src/lib-cuda/reg_field_rls.cpp b/src/lib-cuda/reg_field_rls.cpp index 8345574..e13f057 100644 --- a/src/lib-cuda/reg_field_rls.cpp +++ b/src/lib-cuda/reg_field_rls.cpp @@ -2,16 +2,16 @@ #include #include #include -#include "fastfields/api/cuda/reg_field.h" -#include "fastfields/api/cuda/posdef.h" -#include "fastfields/core/autocast.h" -#include "fastfields/core/dispatch.h" -#include "fastfields/api/cuda/stream.h" -#include "fastfields/core/dlpack.h" -#include "fastfields/core/cuda_switch.h" -#include "fastfields/impl/kernels/bounds.h" -#include "fastfields/impl/kernels/utils.h" -#include "fastfields/impl/cuda/reg_field.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include FF_NAMESPACE_BEGIN(FF_NS) FF_NAMESPACE_BEGIN(FF_DEVICE) diff --git a/src/lib-cuda/reg_flow.cpp b/src/lib-cuda/reg_flow.cpp index fa7a2b2..8c941d8 100644 --- a/src/lib-cuda/reg_flow.cpp +++ b/src/lib-cuda/reg_flow.cpp @@ -1,16 +1,16 @@ #include #include #include -#include "fastfields/api/cuda/reg_flow.h" -#include "fastfields/api/cuda/posdef.h" -#include "fastfields/core/autocast.h" -#include "fastfields/core/dispatch.h" -#include "fastfields/api/cuda/stream.h" -#include "fastfields/core/dlpack.h" -#include "fastfields/core/cuda_switch.h" -#include "fastfields/impl/kernels/bounds.h" -#include "fastfields/impl/kernels/utils.h" -#include "fastfields/impl/cuda/reg_flow.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include FF_NAMESPACE_BEGIN(FF_NS) FF_NAMESPACE_BEGIN(FF_DEVICE) diff --git a/src/lib-cuda/reg_flow_rls.cpp b/src/lib-cuda/reg_flow_rls.cpp index 8da7e4a..290a65a 100644 --- a/src/lib-cuda/reg_flow_rls.cpp +++ b/src/lib-cuda/reg_flow_rls.cpp @@ -1,16 +1,16 @@ #include #include #include -#include "fastfields/api/cuda/reg_flow.h" -#include "fastfields/api/cuda/posdef.h" -#include "fastfields/core/autocast.h" -#include "fastfields/core/dispatch.h" -#include "fastfields/api/cuda/stream.h" -#include "fastfields/core/dlpack.h" -#include "fastfields/core/cuda_switch.h" -#include "fastfields/impl/kernels/bounds.h" -#include "fastfields/impl/kernels/utils.h" -#include "fastfields/impl/cuda/reg_flow.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include FF_NAMESPACE_BEGIN(FF_NS) FF_NAMESPACE_BEGIN(FF_DEVICE) diff --git a/src/lib-cuda/resize.cpp b/src/lib-cuda/resize.cpp index a9cae09..5707674 100644 --- a/src/lib-cuda/resize.cpp +++ b/src/lib-cuda/resize.cpp @@ -1,12 +1,12 @@ #include #include -#include "fastfields/api/cuda/resize.h" -#include "fastfields/core/autocast.h" -#include "fastfields/core/dispatch.h" -#include "fastfields/core/dlpack.h" -#include "fastfields/core/cuda_switch.h" -#include "fastfields/impl/kernels/utils.h" -#include "fastfields/impl/cuda/resize.h" +#include +#include +#include +#include +#include +#include +#include FF_NAMESPACE_BEGIN(FF_NS) FF_NAMESPACE_BEGIN(FF_DEVICE) diff --git a/src/lib-cuda/restrict.cpp b/src/lib-cuda/restrict.cpp index a748982..ef069d0 100644 --- a/src/lib-cuda/restrict.cpp +++ b/src/lib-cuda/restrict.cpp @@ -1,12 +1,12 @@ #include #include -#include "fastfields/api/cuda/restrict.h" -#include "fastfields/core/autocast.h" -#include "fastfields/core/dispatch.h" -#include "fastfields/core/dlpack.h" -#include "fastfields/core/cuda_switch.h" -#include "fastfields/impl/kernels/utils.h" -#include "fastfields/impl/cuda/restrict.h" +#include +#include +#include +#include +#include +#include +#include FF_NAMESPACE_BEGIN(FF_NS) FF_NAMESPACE_BEGIN(FF_DEVICE) diff --git a/src/lib-cuda/splinc.cpp b/src/lib-cuda/splinc.cpp index 47529c0..6f28350 100644 --- a/src/lib-cuda/splinc.cpp +++ b/src/lib-cuda/splinc.cpp @@ -1,13 +1,13 @@ #include #include #include -#include "fastfields/api/cuda/splinc.h" -#include "fastfields/core/autocast.h" -#include "fastfields/core/dispatch.h" -#include "fastfields/core/dlpack.h" -#include "fastfields/core/cuda_switch.h" -#include "fastfields/impl/kernels/utils.h" -#include "fastfields/impl/cuda/splinc.h" +#include +#include +#include +#include +#include +#include +#include FF_NAMESPACE_BEGIN(FF_NS) FF_NAMESPACE_BEGIN(FF_DEVICE) diff --git a/src/lib/distance.cpp b/src/lib/distance.cpp index 8fca611..4413089 100644 --- a/src/lib/distance.cpp +++ b/src/lib/distance.cpp @@ -1,10 +1,10 @@ #include #include -#include "fastfields/api/distance.h" -#include "fastfields/api/checks.h" -#include "fastfields/api/cpu/distance.h" +#include +#include +#include #ifdef FF_WITH_CUDA -#include "fastfields/api/cuda/distance.h" +#include #endif FF_NAMESPACE_BEGIN(FF_NS) diff --git a/src/lib/posdef.cpp b/src/lib/posdef.cpp index 9dd2934..f7b2f3a 100644 --- a/src/lib/posdef.cpp +++ b/src/lib/posdef.cpp @@ -1,10 +1,10 @@ #include #include -#include "fastfields/api/posdef.h" -#include "fastfields/api/checks.h" -#include "fastfields/api/cpu/posdef.h" +#include +#include +#include #ifdef FF_WITH_CUDA -#include "fastfields/api/cuda/posdef.h" +#include #endif FF_NAMESPACE_BEGIN(FF_NS) diff --git a/src/lib/pushpull.cpp b/src/lib/pushpull.cpp index fcd8666..a4ca816 100644 --- a/src/lib/pushpull.cpp +++ b/src/lib/pushpull.cpp @@ -1,10 +1,10 @@ #include #include -#include "fastfields/api/pushpull.h" -#include "fastfields/api/checks.h" -#include "fastfields/api/cpu/pushpull.h" +#include +#include +#include #ifdef FF_WITH_CUDA -#include "fastfields/api/cuda/pushpull.h" +#include #endif FF_NAMESPACE_BEGIN(FF_NS) diff --git a/src/lib/reg_field.cpp b/src/lib/reg_field.cpp index 911e972..e096007 100644 --- a/src/lib/reg_field.cpp +++ b/src/lib/reg_field.cpp @@ -1,10 +1,10 @@ #include #include -#include "fastfields/api/reg_field.h" -#include "fastfields/api/checks.h" -#include "fastfields/api/cpu/reg_field.h" +#include +#include +#include #ifdef FF_WITH_CUDA -#include "fastfields/api/cuda/reg_field.h" +#include #endif FF_NAMESPACE_BEGIN(FF_NS) diff --git a/src/lib/reg_flow.cpp b/src/lib/reg_flow.cpp index c678ed7..525b71b 100644 --- a/src/lib/reg_flow.cpp +++ b/src/lib/reg_flow.cpp @@ -1,10 +1,10 @@ #include #include -#include "fastfields/api/reg_flow.h" -#include "fastfields/api/checks.h" -#include "fastfields/api/cpu/reg_flow.h" +#include +#include +#include #ifdef FF_WITH_CUDA -#include "fastfields/api/cuda/reg_flow.h" +#include #endif FF_NAMESPACE_BEGIN(FF_NS) diff --git a/src/lib/resize.cpp b/src/lib/resize.cpp index 6875ba3..6954e04 100644 --- a/src/lib/resize.cpp +++ b/src/lib/resize.cpp @@ -1,10 +1,10 @@ #include #include -#include "fastfields/api/resize.h" -#include "fastfields/api/checks.h" -#include "fastfields/api/cpu/resize.h" +#include +#include +#include #ifdef FF_WITH_CUDA -#include "fastfields/api/cuda/resize.h" +#include #endif FF_NAMESPACE_BEGIN(FF_NS) diff --git a/src/lib/restrict.cpp b/src/lib/restrict.cpp index 5b93601..e76ab30 100644 --- a/src/lib/restrict.cpp +++ b/src/lib/restrict.cpp @@ -1,10 +1,10 @@ #include #include -#include "fastfields/api/restrict.h" -#include "fastfields/api/checks.h" -#include "fastfields/api/cpu/restrict.h" +#include +#include +#include #ifdef FF_WITH_CUDA -#include "fastfields/api/cuda/restrict.h" +#include #endif FF_NAMESPACE_BEGIN(FF_NS) diff --git a/src/lib/solve_field.cpp b/src/lib/solve_field.cpp index d6d5127..564f70d 100644 --- a/src/lib/solve_field.cpp +++ b/src/lib/solve_field.cpp @@ -1,7 +1,7 @@ #include -#include "fastfields/api/solve_field.h" -#include "fastfields/api/checks.h" -#include "fastfields/api/cpu/solve_field.h" +#include +#include +#include FF_NAMESPACE_BEGIN(FF_NS) diff --git a/src/lib/splinc.cpp b/src/lib/splinc.cpp index d796d77..483062e 100644 --- a/src/lib/splinc.cpp +++ b/src/lib/splinc.cpp @@ -1,10 +1,10 @@ #include #include -#include "fastfields/api/splinc.h" -#include "fastfields/api/checks.h" -#include "fastfields/api/cpu/splinc.h" +#include +#include +#include #ifdef FF_WITH_CUDA -#include "fastfields/api/cuda/splinc.h" +#include #endif FF_NAMESPACE_BEGIN(FF_NS) diff --git a/tests/impl-cuda/compile_probe_mesh.cu b/tests/impl-cuda/compile_probe_mesh.cu index 1a1fb34..0408fa1 100644 --- a/tests/impl-cuda/compile_probe_mesh.cu +++ b/tests/impl-cuda/compile_probe_mesh.cu @@ -55,7 +55,7 @@ // identically yet compiles fine in the real build, so it is an artifact of the // probe technique, not a defect. See fastfields-cuda-impl#40. -#include "fastfields/impl/cuda/distance_mesh.h" +#include namespace M = ff::cuda::distance_mesh; diff --git a/tests/kernels/atomic/test.cpp b/tests/kernels/atomic/test.cpp index e2b3770..539f498 100644 --- a/tests/kernels/atomic/test.cpp +++ b/tests/kernels/atomic/test.cpp @@ -26,8 +26,8 @@ * takes milliseconds; it is built by the tsan CI leg, where the threaded case * below is the interesting one. */ -#include "fastfields/impl/kernels/atomic.h" -#include "fastfields/impl/kernels/parallel.h" +#include +#include #include #include #include diff --git a/tests/kernels/vector/test.cpp b/tests/kernels/vector/test.cpp index 21b42a2..b1ec411 100755 --- a/tests/kernels/vector/test.cpp +++ b/tests/kernels/vector/test.cpp @@ -1,5 +1,5 @@ -#include "fastfields/impl/kernels/vector/vector.h" -#include "fastfields/impl/kernels/vector/stream.h" +#include +#include #include #include diff --git a/tests/lib-cpu/test_distance.cpp b/tests/lib-cpu/test_distance.cpp index 554fba3..3e8a1e7 100644 --- a/tests/lib-cpu/test_distance.cpp +++ b/tests/lib-cpu/test_distance.cpp @@ -16,8 +16,8 @@ #include #include #include -#include "fastfields/core/dlpack.h" -#include "fastfields/api/cpu/distance.h" +#include +#include namespace { diff --git a/tests/lib-cpu/test_distance_mesh.cpp b/tests/lib-cpu/test_distance_mesh.cpp index b729628..7a25429 100644 --- a/tests/lib-cpu/test_distance_mesh.cpp +++ b/tests/lib-cpu/test_distance_mesh.cpp @@ -21,8 +21,8 @@ #include #include #include -#include "fastfields/core/dlpack.h" -#include "fastfields/api/cpu/distance.h" +#include +#include namespace { diff --git a/tests/lib-cpu/test_distance_spline.cpp b/tests/lib-cpu/test_distance_spline.cpp index faa79e6..7e71a6f 100644 --- a/tests/lib-cpu/test_distance_spline.cpp +++ b/tests/lib-cpu/test_distance_spline.cpp @@ -30,10 +30,10 @@ #include #include #include -#include "fastfields/core/dlpack.h" -#include "fastfields/api/cpu/distance.h" -#include "fastfields/impl/kernels/spline.h" -#include "fastfields/impl/kernels/bounds.h" +#include +#include +#include +#include // Spline weight / boundary helpers reused to build an independent reference for // the higher-order (Cubic) spline-distance path (B5). diff --git a/tests/lib-cpu/test_posdef.cpp b/tests/lib-cpu/test_posdef.cpp index 7890a6a..7391f67 100644 --- a/tests/lib-cpu/test_posdef.cpp +++ b/tests/lib-cpu/test_posdef.cpp @@ -19,8 +19,8 @@ #include #include #include -#include "fastfields/core/dlpack.h" -#include "fastfields/api/cpu/posdef.h" +#include +#include namespace { diff --git a/tests/lib-cpu/test_pushpull.cpp b/tests/lib-cpu/test_pushpull.cpp index 12006e3..d916be5 100644 --- a/tests/lib-cpu/test_pushpull.cpp +++ b/tests/lib-cpu/test_pushpull.cpp @@ -19,8 +19,8 @@ #include #include #include -#include "fastfields/core/dlpack.h" -#include "fastfields/api/cpu/pushpull.h" +#include +#include namespace { diff --git a/tests/lib-cpu/test_pushpull_backward.cpp b/tests/lib-cpu/test_pushpull_backward.cpp index fab8fe2..15e060b 100644 --- a/tests/lib-cpu/test_pushpull_backward.cpp +++ b/tests/lib-cpu/test_pushpull_backward.cpp @@ -38,8 +38,8 @@ #include #include #include -#include "fastfields/core/dlpack.h" -#include "fastfields/api/cpu/pushpull.h" +#include +#include namespace { diff --git a/tests/lib-cpu/test_reg_field.cpp b/tests/lib-cpu/test_reg_field.cpp index 5b0c5e0..549ae23 100644 --- a/tests/lib-cpu/test_reg_field.cpp +++ b/tests/lib-cpu/test_reg_field.cpp @@ -15,9 +15,9 @@ #include #include #include -#include "fastfields/core/dlpack.h" -#include "fastfields/api/cpu/reg_field.h" -#include "fastfields/api/cpu/posdef.h" +#include +#include +#include namespace { diff --git a/tests/lib-cpu/test_reg_flow.cpp b/tests/lib-cpu/test_reg_flow.cpp index 8d3dec1..b775bf7 100644 --- a/tests/lib-cpu/test_reg_flow.cpp +++ b/tests/lib-cpu/test_reg_flow.cpp @@ -15,9 +15,9 @@ #include #include #include -#include "fastfields/core/dlpack.h" -#include "fastfields/api/cpu/reg_flow.h" -#include "fastfields/api/cpu/posdef.h" +#include +#include +#include namespace { diff --git a/tests/lib-cpu/test_reg_op.cpp b/tests/lib-cpu/test_reg_op.cpp index 096f2d7..f358948 100644 --- a/tests/lib-cpu/test_reg_op.cpp +++ b/tests/lib-cpu/test_reg_op.cpp @@ -21,11 +21,11 @@ #include #include -#include "fastfields/core/cuda_switch.h" -#include "fastfields/impl/kernels/bounds.h" -#include "fastfields/impl/kernels/utils.h" -#include "fastfields/impl/cpu/reg_field.h" -#include "fastfields/impl/cpu/reg_flow.h" +#include +#include +#include +#include +#include namespace { diff --git a/tests/lib-cpu/test_resize.cpp b/tests/lib-cpu/test_resize.cpp index f062a03..481f98b 100644 --- a/tests/lib-cpu/test_resize.cpp +++ b/tests/lib-cpu/test_resize.cpp @@ -15,8 +15,8 @@ #include #include #include -#include "fastfields/core/dlpack.h" -#include "fastfields/api/cpu/resize.h" +#include +#include namespace { diff --git a/tests/lib-cpu/test_restrict.cpp b/tests/lib-cpu/test_restrict.cpp index 2772e18..a85aed1 100644 --- a/tests/lib-cpu/test_restrict.cpp +++ b/tests/lib-cpu/test_restrict.cpp @@ -15,9 +15,9 @@ #include #include #include -#include "fastfields/core/dlpack.h" -#include "fastfields/api/cpu/resize.h" -#include "fastfields/api/cpu/restrict.h" +#include +#include +#include namespace { diff --git a/tests/lib-cpu/test_solve_field.cpp b/tests/lib-cpu/test_solve_field.cpp index 4212315..f7c35cd 100644 --- a/tests/lib-cpu/test_solve_field.cpp +++ b/tests/lib-cpu/test_solve_field.cpp @@ -24,10 +24,10 @@ #include #include #include -#include "fastfields/core/dlpack.h" -#include "fastfields/api/cpu/solve_field.h" -#include "fastfields/api/cpu/reg_field.h" -#include "fastfields/api/cpu/posdef.h" +#include +#include +#include +#include namespace { diff --git a/tests/lib-cpu/test_splinc.cpp b/tests/lib-cpu/test_splinc.cpp index b8ca1fe..f486316 100644 --- a/tests/lib-cpu/test_splinc.cpp +++ b/tests/lib-cpu/test_splinc.cpp @@ -14,10 +14,10 @@ #include #include #include -#include "fastfields/core/dlpack.h" -#include "fastfields/api/cpu/splinc.h" -#include "fastfields/impl/kernels/spline.h" -#include "fastfields/impl/kernels/bounds.h" +#include +#include +#include +#include using ff::cpu::spline::type; using btype = ff::cpu::bound::type; diff --git a/tests/lib/test_device_check.cpp b/tests/lib/test_device_check.cpp index 5f11249..f10a26b 100644 --- a/tests/lib/test_device_check.cpp +++ b/tests/lib/test_device_check.cpp @@ -11,7 +11,7 @@ #include #include #include -#include "fastfields/api/checks.h" +#include static DLTensor make_tensor(DLDeviceType type, int32_t id) { DLTensor t; // zero-init the fields we don't care about diff --git a/tests/lib/test_splinc_bound.cpp b/tests/lib/test_splinc_bound.cpp index 5f3f111..2433966 100644 --- a/tests/lib/test_splinc_bound.cpp +++ b/tests/lib/test_splinc_bound.cpp @@ -14,7 +14,7 @@ #include #include #include -#include "fastfields/api/splinc.h" +#include static int failures = 0; diff --git a/tools/normalise-include-delimiters.py b/tools/normalise-include-delimiters.py new file mode 100644 index 0000000..d7cee00 --- /dev/null +++ b/tools/normalise-include-delimiters.py @@ -0,0 +1,185 @@ +#!/usr/bin/env python3 +""" +normalise-include-delimiters.py -- angle brackets for the public interface, +quotes for headers private to the including component. + +THE RULE THIS APPLIES +-------------------------------------------------------------------------- + #include the installed public interface, found on the + include path (-I include) + #include "sibling.h" a header that lives next to the including + file and is reached relative to it + +`include/fastfields/` *is* the public installed interface: it is copied to an +install prefix and consumed from there by `fastfields-dlpack`, whose setup.py +puts it on the compiler's include path via `include_dirs`. The ordinary C++ +convention spells a dependency found on the include path with `<>` and a +dependency found next to the includer with `""`, and this tree was writing +both categories the same way -- 437 `#include "fastfields/..."` and not one +``. + +That is carryover, not a decision: the consolidation moved every header under +one prefix and rewrote the *path* in every `#include`, leaving the delimiter +untouched because that was the minimal textual change. The clearest evidence +that the result reads wrong is downstream, in `fastfields-dlpack/src/ext.cpp`, +which writes `` and `"fastfields/api/distance.h"` ten +lines apart -- two spellings for the same category of dependency. + +WHY THIS IS BEHAVIOUR-PRESERVING HERE +-------------------------------------------------------------------------- +`""` searches the including file's own directory first and then falls back to +exactly the `<>` search. So the two differ only when a quoted spelling is +resolved by that first step. `make/common.mk` sets + + INCLUDES += -I$(ROOTDIR)/include + +and that is the whole include configuration -- every compile rule in the four +Makefiles uses `$(INCLUDES)` and nothing else, and there is **no `-iquote` +anywhere in the tree**, so `""` and `<>` share one search path. No directory +named `fastfields/` exists beside any source file, so no `fastfields/...` +include was ever being resolved by the relative step. `--check` re-derives +that guarantee from the sources rather than asking you to trust it, by +verifying that every quoted include really does resolve next to its includer. + +WHAT IS NOT TOUCHED +-------------------------------------------------------------------------- +The ~135 genuinely relative includes -- `"../utils.h"`, `"flow/2d.h"`, +`"utils.h"` -- are private to their component, correctly quoted, and left +exactly as they are. Standard-library and third-party includes already use +`<>`. + +The two frozen one-shot scripts, `tools/consolidate.sh` and +`tools/dedup-dispatch-helpers.py`, quote include lines as *literals of the +tree at their own parent commit* -- their documented contract is to be +replayed against that parent, not against today's `main`. They are +deliberately not rewritten. + +USAGE +-------------------------------------------------------------------------- + python3 tools/normalise-include-delimiters.py # apply + python3 tools/normalise-include-delimiters.py --check # verify only + +Idempotent and deterministic: re-running over a converted tree rewrites +nothing, and running over the pre-sweep tree reproduces the sweep exactly. + +If this lands on a base that has moved, do NOT resolve conflicts by hand: +reset, re-run the script on the new base, and commit that. +""" + +import os +import re +import sys + +ROOT = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) + +SOURCE_DIRS = ("include", "src", "tests") +SOURCE_EXTS = (".h", ".hpp", ".inl", ".cpp", ".cu", ".cuh") + +# The one directory on the include path, per make/common.mk. +INCLUDE_PATH = (os.path.join(ROOT, "include"),) + +# Verbatim third-party code: never rewritten. (It includes nothing of ours.) +VENDORED = {"include/fastfields/core/dlpack.h"} + +PUBLIC_PREFIX = "fastfields/" + +INCLUDE_RE = re.compile(r'^([ \t]*#[ \t]*include[ \t]*)(["<])([^">]+)([">])(.*)$') + + +def sources(): + for d in SOURCE_DIRS: + for dirpath, _, filenames in os.walk(os.path.join(ROOT, d)): + for name in sorted(filenames): + if name.endswith(SOURCE_EXTS): + rel = os.path.relpath(os.path.join(dirpath, name), ROOT) + if rel not in VENDORED: + yield rel + + +def includes(rel): + """(line number, delimiter, target) for every #include in the file.""" + with open(os.path.join(ROOT, rel), encoding="utf-8") as fh: + for n, line in enumerate(fh, 1): + m = INCLUDE_RE.match(line.rstrip("\n")) + if m: + yield n, m.group(2), m.group(3).strip() + + +def on_include_path(target): + return any(os.path.isfile(os.path.join(d, target)) for d in INCLUDE_PATH) + + +def beside(rel, target): + return os.path.isfile(os.path.join(ROOT, os.path.dirname(rel), target)) + + +def convert(text): + out = [] + for line in text.split("\n"): + m = INCLUDE_RE.match(line) + if m and m.group(2) == '"' and m.group(3).strip().startswith(PUBLIC_PREFIX): + line = "%s<%s>%s" % (m.group(1), m.group(3), m.group(5)) + out.append(line) + return "\n".join(out) + + +def apply(check_only=False): + changed = 0 + for rel in sources(): + path = os.path.join(ROOT, rel) + with open(path, encoding="utf-8") as fh: + original = fh.read() + text = convert(original) + if text != original: + changed += 1 + if check_only: + print("would rewrite %s" % rel) + else: + with open(path, "w", encoding="utf-8") as fh: + fh.write(text) + print("%d file(s)%s" % (changed, " would change" if check_only else " rewritten")) + return changed + + +def violations(): + """Every include that does not match the convention. Must be empty. + + Three things are checked, and the last two are what make the first one + safe rather than merely tidy: + + 1. no `fastfields/...` include is still quoted; + 2. every quoted include resolves beside its includer -- which is the + property that makes quotes-vs-angles a real distinction here, and + proves no quoted include was relying on the include path; + 3. no angle-bracket include of ours resolves beside its includer, i.e. + nothing private has been promoted to the public spelling. + """ + hits = [] + for rel in sources(): + for n, delim, target in includes(rel): + where = "%s:%d: %s" % (rel, n, target) + if delim == '"': + if target.startswith(PUBLIC_PREFIX): + hits.append("%s -- public header, must use <>" % where) + elif not beside(rel, target): + hits.append("%s -- quoted but not beside the includer" % where) + else: + if beside(rel, target) and not on_include_path(target): + hits.append("%s -- private header, must use \"\"" % where) + return hits + + +if __name__ == "__main__": + check = "--check" in sys.argv + apply(check_only=check) + left = violations() + if left: + print("\nINCLUDES NOT MATCHING THE CONVENTION:") + for h in left: + print(" " + h) + else: + print( + "\nevery public include uses and every quoted " + "include resolves beside its includer." + ) + sys.exit(1 if left else 0)