diff --git a/cmake/trace_only_functions.cmake b/cmake/trace_only_functions.cmake index 700833891b..591f56075c 100644 --- a/cmake/trace_only_functions.cmake +++ b/cmake/trace_only_functions.cmake @@ -94,7 +94,7 @@ function(create_trace_only_target) # we use INSTALL_DIR/include/vt-trace instead # so we have to install FMT lib aswell install( - FILES "${CMAKE_CURRENT_SOURCE_DIR}/../lib/fmt/include/fmt/core.h" + FILES "${CMAKE_CURRENT_SOURCE_DIR}/../lib/fmt/include/fmt-vt/core.h" DESTINATION "include/vt-trace/fmt" ) diff --git a/lib/fmt/CMakeLists.txt b/lib/fmt/CMakeLists.txt index 90e6eef4c7..0357be8374 100644 --- a/lib/fmt/CMakeLists.txt +++ b/lib/fmt/CMakeLists.txt @@ -3,7 +3,7 @@ project(FMT CXX) function(add_headers VAR) set(headers ${${VAR}}) foreach (header ${ARGN}) - set(headers ${headers} include/fmt/${header}) + set(headers ${headers} include/fmt-vt/${header}) endforeach() set(${VAR} ${headers} PARENT_SCOPE) endfunction() @@ -14,6 +14,7 @@ set(FMT_SOURCES src/format.cc) add_library(fmt ${FMT_SOURCES} ${FMT_HEADERS}) add_library(fmt::fmt ALIAS fmt) +set_target_properties(fmt PROPERTIES OUTPUT_NAME fmt-vt) target_include_directories(fmt SYSTEM PUBLIC $ @@ -25,7 +26,7 @@ set_target_properties(fmt PROPERTIES DEBUG_POSTFIX "${FMT_DEBUG_POSTFIX}") install( - DIRECTORY include/fmt + DIRECTORY include/fmt-vt DESTINATION include CONFIGURATIONS ${build_type_list} FILES_MATCHING PATTERN "*" diff --git a/lib/fmt/include/fmt/core.h b/lib/fmt/include/fmt-vt/core.h similarity index 99% rename from lib/fmt/include/fmt/core.h rename to lib/fmt/include/fmt-vt/core.h index 067705335a..9514ccd181 100644 --- a/lib/fmt/include/fmt/core.h +++ b/lib/fmt/include/fmt-vt/core.h @@ -2064,7 +2064,7 @@ FMT_INLINE std::basic_string vformat( **Example**:: - #include + #include std::string message = fmt::format("The answer is {}", 42); \endrst */ diff --git a/lib/fmt/include/fmt/format-inl.h b/lib/fmt/include/fmt-vt/format-inl.h similarity index 100% rename from lib/fmt/include/fmt/format-inl.h rename to lib/fmt/include/fmt-vt/format-inl.h diff --git a/lib/fmt/include/fmt/format.h b/lib/fmt/include/fmt-vt/format.h similarity index 99% rename from lib/fmt/include/fmt/format.h rename to lib/fmt/include/fmt-vt/format.h index 1a037b02b7..7e9133c394 100644 --- a/lib/fmt/include/fmt/format.h +++ b/lib/fmt/include/fmt-vt/format.h @@ -3721,7 +3721,7 @@ arg_join, detail::sentinel_t, wchar_t> join( **Example**:: - #include + #include std::string answer = fmt::to_string(42); \endrst diff --git a/lib/fmt/include/fmt/ostream.h b/lib/fmt/include/fmt-vt/ostream.h similarity index 100% rename from lib/fmt/include/fmt/ostream.h rename to lib/fmt/include/fmt-vt/ostream.h diff --git a/lib/fmt/src/format.cc b/lib/fmt/src/format.cc index 6141d964a7..c9e00acdcd 100644 --- a/lib/fmt/src/format.cc +++ b/lib/fmt/src/format.cc @@ -5,7 +5,7 @@ // // For the license information refer to format.h. -#include "fmt/format-inl.h" +#include "fmt-vt/format-inl.h" FMT_BEGIN_NAMESPACE namespace detail { diff --git a/src/vt/configs/debug/debug_fmt.h b/src/vt/configs/debug/debug_fmt.h index d561271cd6..3d814e7307 100644 --- a/src/vt/configs/debug/debug_fmt.h +++ b/src/vt/configs/debug/debug_fmt.h @@ -46,7 +46,7 @@ #include "vt/config.h" -#include +#include #include diff --git a/src/vt/configs/debug/debug_print.h b/src/vt/configs/debug/debug_print.h index aac28b217f..71f39d083c 100644 --- a/src/vt/configs/debug/debug_print.h +++ b/src/vt/configs/debug/debug_print.h @@ -49,7 +49,7 @@ #include "vt/configs/debug/debug_colorize.h" #include "vt/configs/debug/debug_var_unused.h" -#include +#include /* === Debug file/line/func functionality === diff --git a/src/vt/configs/error/assert_out.impl.h b/src/vt/configs/error/assert_out.impl.h index 655ed88693..9af0575a98 100644 --- a/src/vt/configs/error/assert_out.impl.h +++ b/src/vt/configs/error/assert_out.impl.h @@ -56,7 +56,7 @@ #include #include -#include +#include namespace vt { namespace debug { namespace assert { diff --git a/src/vt/configs/error/assert_out_info.impl.h b/src/vt/configs/error/assert_out_info.impl.h index a5305bcb00..a14809e33d 100644 --- a/src/vt/configs/error/assert_out_info.impl.h +++ b/src/vt/configs/error/assert_out_info.impl.h @@ -57,7 +57,7 @@ #include #include -#include +#include namespace vt { namespace debug { namespace assert { diff --git a/src/vt/configs/error/error.impl.h b/src/vt/configs/error/error.impl.h index a92c09f82a..aced37c291 100644 --- a/src/vt/configs/error/error.impl.h +++ b/src/vt/configs/error/error.impl.h @@ -55,7 +55,7 @@ #include #include -#include +#include namespace vt { namespace error { diff --git a/src/vt/configs/error/keyval_printer.impl.h b/src/vt/configs/error/keyval_printer.impl.h index d68105ac9e..05d7555af2 100644 --- a/src/vt/configs/error/keyval_printer.impl.h +++ b/src/vt/configs/error/keyval_printer.impl.h @@ -53,7 +53,7 @@ #include #include -#include +#include namespace vt { namespace util { namespace error { diff --git a/src/vt/configs/error/pretty_print_message.cc b/src/vt/configs/error/pretty_print_message.cc index 5bb10c22d7..c909893694 100644 --- a/src/vt/configs/error/pretty_print_message.cc +++ b/src/vt/configs/error/pretty_print_message.cc @@ -50,7 +50,7 @@ #include #include // gethostname -#include +#include namespace vt { namespace debug { diff --git a/src/vt/configs/error/soft_error.h b/src/vt/configs/error/soft_error.h index 67edd3bf7a..aab9c43518 100644 --- a/src/vt/configs/error/soft_error.h +++ b/src/vt/configs/error/soft_error.h @@ -59,7 +59,7 @@ #include -#include +#include namespace vt { diff --git a/src/vt/elm/elm_id.h b/src/vt/elm/elm_id.h index 0c1518fe48..b4be4682a0 100644 --- a/src/vt/elm/elm_id.h +++ b/src/vt/elm/elm_id.h @@ -94,7 +94,7 @@ struct hash { } /* end namespace std */ -#include +#include namespace fmt { diff --git a/src/vt/epoch/epoch_manip.cc b/src/vt/epoch/epoch_manip.cc index 1c8ad1f667..779286c6f1 100644 --- a/src/vt/epoch/epoch_manip.cc +++ b/src/vt/epoch/epoch_manip.cc @@ -49,7 +49,7 @@ #include "vt/utils/bits/bits_packer.h" #include "vt/termination/term_common.h" -#include +#include namespace vt { namespace epoch { diff --git a/src/vt/epoch/epoch_type.h b/src/vt/epoch/epoch_type.h index fccf3d539f..c4bf73e8e6 100644 --- a/src/vt/epoch/epoch_type.h +++ b/src/vt/epoch/epoch_type.h @@ -108,7 +108,7 @@ struct hash { } /* end namespace std */ -#include +#include namespace fmt { diff --git a/src/vt/epoch/epoch_window.cc b/src/vt/epoch/epoch_window.cc index 3deb9e24ea..a37533564a 100644 --- a/src/vt/epoch/epoch_window.cc +++ b/src/vt/epoch/epoch_window.cc @@ -44,7 +44,7 @@ #include "vt/epoch/epoch_window.h" #include "vt/epoch/epoch_manip.h" -#include +#include namespace vt { namespace epoch { diff --git a/src/vt/runtime/component/diagnostic_value_format.h b/src/vt/runtime/component/diagnostic_value_format.h index 8c9f608083..23b997e8c9 100644 --- a/src/vt/runtime/component/diagnostic_value_format.h +++ b/src/vt/runtime/component/diagnostic_value_format.h @@ -49,7 +49,7 @@ #include "vt/runtime/component/diagnostic_enum_format.h" #include "vt/utils/memory/memory_units.h" -#include +#include namespace vt { namespace runtime { namespace component { namespace detail { diff --git a/src/vt/runtime/runtime_diagnostics.cc b/src/vt/runtime/runtime_diagnostics.cc index 9cb01d542f..4d7be9d2b4 100644 --- a/src/vt/runtime/runtime_diagnostics.cc +++ b/src/vt/runtime/runtime_diagnostics.cc @@ -56,7 +56,7 @@ #include #endif /*vt_check_enabled(libfort)*/ -#include +#include #include #include diff --git a/src/vt/termination/interval/interval.h b/src/vt/termination/interval/interval.h index cbe7b38c8b..59c4ecd724 100644 --- a/src/vt/termination/interval/interval.h +++ b/src/vt/termination/interval/interval.h @@ -48,7 +48,7 @@ #include -#include +#include namespace vt { namespace term { namespace interval { diff --git a/src/vt/timing/timing.h b/src/vt/timing/timing.h index ffc5991b8a..0baaf45f52 100644 --- a/src/vt/timing/timing.h +++ b/src/vt/timing/timing.h @@ -47,7 +47,7 @@ #include #include -#include +#include #include "vt/timing/timing_type.h" diff --git a/src/vt/utils/adt/histogram_approx.h b/src/vt/utils/adt/histogram_approx.h index 485ffefe5c..a568e24ce9 100644 --- a/src/vt/utils/adt/histogram_approx.h +++ b/src/vt/utils/adt/histogram_approx.h @@ -52,7 +52,7 @@ #include #include -#include +#include namespace vt { namespace util { namespace adt { diff --git a/src/vt/utils/json/json_appender.h b/src/vt/utils/json/json_appender.h index bb358a4dda..3caf69f221 100644 --- a/src/vt/utils/json/json_appender.h +++ b/src/vt/utils/json/json_appender.h @@ -49,7 +49,7 @@ #include -#include +#include namespace vt { namespace util { namespace json { diff --git a/src/vt/vrt/collection/balance/node_lb_data.cc b/src/vt/vrt/collection/balance/node_lb_data.cc index 3def3fb3e1..b7c2cb5746 100644 --- a/src/vt/vrt/collection/balance/node_lb_data.cc +++ b/src/vt/vrt/collection/balance/node_lb_data.cc @@ -58,7 +58,7 @@ #include #include -#include +#include namespace vt { namespace vrt { namespace collection { namespace balance { diff --git a/src/vt/vrt/collection/manager.impl.h b/src/vt/vrt/collection/manager.impl.h index 8a17f2de1c..60e44d95de 100644 --- a/src/vt/vrt/collection/manager.impl.h +++ b/src/vt/vrt/collection/manager.impl.h @@ -89,8 +89,8 @@ #include #include -#include -#include +#include +#include namespace vt { namespace vrt { namespace collection { diff --git a/tests/perf/ping_pong.cc b/tests/perf/ping_pong.cc index 5632e2019d..7cf2ecc253 100644 --- a/tests/perf/ping_pong.cc +++ b/tests/perf/ping_pong.cc @@ -45,7 +45,7 @@ #include #include -#include +#include using namespace vt; using namespace vt::tests::perf::common; diff --git a/tests/unit/collection/test_collection_common.h b/tests/unit/collection/test_collection_common.h index 571d760621..65e769b22b 100644 --- a/tests/unit/collection/test_collection_common.h +++ b/tests/unit/collection/test_collection_common.h @@ -47,8 +47,8 @@ #include #include -#include -#include +#include +#include #include diff --git a/tests/unit/collection/test_collection_construct_common.h b/tests/unit/collection/test_collection_construct_common.h index 6749923bbc..997680c326 100644 --- a/tests/unit/collection/test_collection_construct_common.h +++ b/tests/unit/collection/test_collection_construct_common.h @@ -49,8 +49,8 @@ #include "vt/vrt/collection/manager.h" #include "data_message.h" -#include -#include +#include +#include #include diff --git a/tests/unit/configs/test_stack_dumping.cc b/tests/unit/configs/test_stack_dumping.cc index 20464fdbbb..03437e5f96 100644 --- a/tests/unit/configs/test_stack_dumping.cc +++ b/tests/unit/configs/test_stack_dumping.cc @@ -41,7 +41,7 @@ //@HEADER */ -#include +#include #include #include "test_parallel_harness.h"