Skip to content

Commit 807f2e7

Browse files
JacobDomagalaJacobDomagala
committed
#2216: Fix namespace issues and remove uneeded custom formatters
1 parent 1f505cc commit 807f2e7

File tree

10 files changed

+21
-116
lines changed

10 files changed

+21
-116
lines changed

‎cmake_config.h.in

+4-2
Original file line numberDiff line numberDiff line change
@@ -98,12 +98,14 @@
9898
#define INCLUDE_FMT_RANGES <fmt/ranges.h>
9999
#define INCLUDE_FMT_OSTREAM <fmt/ostream.h>
100100

101-
#define VT_FMT_NAMESPACE namespace fmt
101+
#define VT_FMT_NAMESPACE_BEGIN namespace fmt {
102+
#define VT_FMT_NAMESPACE_END }
102103
#else
103104
#define INCLUDE_FMT_CORE <fmt-vt/core.h>
104105
#define INCLUDE_FMT_FORMAT <fmt-vt/format.h>
105106
#define INCLUDE_FMT_RANGES <fmt-vt/ranges.h>
106107
#define INCLUDE_FMT_OSTREAM <fmt-vt/ostream.h>
107108

108-
#define VT_FMT_NAMESPACE namespace fmt::vt
109+
#define VT_FMT_NAMESPACE_BEGIN namespace fmt { inline namespace vt {
110+
#define VT_FMT_NAMESPACE_END } }
109111
#endif

‎src/vt/rdma/rdma_common.h

+4-2
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ static constexpr ByteType rdma_default_byte_size = sizeof(char);
117117

118118
}} //end namespace vt::rdma
119119

120-
VT_FMT_NAMESPACE {
120+
VT_FMT_NAMESPACE_BEGIN
121121
template <>
122122
struct formatter<::vt::rdma::Type> : formatter<std::string_view> {
123123
template <typename FormatContext>
@@ -136,11 +136,13 @@ VT_FMT_NAMESPACE {
136136
case ::vt::rdma::Type::Uninitialized:
137137
name = "Uninitialized";
138138
break;
139+
default:
140+
name = fmt::format("{}", static_cast<std::underlying_type_t<::vt::rdma::Type>>(t));
139141
}
140142
return formatter<std::string_view>::format(name, ctx);
141143
}
142144
};
143-
} // VT_FMT_NAMESPACE
145+
VT_FMT_NAMESPACE_END
144146

145147
#define PRINT_CHANNEL_TYPE(rdma_op_type) ( \
146148
rdma_op_type == vt::rdma::Type::Get ? "rdma::Get" : ( \

‎src/vt/termination/interval/interval.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ struct Interval;
237237

238238
}}}
239239

240-
VT_FMT_NAMESPACE {
240+
VT_FMT_NAMESPACE_BEGIN
241241
template <typename DomainT, DomainT sentinel>
242242
struct formatter<::vt::term::interval::Interval<DomainT, sentinel>>
243243
: formatter<std::string> {
@@ -249,6 +249,6 @@ VT_FMT_NAMESPACE {
249249
ctx.out(), "Interval[{}, {}]", interval.lower(), interval.upper());
250250
}
251251
};
252-
} // VT_FMT_NAMESPACE
252+
VT_FMT_NAMESPACE_END
253253

254254
#endif /*INCLUDED_VT_TERMINATION_INTERVAL_INTERVAL_H*/

‎src/vt/timing/timing.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ TimeType getCurrentTime();
6363

6464
}} /* end namespace vt::timing */
6565

66-
VT_FMT_NAMESPACE {
66+
VT_FMT_NAMESPACE_BEGIN
6767
template <>
6868
struct formatter<::vt::TimeTypeWrapper> {
6969
template <typename ParseContext>
@@ -79,6 +79,6 @@ VT_FMT_NAMESPACE {
7979
}
8080
};
8181

82-
} // VT_FMT_NAMESPACE
82+
VT_FMT_NAMESPACE_END
8383

8484
#endif /*INCLUDED_VT_TIMING_TIMING_H*/

‎src/vt/topos/index/dense/dense_array.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ static_assert(
159159

160160
}} // end namespace vt::index
161161

