diff --git a/include/netuit/assign/GenerateMetisAssignments.hpp b/include/netuit/assign/GenerateMetisAssignments.hpp index 0c05ef9e1..03264db25 100644 --- a/include/netuit/assign/GenerateMetisAssignments.hpp +++ b/include/netuit/assign/GenerateMetisAssignments.hpp @@ -13,8 +13,8 @@ #endif #include "../../uitsl/debug/audit_cast.hpp" -#include "../../uitsl/debug/uitsl_assert.hpp" #include "../../uitsl/debug/EnumeratedFunctor.hpp" +#include "../../uitsl/debug/uitsl_assert.hpp" #include "../../uitsl/mpi/mpi_init_utils.hpp" #include "../../uitsl/parallel/thread_utils.hpp" diff --git a/include/uit/ducts/proc/impl/inlet/accumulating+type=spanfundamental/sf::AccumulateDuct.hpp b/include/uit/ducts/proc/impl/inlet/accumulating+type=spanfundamental/sf::AccumulateDuct.hpp index febffa507..a1aba6157 100644 --- a/include/uit/ducts/proc/impl/inlet/accumulating+type=spanfundamental/sf::AccumulateDuct.hpp +++ b/include/uit/ducts/proc/impl/inlet/accumulating+type=spanfundamental/sf::AccumulateDuct.hpp @@ -10,9 +10,9 @@ #include <mpi.h> +#include "../../../../../../uitsl/debug/uitsl_always_assert.hpp" #include "../../../../../../uitsl/distributed/RdmaAccumulatorBundle.hpp" #include "../../../../../../uitsl/distributed/RdmaWindowManager.hpp" -#include "../../../../../../uitsl/debug/uitsl_always_assert.hpp" #include "../../../../../../uitsl/meta/f::static_test.hpp" #include "../../../../../../uitsl/meta/s::static_test.hpp" #include "../../../../../../uitsl/mpi/mpi_init_utils.hpp" diff --git a/include/uit/ducts/proc/impl/inlet/accumulating+type=spanfundamental/sf::RaccumulateDuct.hpp b/include/uit/ducts/proc/impl/inlet/accumulating+type=spanfundamental/sf::RaccumulateDuct.hpp index c5eee6308..6d2f29135 100644 --- a/include/uit/ducts/proc/impl/inlet/accumulating+type=spanfundamental/sf::RaccumulateDuct.hpp +++ b/include/uit/ducts/proc/impl/inlet/accumulating+type=spanfundamental/sf::RaccumulateDuct.hpp @@ -11,9 +11,9 @@ #include <mpi.h> +#include "../../../../../../uitsl/debug/uitsl_always_assert.hpp" #include "../../../../../../uitsl/distributed/RdmaAccumulatorBundle.hpp" #include "../../../../../../uitsl/distributed/RdmaWindowManager.hpp" -#include "../../../../../../uitsl/debug/uitsl_always_assert.hpp" #include "../../../../../../uitsl/meta/f::static_test.hpp" #include "../../../../../../uitsl/meta/s::static_test.hpp" #include "../../../../../../uitsl/mpi/mpi_init_utils.hpp" diff --git a/include/uit/ducts/proc/impl/inlet/put=dropping+type=trivial/t::RingRputDuct.hpp b/include/uit/ducts/proc/impl/inlet/put=dropping+type=trivial/t::RingRputDuct.hpp index 801f859cd..b8c1293a0 100644 --- a/include/uit/ducts/proc/impl/inlet/put=dropping+type=trivial/t::RingRputDuct.hpp +++ b/include/uit/ducts/proc/impl/inlet/put=dropping+type=trivial/t::RingRputDuct.hpp @@ -5,8 +5,8 @@ #include <algorithm> #include <array> #include <cassert> -#include <vector> #include <stddef.h> +#include <vector> #include <mpi.h> diff --git a/include/uit/ducts/proc/impl/outlet/get=stepping+type=trivial/t::RingIrecvDuct.hpp b/include/uit/ducts/proc/impl/outlet/get=stepping+type=trivial/t::RingIrecvDuct.hpp index 11d88015e..00ad1721d 100644 --- a/include/uit/ducts/proc/impl/outlet/get=stepping+type=trivial/t::RingIrecvDuct.hpp +++ b/include/uit/ducts/proc/impl/outlet/get=stepping+type=trivial/t::RingIrecvDuct.hpp @@ -10,10 +10,10 @@ #include <mpi.h> -#include "../../../../../../uitsl/debug/uitsl_always_assert.hpp" #include "../../../../../../uitsl/datastructs/RingBuffer.hpp" #include "../../../../../../uitsl/datastructs/SiftingArray.hpp" #include "../../../../../../uitsl/debug/err_audit.hpp" +#include "../../../../../../uitsl/debug/uitsl_always_assert.hpp" #include "../../../../../../uitsl/meta/t::static_test.hpp" #include "../../../../../../uitsl/mpi/mpi_init_utils.hpp" #include "../../../../../../uitsl/utility/print_utils.hpp" diff --git a/include/uit/ducts/proc/impl/outlet/templated/AccumulatingPooledOutletDuct.hpp b/include/uit/ducts/proc/impl/outlet/templated/AccumulatingPooledOutletDuct.hpp index 2783bca26..199fa5b8d 100644 --- a/include/uit/ducts/proc/impl/outlet/templated/AccumulatingPooledOutletDuct.hpp +++ b/include/uit/ducts/proc/impl/outlet/templated/AccumulatingPooledOutletDuct.hpp @@ -4,8 +4,8 @@ #include <algorithm> #include <array> -#include <optional> #include <memory> +#include <optional> #include <stddef.h> #include <mpi.h> diff --git a/include/uit/spouts/Inlet.hpp b/include/uit/spouts/Inlet.hpp index 8d6da6b21..a720cf845 100644 --- a/include/uit/spouts/Inlet.hpp +++ b/include/uit/spouts/Inlet.hpp @@ -6,8 +6,8 @@ #include <cassert> #include <cstdint> #include <iostream> -#include <optional> #include <memory> +#include <optional> #include <stddef.h> #include <utility> diff --git a/include/uit_emp/_codegen/make_facade.py b/include/uit_emp/_codegen/make_facade.py index 84dc3cae4..a21b35858 100755 --- a/include/uit_emp/_codegen/make_facade.py +++ b/include/uit_emp/_codegen/make_facade.py @@ -11,6 +11,7 @@ def setup_one_facade(header_path: str) -> None: header_guard = ( "UIT_EMP_" + header_path.upper().replace("/", "_").replace(".", "_") + + "_INCLUDE" ) relpath = lambda x: os.path.relpath(x, os.path.dirname(header_path)) diff --git a/include/uit_emp/_codegen/pylib/__init__.py b/include/uit_emp/_codegen/pylib/__init__.py index 49b5d9137..9e75a339e 100644 --- a/include/uit_emp/_codegen/pylib/__init__.py +++ b/include/uit_emp/_codegen/pylib/__init__.py @@ -1,4 +1,4 @@ +from ._iter_header_content import iter_header_content from ._iter_headerguards import iter_headerguards from ._iter_header_paths import iter_header_paths -from ._iter_header_content import iter_header_content from ._iter_macros import iter_macros diff --git a/include/uit_emp/base/always_assert.hpp b/include/uit_emp/base/always_assert.hpp index b5a7d2e69..38b677fcd 100644 --- a/include/uit_emp/base/always_assert.hpp +++ b/include/uit_emp/base/always_assert.hpp @@ -1,6 +1,6 @@ #pragma once -#ifndef UIT_EMP_BASE_ALWAYS_ASSERT_HPP -#define UIT_EMP_BASE_ALWAYS_ASSERT_HPP +#ifndef UIT_EMP_BASE_ALWAYS_ASSERT_HPP_INCLUDE +#define UIT_EMP_BASE_ALWAYS_ASSERT_HPP_INCLUDE #ifdef UIT_VENDORIZE_EMP #include "../vendorization/push_uit_emp.hh" @@ -17,4 +17,4 @@ namespace uit_emp = emp; #include "../vendorization/pop_uit_emp.hh" #endif // #ifdef UIT_VENDORIZE_EMP -#endif // #ifndef UIT_EMP_BASE_ALWAYS_ASSERT_HPP +#endif // #ifndef UIT_EMP_BASE_ALWAYS_ASSERT_HPP_INCLUDE diff --git a/include/uit_emp/base/assert.hpp b/include/uit_emp/base/assert.hpp index adccd94bf..062236389 100644 --- a/include/uit_emp/base/assert.hpp +++ b/include/uit_emp/base/assert.hpp @@ -1,6 +1,6 @@ #pragma once -#ifndef UIT_EMP_BASE_ASSERT_HPP -#define UIT_EMP_BASE_ASSERT_HPP +#ifndef UIT_EMP_BASE_ASSERT_HPP_INCLUDE +#define UIT_EMP_BASE_ASSERT_HPP_INCLUDE #ifdef UIT_VENDORIZE_EMP #include "../vendorization/push_uit_emp.hh" @@ -17,4 +17,4 @@ namespace uit_emp = emp; #include "../vendorization/pop_uit_emp.hh" #endif // #ifdef UIT_VENDORIZE_EMP -#endif // #ifndef UIT_EMP_BASE_ASSERT_HPP +#endif // #ifndef UIT_EMP_BASE_ASSERT_HPP_INCLUDE diff --git a/include/uit_emp/base/error.hpp b/include/uit_emp/base/error.hpp index 4c29923e3..aef082146 100644 --- a/include/uit_emp/base/error.hpp +++ b/include/uit_emp/base/error.hpp @@ -1,6 +1,6 @@ #pragma once -#ifndef UIT_EMP_BASE_ERROR_HPP -#define UIT_EMP_BASE_ERROR_HPP +#ifndef UIT_EMP_BASE_ERROR_HPP_INCLUDE +#define UIT_EMP_BASE_ERROR_HPP_INCLUDE #ifdef UIT_VENDORIZE_EMP #include "../vendorization/push_uit_emp.hh" @@ -17,4 +17,4 @@ namespace uit_emp = emp; #include "../vendorization/pop_uit_emp.hh" #endif // #ifdef UIT_VENDORIZE_EMP -#endif // #ifndef UIT_EMP_BASE_ERROR_HPP +#endif // #ifndef UIT_EMP_BASE_ERROR_HPP_INCLUDE diff --git a/include/uit_emp/base/errors.hpp b/include/uit_emp/base/errors.hpp index 859372ed8..2847103e1 100644 --- a/include/uit_emp/base/errors.hpp +++ b/include/uit_emp/base/errors.hpp @@ -1,6 +1,6 @@ #pragma once -#ifndef UIT_EMP_BASE_ERRORS_HPP -#define UIT_EMP_BASE_ERRORS_HPP +#ifndef UIT_EMP_BASE_ERRORS_HPP_INCLUDE +#define UIT_EMP_BASE_ERRORS_HPP_INCLUDE #ifdef UIT_VENDORIZE_EMP #include "../vendorization/push_uit_emp.hh" @@ -17,4 +17,4 @@ namespace uit_emp = emp; #include "../vendorization/pop_uit_emp.hh" #endif // #ifdef UIT_VENDORIZE_EMP -#endif // #ifndef UIT_EMP_BASE_ERRORS_HPP +#endif // #ifndef UIT_EMP_BASE_ERRORS_HPP_INCLUDE diff --git a/include/uit_emp/data/DataFile.hpp b/include/uit_emp/data/DataFile.hpp index 75fe3ecc2..3b51562b9 100644 --- a/include/uit_emp/data/DataFile.hpp +++ b/include/uit_emp/data/DataFile.hpp @@ -1,6 +1,6 @@ #pragma once -#ifndef UIT_EMP_DATA_DATAFILE_HPP -#define UIT_EMP_DATA_DATAFILE_HPP +#ifndef UIT_EMP_DATA_DATAFILE_HPP_INCLUDE +#define UIT_EMP_DATA_DATAFILE_HPP_INCLUDE #ifdef UIT_VENDORIZE_EMP #include "../vendorization/push_uit_emp.hh" @@ -17,4 +17,4 @@ namespace uit_emp = emp; #include "../vendorization/pop_uit_emp.hh" #endif // #ifdef UIT_VENDORIZE_EMP -#endif // #ifndef UIT_EMP_DATA_DATAFILE_HPP +#endif // #ifndef UIT_EMP_DATA_DATAFILE_HPP_INCLUDE diff --git a/include/uit_emp/data/DataNode.hpp b/include/uit_emp/data/DataNode.hpp index df5bd589a..e54e7b45d 100644 --- a/include/uit_emp/data/DataNode.hpp +++ b/include/uit_emp/data/DataNode.hpp @@ -1,6 +1,6 @@ #pragma once -#ifndef UIT_EMP_DATA_DATANODE_HPP -#define UIT_EMP_DATA_DATANODE_HPP +#ifndef UIT_EMP_DATA_DATANODE_HPP_INCLUDE +#define UIT_EMP_DATA_DATANODE_HPP_INCLUDE #ifdef UIT_VENDORIZE_EMP #include "../vendorization/push_uit_emp.hh" @@ -17,4 +17,4 @@ namespace uit_emp = emp; #include "../vendorization/pop_uit_emp.hh" #endif // #ifdef UIT_VENDORIZE_EMP -#endif // #ifndef UIT_EMP_DATA_DATANODE_HPP +#endif // #ifndef UIT_EMP_DATA_DATANODE_HPP_INCLUDE diff --git a/include/uit_emp/datastructs/QueueCache.hpp b/include/uit_emp/datastructs/QueueCache.hpp index fea34bbe6..0da1b942b 100644 --- a/include/uit_emp/datastructs/QueueCache.hpp +++ b/include/uit_emp/datastructs/QueueCache.hpp @@ -1,6 +1,6 @@ #pragma once -#ifndef UIT_EMP_DATASTRUCTS_QUEUECACHE_HPP -#define UIT_EMP_DATASTRUCTS_QUEUECACHE_HPP +#ifndef UIT_EMP_DATASTRUCTS_QUEUECACHE_HPP_INCLUDE +#define UIT_EMP_DATASTRUCTS_QUEUECACHE_HPP_INCLUDE #ifdef UIT_VENDORIZE_EMP #include "../vendorization/push_uit_emp.hh" @@ -17,4 +17,4 @@ namespace uit_emp = emp; #include "../vendorization/pop_uit_emp.hh" #endif // #ifdef UIT_VENDORIZE_EMP -#endif // #ifndef UIT_EMP_DATASTRUCTS_QUEUECACHE_HPP +#endif // #ifndef UIT_EMP_DATASTRUCTS_QUEUECACHE_HPP_INCLUDE diff --git a/include/uit_emp/datastructs/hash_utils.hpp b/include/uit_emp/datastructs/hash_utils.hpp index af71b4d6b..f89fcd66d 100644 --- a/include/uit_emp/datastructs/hash_utils.hpp +++ b/include/uit_emp/datastructs/hash_utils.hpp @@ -1,6 +1,6 @@ #pragma once -#ifndef UIT_EMP_DATASTRUCTS_HASH_UTILS_HPP -#define UIT_EMP_DATASTRUCTS_HASH_UTILS_HPP +#ifndef UIT_EMP_DATASTRUCTS_HASH_UTILS_HPP_INCLUDE +#define UIT_EMP_DATASTRUCTS_HASH_UTILS_HPP_INCLUDE #ifdef UIT_VENDORIZE_EMP #include "../vendorization/push_uit_emp.hh" @@ -17,4 +17,4 @@ namespace uit_emp = emp; #include "../vendorization/pop_uit_emp.hh" #endif // #ifdef UIT_VENDORIZE_EMP -#endif // #ifndef UIT_EMP_DATASTRUCTS_HASH_UTILS_HPP +#endif // #ifndef UIT_EMP_DATASTRUCTS_HASH_UTILS_HPP_INCLUDE diff --git a/include/uit_emp/datastructs/tuple_utils.hpp b/include/uit_emp/datastructs/tuple_utils.hpp index 1b40c95c7..7b326fd32 100644 --- a/include/uit_emp/datastructs/tuple_utils.hpp +++ b/include/uit_emp/datastructs/tuple_utils.hpp @@ -1,6 +1,6 @@ #pragma once -#ifndef UIT_EMP_DATASTRUCTS_TUPLE_UTILS_HPP -#define UIT_EMP_DATASTRUCTS_TUPLE_UTILS_HPP +#ifndef UIT_EMP_DATASTRUCTS_TUPLE_UTILS_HPP_INCLUDE +#define UIT_EMP_DATASTRUCTS_TUPLE_UTILS_HPP_INCLUDE #ifdef UIT_VENDORIZE_EMP #include "../vendorization/push_uit_emp.hh" @@ -17,4 +17,4 @@ namespace uit_emp = emp; #include "../vendorization/pop_uit_emp.hh" #endif // #ifdef UIT_VENDORIZE_EMP -#endif // #ifndef UIT_EMP_DATASTRUCTS_TUPLE_UTILS_HPP +#endif // #ifndef UIT_EMP_DATASTRUCTS_TUPLE_UTILS_HPP_INCLUDE diff --git a/include/uit_emp/io/ContiguousStream.hpp b/include/uit_emp/io/ContiguousStream.hpp index fae7cfb82..ee1cf4ad2 100644 --- a/include/uit_emp/io/ContiguousStream.hpp +++ b/include/uit_emp/io/ContiguousStream.hpp @@ -1,6 +1,6 @@ #pragma once -#ifndef UIT_EMP_IO_CONTIGUOUSSTREAM_HPP -#define UIT_EMP_IO_CONTIGUOUSSTREAM_HPP +#ifndef UIT_EMP_IO_CONTIGUOUSSTREAM_HPP_INCLUDE +#define UIT_EMP_IO_CONTIGUOUSSTREAM_HPP_INCLUDE #ifdef UIT_VENDORIZE_EMP #include "../vendorization/push_uit_emp.hh" @@ -17,4 +17,4 @@ namespace uit_emp = emp; #include "../vendorization/pop_uit_emp.hh" #endif // #ifdef UIT_VENDORIZE_EMP -#endif // #ifndef UIT_EMP_IO_CONTIGUOUSSTREAM_HPP +#endif // #ifndef UIT_EMP_IO_CONTIGUOUSSTREAM_HPP_INCLUDE diff --git a/include/uit_emp/io/MemoryIStream.hpp b/include/uit_emp/io/MemoryIStream.hpp index 94a6b2c0a..7f12af604 100644 --- a/include/uit_emp/io/MemoryIStream.hpp +++ b/include/uit_emp/io/MemoryIStream.hpp @@ -1,6 +1,6 @@ #pragma once -#ifndef UIT_EMP_IO_MEMORYISTREAM_HPP -#define UIT_EMP_IO_MEMORYISTREAM_HPP +#ifndef UIT_EMP_IO_MEMORYISTREAM_HPP_INCLUDE +#define UIT_EMP_IO_MEMORYISTREAM_HPP_INCLUDE #ifdef UIT_VENDORIZE_EMP #include "../vendorization/push_uit_emp.hh" @@ -17,4 +17,4 @@ namespace uit_emp = emp; #include "../vendorization/pop_uit_emp.hh" #endif // #ifdef UIT_VENDORIZE_EMP -#endif // #ifndef UIT_EMP_IO_MEMORYISTREAM_HPP +#endif // #ifndef UIT_EMP_IO_MEMORYISTREAM_HPP_INCLUDE diff --git a/include/uit_emp/math/Random.hpp b/include/uit_emp/math/Random.hpp index b98f8fbc2..f64edbb5c 100644 --- a/include/uit_emp/math/Random.hpp +++ b/include/uit_emp/math/Random.hpp @@ -1,6 +1,6 @@ #pragma once -#ifndef UIT_EMP_MATH_RANDOM_HPP -#define UIT_EMP_MATH_RANDOM_HPP +#ifndef UIT_EMP_MATH_RANDOM_HPP_INCLUDE +#define UIT_EMP_MATH_RANDOM_HPP_INCLUDE #ifdef UIT_VENDORIZE_EMP #include "../vendorization/push_uit_emp.hh" @@ -17,4 +17,4 @@ namespace uit_emp = emp; #include "../vendorization/pop_uit_emp.hh" #endif // #ifdef UIT_VENDORIZE_EMP -#endif // #ifndef UIT_EMP_MATH_RANDOM_HPP +#endif // #ifndef UIT_EMP_MATH_RANDOM_HPP_INCLUDE diff --git a/include/uit_emp/math/math.hpp b/include/uit_emp/math/math.hpp index 35e380659..49791b8dd 100644 --- a/include/uit_emp/math/math.hpp +++ b/include/uit_emp/math/math.hpp @@ -1,6 +1,6 @@ #pragma once -#ifndef UIT_EMP_MATH_MATH_HPP -#define UIT_EMP_MATH_MATH_HPP +#ifndef UIT_EMP_MATH_MATH_HPP_INCLUDE +#define UIT_EMP_MATH_MATH_HPP_INCLUDE #ifdef UIT_VENDORIZE_EMP #include "../vendorization/push_uit_emp.hh" @@ -17,4 +17,4 @@ namespace uit_emp = emp; #include "../vendorization/pop_uit_emp.hh" #endif // #ifdef UIT_VENDORIZE_EMP -#endif // #ifndef UIT_EMP_MATH_MATH_HPP +#endif // #ifndef UIT_EMP_MATH_MATH_HPP_INCLUDE diff --git a/include/uit_emp/math/random_utils.hpp b/include/uit_emp/math/random_utils.hpp index e9e5d436a..397578150 100644 --- a/include/uit_emp/math/random_utils.hpp +++ b/include/uit_emp/math/random_utils.hpp @@ -1,6 +1,6 @@ #pragma once -#ifndef UIT_EMP_MATH_RANDOM_UTILS_HPP -#define UIT_EMP_MATH_RANDOM_UTILS_HPP +#ifndef UIT_EMP_MATH_RANDOM_UTILS_HPP_INCLUDE +#define UIT_EMP_MATH_RANDOM_UTILS_HPP_INCLUDE #ifdef UIT_VENDORIZE_EMP #include "../vendorization/push_uit_emp.hh" @@ -17,4 +17,4 @@ namespace uit_emp = emp; #include "../vendorization/pop_uit_emp.hh" #endif // #ifdef UIT_VENDORIZE_EMP -#endif // #ifndef UIT_EMP_MATH_RANDOM_UTILS_HPP +#endif // #ifndef UIT_EMP_MATH_RANDOM_UTILS_HPP_INCLUDE diff --git a/include/uit_emp/meta/TypePack.hpp b/include/uit_emp/meta/TypePack.hpp index ad7f60fcc..92deca6f3 100644 --- a/include/uit_emp/meta/TypePack.hpp +++ b/include/uit_emp/meta/TypePack.hpp @@ -1,6 +1,6 @@ #pragma once -#ifndef UIT_EMP_META_TYPEPACK_HPP -#define UIT_EMP_META_TYPEPACK_HPP +#ifndef UIT_EMP_META_TYPEPACK_HPP_INCLUDE +#define UIT_EMP_META_TYPEPACK_HPP_INCLUDE #ifdef UIT_VENDORIZE_EMP #include "../vendorization/push_uit_emp.hh" @@ -17,4 +17,4 @@ namespace uit_emp = emp; #include "../vendorization/pop_uit_emp.hh" #endif // #ifdef UIT_VENDORIZE_EMP -#endif // #ifndef UIT_EMP_META_TYPEPACK_HPP +#endif // #ifndef UIT_EMP_META_TYPEPACK_HPP_INCLUDE diff --git a/include/uit_emp/meta/meta.hpp b/include/uit_emp/meta/meta.hpp index b5cb16e78..4539189cb 100644 --- a/include/uit_emp/meta/meta.hpp +++ b/include/uit_emp/meta/meta.hpp @@ -1,6 +1,6 @@ #pragma once -#ifndef UIT_EMP_META_META_HPP -#define UIT_EMP_META_META_HPP +#ifndef UIT_EMP_META_META_HPP_INCLUDE +#define UIT_EMP_META_META_HPP_INCLUDE #ifdef UIT_VENDORIZE_EMP #include "../vendorization/push_uit_emp.hh" @@ -17,4 +17,4 @@ namespace uit_emp = emp; #include "../vendorization/pop_uit_emp.hh" #endif // #ifdef UIT_VENDORIZE_EMP -#endif // #ifndef UIT_EMP_META_META_HPP +#endif // #ifndef UIT_EMP_META_META_HPP_INCLUDE diff --git a/include/uit_emp/polyfill/span.hpp b/include/uit_emp/polyfill/span.hpp index f0653aede..fdc30c5af 100644 --- a/include/uit_emp/polyfill/span.hpp +++ b/include/uit_emp/polyfill/span.hpp @@ -1,6 +1,6 @@ #pragma once -#ifndef UIT_EMP_POLYFILL_SPAN_HPP -#define UIT_EMP_POLYFILL_SPAN_HPP +#ifndef UIT_EMP_POLYFILL_SPAN_HPP_INCLUDE +#define UIT_EMP_POLYFILL_SPAN_HPP_INCLUDE #ifdef UIT_VENDORIZE_EMP #include "../vendorization/push_uit_emp.hh" @@ -17,4 +17,4 @@ namespace uit_emp = emp; #include "../vendorization/pop_uit_emp.hh" #endif // #ifdef UIT_VENDORIZE_EMP -#endif // #ifndef UIT_EMP_POLYFILL_SPAN_HPP +#endif // #ifndef UIT_EMP_POLYFILL_SPAN_HPP_INCLUDE diff --git a/include/uit_emp/tools/keyname_utils.hpp b/include/uit_emp/tools/keyname_utils.hpp index c52f95dc5..7e66670d6 100644 --- a/include/uit_emp/tools/keyname_utils.hpp +++ b/include/uit_emp/tools/keyname_utils.hpp @@ -1,6 +1,6 @@ #pragma once -#ifndef UIT_EMP_TOOLS_KEYNAME_UTILS_HPP -#define UIT_EMP_TOOLS_KEYNAME_UTILS_HPP +#ifndef UIT_EMP_TOOLS_KEYNAME_UTILS_HPP_INCLUDE +#define UIT_EMP_TOOLS_KEYNAME_UTILS_HPP_INCLUDE #ifdef UIT_VENDORIZE_EMP #include "../vendorization/push_uit_emp.hh" @@ -17,4 +17,4 @@ namespace uit_emp = emp; #include "../vendorization/pop_uit_emp.hh" #endif // #ifdef UIT_VENDORIZE_EMP -#endif // #ifndef UIT_EMP_TOOLS_KEYNAME_UTILS_HPP +#endif // #ifndef UIT_EMP_TOOLS_KEYNAME_UTILS_HPP_INCLUDE diff --git a/include/uit_emp/tools/string_utils.hpp b/include/uit_emp/tools/string_utils.hpp index 834d82e30..55efafe31 100644 --- a/include/uit_emp/tools/string_utils.hpp +++ b/include/uit_emp/tools/string_utils.hpp @@ -1,6 +1,6 @@ #pragma once -#ifndef UIT_EMP_TOOLS_STRING_UTILS_HPP -#define UIT_EMP_TOOLS_STRING_UTILS_HPP +#ifndef UIT_EMP_TOOLS_STRING_UTILS_HPP_INCLUDE +#define UIT_EMP_TOOLS_STRING_UTILS_HPP_INCLUDE #ifdef UIT_VENDORIZE_EMP #include "../vendorization/push_uit_emp.hh" @@ -17,4 +17,4 @@ namespace uit_emp = emp; #include "../vendorization/pop_uit_emp.hh" #endif // #ifdef UIT_VENDORIZE_EMP -#endif // #ifndef UIT_EMP_TOOLS_STRING_UTILS_HPP +#endif // #ifndef UIT_EMP_TOOLS_STRING_UTILS_HPP_INCLUDE diff --git a/include/uitsl/concurrent/Gatherer.hpp b/include/uitsl/concurrent/Gatherer.hpp index e71cb24d5..cfc3c8829 100644 --- a/include/uitsl/concurrent/Gatherer.hpp +++ b/include/uitsl/concurrent/Gatherer.hpp @@ -3,8 +3,8 @@ #define UITSL_CONCURRENT_GATHERER_HPP_INCLUDE #include <algorithm> -#include <optional> #include <numeric> +#include <optional> #include <thread> #include <vector> diff --git a/include/uitsl/concurrent/ThreadSafeIbarrierRequest.hpp b/include/uitsl/concurrent/ThreadSafeIbarrierRequest.hpp index 1d6f135fd..ff1db856b 100644 --- a/include/uitsl/concurrent/ThreadSafeIbarrierRequest.hpp +++ b/include/uitsl/concurrent/ThreadSafeIbarrierRequest.hpp @@ -2,8 +2,8 @@ #ifndef UITSL_CONCURRENT_THREADSAFEIBARRIERREQUEST_HPP_INCLUDE #define UITSL_CONCURRENT_THREADSAFEIBARRIERREQUEST_HPP_INCLUDE -#include <optional> #include <mutex> +#include <optional> #include <mpi.h> diff --git a/include/uitsl/debug/uitsl_always_assert.hpp b/include/uitsl/debug/uitsl_always_assert.hpp index 18ed29330..39afca65b 100644 --- a/include/uitsl/debug/uitsl_always_assert.hpp +++ b/include/uitsl/debug/uitsl_always_assert.hpp @@ -2,14 +2,14 @@ #ifndef UITSL_DEBUG_UITSL_ALWAYS_ASSERT_HPP_INCLUDE #define UITSL_DEBUG_UITSL_ALWAYS_ASSERT_HPP_INCLUDE -#include <iostream> #include <cstdlib> +#include <iostream> -#include "../meta/is_streamable.hpp" #include "../meta/fwd_or_cast.hpp" +#include "../meta/is_streamable.hpp" #include "../meta/UITSL_NAMESPACE.hpp" -#include "../utility/UITSL_STRINGIFY.hpp" #include "../utility/SetSeparator.hpp" +#include "../utility/UITSL_STRINGIFY.hpp" // adapted from https://stackoverflow.com/a/53986818 // pass optional second argument as myvar << "mystring" << etc. diff --git a/include/uitsl/distributed/RdmaWindow.hpp b/include/uitsl/distributed/RdmaWindow.hpp index a7b41a181..e665fa98f 100644 --- a/include/uitsl/distributed/RdmaWindow.hpp +++ b/include/uitsl/distributed/RdmaWindow.hpp @@ -3,8 +3,8 @@ #define UITSL_DISTRIBUTED_RDMAWINDOW_HPP_INCLUDE #include <cassert> -#include <stddef.h> #include <optional> +#include <stddef.h> #include <vector> #include <mpi.h> diff --git a/include/uitsl/utility/SetSeparator.hpp b/include/uitsl/utility/SetSeparator.hpp index 8074c710c..d4a047ba1 100644 --- a/include/uitsl/utility/SetSeparator.hpp +++ b/include/uitsl/utility/SetSeparator.hpp @@ -3,8 +3,8 @@ #define UITSL_UTILITY_SETSEPARATOR_HPP_INCLUDE #include <iostream> -#include <utility> #include <string> +#include <utility> #include "SeparatedStream.hpp" diff --git a/include/uitsl/utility/keyname_directory_max.hpp b/include/uitsl/utility/keyname_directory_max.hpp index 4bdfefe13..a963333e8 100644 --- a/include/uitsl/utility/keyname_directory_max.hpp +++ b/include/uitsl/utility/keyname_directory_max.hpp @@ -4,8 +4,8 @@ #include <algorithm> #include <cassert> -#include <vector> #include <string> +#include <vector> #include "../polyfill/filesystem.hpp" #include "../polyfill/identity.hpp"