1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
|
--- a/cmake/EnableCompilerWarnings.cmake
+++ b/cmake/EnableCompilerWarnings.cmake
@@ -70,6 +70,7 @@ set(__clang_cxx_compile_options
-Wno-unused-command-line-argument
-Wno-weak-vtables
-Wno-covered-switch-default
+ -Wno-switch-default
-Wno-unused-result
-Wno-unsafe-buffer-usage
-Wno-deprecated-declarations
--- a/src/include/miopen/bfloat16.hpp
+++ b/src/include/miopen/bfloat16.hpp
@@ -28,6 +28,7 @@
#include <boost/operators.hpp>
#include <iostream>
#include <miopen/config.h>
+#include <miopen/libcxx_compat.hpp>
class bfloat16 : boost::totally_ordered<bfloat16, boost::arithmetic<bfloat16>>
{
@@ -152,7 +153,7 @@ private:
std::uint16_t data_;
};
-namespace std {
+NAMESPACE_STD_BEGIN
template <>
class numeric_limits<bfloat16>
{
@@ -173,5 +174,5 @@ public:
return bfloat16::generate(0x0001); // 0x0.02p-126
}
};
-} // namespace std
+NAMESPACE_STD_END
#endif
--- /dev/null
+++ b/src/include/miopen/libcxx_compat.hpp
@@ -0,0 +1,44 @@
+/*******************************************************************************
+ *
+ * MIT License
+ *
+ * Copyright (c) 2024 Advanced Micro Devices, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ *******************************************************************************/
+#ifndef LIBCXX_COMPAT_HPP_
+#define LIBCXX_COMPAT_HPP_
+
+// Definitions for libc++ compatibility
+#ifdef __has_include
+#if __has_include (<__config>)
+#include <__config>
+#endif
+#endif
+
+#ifdef _LIBCPP_VERSION
+#define NAMESPACE_STD_BEGIN _LIBCPP_BEGIN_NAMESPACE_STD
+#define NAMESPACE_STD_END _LIBCPP_END_NAMESPACE_STD
+#else
+#define NAMESPACE_STD_BEGIN namespace std {
+#define NAMESPACE_STD_END }
+#endif
+
+#endif
--- a/src/kernels/hip_float8.hpp
+++ b/src/kernels/hip_float8.hpp
@@ -26,6 +26,7 @@
#pragma once
#include "miopen_cstdint.hpp"
+#include "libcxx_compat.hpp"
#ifndef MIOPEN_ENABLE_F8_DEVICE_CODE
#define MIOPEN_ENABLE_F8_DEVICE_CODE 0
@@ -590,7 +591,7 @@ public:
// from the precompiled header.
#else
// NOLINTBEGIN(cert-dcl58-cpp)
-namespace std {
+NAMESPACE_STD_BEGIN
inline bool isfinite(miopen_f8::hip_f8<miopen_f8::hip_f8_type::fp8> x) // NOLINT
{
return !(x.is_inf() || x.is_nan());
@@ -611,12 +612,12 @@ inline bool isnan(miopen_f8::hip_f8<miopen_f8::hip_f8_type::bf8> x) // NOLINT
return x.is_nan();
}
-} // namespace std
+NAMESPACE_STD_END
// NOLINTEND(cert-dcl58-cpp)
#endif
// NOLINTBEGIN(cert-dcl58-cpp)
-namespace std {
+NAMESPACE_STD_BEGIN
template <typename T>
class numeric_limits;
@@ -633,7 +634,7 @@ class numeric_limits<miopen_f8::hip_f8<miopen_f8::hip_f8_type::bf8>>
{
};
-} // namespace std
+NAMESPACE_STD_END
// NOLINTEND(cert-dcl58-cpp)
template <miopen_f8::hip_f8_type T>
--- /dev/null
+++ b/src/kernels/libcxx_compat.hpp
@@ -0,0 +1,41 @@
+/*******************************************************************************
+ *
+ * MIT License
+ *
+ * Copyright (c) 2024 Advanced Micro Devices, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ *******************************************************************************/
+#pragma once
+
+// Definitions for libc++ compatibility
+#ifdef __has_include
+#if __has_include (<__config>)
+#include <__config>
+#endif
+#endif
+
+#ifdef _LIBCPP_VERSION
+#define NAMESPACE_STD_BEGIN _LIBCPP_BEGIN_NAMESPACE_STD
+#define NAMESPACE_STD_END _LIBCPP_END_NAMESPACE_STD
+#else
+#define NAMESPACE_STD_BEGIN namespace std {
+#define NAMESPACE_STD_END }
+#endif
--- a/src/kernels/miopen_limits.hpp
+++ b/src/kernels/miopen_limits.hpp
@@ -33,8 +33,9 @@
#define MIOPEN_ENABLE_F8_DEVICE_CODE 1
#include "hip_float8.hpp"
+#include "libcxx_compat.hpp"
-namespace std {
+NAMESPACE_STD_BEGIN
template <typename T>
class numeric_limits;
@@ -91,7 +92,7 @@ public:
};
#endif
-} // namespace std
+NAMESPACE_STD_END
#else
--- a/src/kernels/miopen_type_traits.hpp
+++ b/src/kernels/miopen_type_traits.hpp
@@ -26,8 +26,9 @@
#pragma once
#ifdef MIOPEN_DONT_USE_HIP_RUNTIME_HEADERS
+#include "libcxx_compat.hpp"
-namespace std {
+NAMESPACE_STD_BEGIN
template <class T>
struct remove_reference
@@ -140,7 +141,7 @@ struct conditional<false, X, Y>
template <bool predicate, typename X, typename Y>
using conditional_t = typename conditional<predicate, X, Y>::type;
-} // namespace std
+NAMESPACE_STD_END
#else
#include <type_traits> // std::remove_reference, std::remove_cv, is_pointer
--- a/src/kernels/miopen_utility.hpp
+++ b/src/kernels/miopen_utility.hpp
@@ -28,8 +28,9 @@
#ifdef MIOPEN_DONT_USE_HIP_RUNTIME_HEADERS
#include "miopen_type_traits.hpp" // std::remove_reference
+#include "libcxx_compat.hpp"
-namespace std {
+NAMESPACE_STD_BEGIN
template <typename T>
constexpr T&& forward(typename remove_reference<T>::type& t_) noexcept
@@ -43,7 +44,7 @@ constexpr T&& forward(typename remove_reference<T>::type&& t_) noexcept
return static_cast<T&&>(t_);
}
-} // namespace std
+NAMESPACE_STD_END
#else
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -481,6 +481,7 @@ if( MIOPEN_BACKEND MATCHES "OpenCL" OR MIOPEN_BACKEND STREQUAL "HIPOC" OR MIOPEN
kernels/gpr_alloc.inc
kernels/hip_atomic.hpp
kernels/hip_f8_impl.hpp
+ kernels/libcxx_compat.hpp
kernels/hip_float8.hpp
kernels/inst_wrappers.inc
kernels/miopen_cstdint.hpp
|