162-
VT_FMT_NAMESPACE {
162+
VT_FMT_NAMESPACE_BEGIN
163163
template <typename IndexType, ::vt::index::NumDimensionsType ndim>
164164
struct formatter<::vt::index::DenseIndexArray<IndexType, ndim>>
165165
: formatter<std::array<IndexType, ndim>> {
@@ -170,7 +170,7 @@ VT_FMT_NAMESPACE {
170170
return formatter<std::array<IndexType, ndim>>::format(wrapper.dims, ctx);
171171
}
172172
};
173-
} // VT_FMT_NAMESPACE
173+
VT_FMT_NAMESPACE_END
174174

175175
#include "vt/topos/index/dense/dense_array.impl.h"
176176

‎src/vt/vrt/collection/balance/greedylb/greedylb.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ struct GreedyLB : LoadSamplerBaseLB {
126126

127127
}}}} /* end namespace vt::vrt::collection::lb */
128128

129-
VT_FMT_NAMESPACE {
129+
VT_FMT_NAMESPACE_BEGIN
130130
template <>
131131
struct formatter<::vt::vrt::collection::lb::DataDistStrategy>
132132
: formatter<std::string_view> {
@@ -149,6 +149,6 @@ VT_FMT_NAMESPACE {
149149
}
150150
};
151151

152-
} // VT_FMT_NAMESPACE
152+
VT_FMT_NAMESPACE_END
153153

154154
#endif /*INCLUDED_VT_VRT_COLLECTION_BALANCE_GREEDYLB_GREEDYLB_H*/

‎src/vt/vrt/collection/balance/lb_args_enum_converter.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ struct LBArgsEnumConverter {
100100
auto err = fmt::format(
101101
"LBArgsEnumConverter: enum '{}' value '{}' corresponding to LB "
102102
"argument '{}' does not have a string associated with it",
103-
enum_type_, e, par_name_
103+
enum_type_, static_cast<std::underlying_type_t<T>>(e), par_name_
104104
);
105105
vtAbort(err);
106106
}

‎src/vt/vrt/collection/balance/temperedlb/criterion.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ struct Criterion {
9393

9494
}}}} /* end namespace vt::vrt::collection::lb */
9595

96-
VT_FMT_NAMESPACE {
96+
VT_FMT_NAMESPACE_BEGIN
9797
template <>
9898
struct formatter<::vt::vrt::collection::lb::CriterionEnum>
9999
: formatter<std::string_view> {
@@ -113,6 +113,6 @@ VT_FMT_NAMESPACE {
113113
}
114114
};
115115

116-
} // VT_FMT_NAMESPACE
116+
VT_FMT_NAMESPACE_END
117117

118118
#endif /*INCLUDED_VT_VRT_COLLECTION_BALANCE_TEMPEREDLB_CRITERION_H*/

‎src/vt/vrt/collection/balance/temperedlb/tempered_enums.h

-99
Original file line numberDiff line numberDiff line change
@@ -167,103 +167,4 @@ enum struct KnowledgeEnum : uint8_t {
167167

168168
}}}} /* end namespace vt::vrt::collection::lb */
169169

170-
VT_FMT_NAMESPACE {
171-
// Specialize fmt::formatter for ObjectOrderEnum
172-
template <>
173-
struct formatter<::vt::vrt::collection::lb::ObjectOrderEnum>
174-
: formatter<std::string_view> {
175-
template <typename FormatContext>
176-
auto
177-
format(::vt::vrt::collection::lb::ObjectOrderEnum c, FormatContext& ctx) {
178-
std::string_view name = "Unknown";
179-
switch (c) {
180-
case ::vt::vrt::collection::lb::ObjectOrderEnum::Arbitrary:
181-
name = "Arbitrary";
182-
break;
183-
case ::vt::vrt::collection::lb::ObjectOrderEnum::ElmID:
184-
name = "ElmID";
185-
break;
186-
case ::vt::vrt::collection::lb::ObjectOrderEnum::FewestMigrations:
187-
name = "FewestMigrations";
188-
break;
189-
case ::vt::vrt::collection::lb::ObjectOrderEnum::SmallObjects:
190-
name = "SmallObjects";
191-
break;
192-
case ::vt::vrt::collection::lb::ObjectOrderEnum::LargestObjects:
193-
name = "LargestObjects";
194-
break;
195-
}
196-
return formatter<string_view>::format(name, ctx);
197-
}
198-
};
199-
200-
// Specialize fmt::formatter for CMFTypeEnum
201-
template <>
202-
struct formatter<::vt::vrt::collection::lb::CMFTypeEnum>
203-
: formatter<std::string_view> {
204-
template <typename FormatContext>
205-
auto format(::vt::vrt::collection::lb::CMFTypeEnum c, FormatContext& ctx) {
206-
std::string_view name = "Unknown";
207-
switch (c) {
208-
case ::vt::vrt::collection::lb::CMFTypeEnum::Original:
209-
name = "Original";
210-
break;
211-
case ::vt::vrt::collection::lb::CMFTypeEnum::NormByMax:
212-
name = "NormByMax";
213-
break;
214-
case ::vt::vrt::collection::lb::CMFTypeEnum::NormBySelf:
215-
name = "NormBySelf";
216-
break;
217-
case ::vt::vrt::collection::lb::CMFTypeEnum::NormByMaxExcludeIneligible:
218-
name = "NormByMaxExcludeIneligible";
219-
break;
220-
}
221-
return formatter<string_view>::format(name, ctx);
222-
}
223-
};
224-
225-
// Specialize fmt::formatter for KnowledgeEnum
226-
template <>
227-
struct formatter<::vt::vrt::collection::lb::KnowledgeEnum>
228-
: formatter<std::string_view> {
229-
template <typename FormatContext>
230-
auto
231-
format(::vt::vrt::collection::lb::KnowledgeEnum c, FormatContext& ctx) {
232-
std::string_view name = "Unknown";
233-
switch (c) {
234-
case ::vt::vrt::collection::lb::KnowledgeEnum::UserDefined:
235-
name = "UserDefined";
236-
break;
237-
case ::vt::vrt::collection::lb::KnowledgeEnum::Complete:
238-
name = "Complete";
239-
break;
240-
case ::vt::vrt::collection::lb::KnowledgeEnum::Log:
241-
name = "Log";
242-
break;
243-
}
244-
return formatter<string_view>::format(name, ctx);
245-
}
246-
};
247-
248-
// Specialize fmt::formatter for KnowledgeEnum
249-
template <>
250-
struct formatter<::vt::vrt::collection::lb::InformTypeEnum>
251-
: formatter<std::string_view> {
252-
template <typename FormatContext>
253-
auto
254-
format(::vt::vrt::collection::lb::InformTypeEnum c, FormatContext& ctx) {
255-
std::string_view name = "Unknown";
256-
switch (c) {
257-
case ::vt::vrt::collection::lb::InformTypeEnum::SyncInform:
258-
name = "SyncInform";
259-
break;
260-
case ::vt::vrt::collection::lb::InformTypeEnum::AsyncInform:
261-
name = "AsyncInform";
262-
break;
263-
}
264-
return formatter<string_view>::format(name, ctx);
265-
}
266-
};
267-
} // VT_FMT_NAMESPACE
268-
269170
#endif /*INCLUDED_VT_VRT_COLLECTION_BALANCE_TEMPEREDLB_TEMPERED_ENUMS_H*/

‎tests/unit/lb/test_lbargs_enum_conv.nompi.cc

+2-2
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ TEST_F(TestLBArgsEnumConverter, test_enum_converter_config) {
148148

149149
}}} // end namespace vt::tests::unit
150150

151-
VT_FMT_NAMESPACE {
151+
VT_FMT_NAMESPACE_BEGIN
152152
template <>
153153
struct formatter<::vt::tests::unit::DummyEnum> : formatter<std::string_view> {
154154
template <typename FormatContext>
@@ -168,4 +168,4 @@ VT_FMT_NAMESPACE {
168168
return formatter<string_view>::format(name, ctx);
169169
}
170170
};
171-
} // VT_FMT_NAMESPACE
171+
VT_FMT_NAMESPACE_END

0 commit comments

Comments
 (0)