Skip to content

Commit 82d70a7

Browse files
misccomiscco
authored
Rename some of the namespace macros (#6549)
We have historically bad naming conventions for the namespace macros There is `NAMESPACE_EXECUTION` which expands to `::cuda::std::execution` `NAMESPACE_CUDA_EXECUTION` which expands to `::cuda::execution` To make it clear what is what put the CUDA_STD in the namespaces that contain it
1 parent 4b10fd2 commit 82d70a7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+133
-134
lines changed

‎.clang-format‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -191,14 +191,14 @@ StatementMacros: [
191191
'_CCCL_END_NAMESPACE_CUDA_STD',
192192
'_CCCL_BEGIN_NAMESPACE_CUDA_STD_NOVERSION',
193193
'_CCCL_END_NAMESPACE_CUDA_STD_NOVERSION',
194-
'_CCCL_BEGIN_NAMESPACE_RANGES',
195-
'_CCCL_END_NAMESPACE_RANGES',
196-
'_CCCL_BEGIN_NAMESPACE_RANGES_ABI',
197-
'_CCCL_END_NAMESPACE_RANGES_ABI',
194+
'_CCCL_BEGIN_NAMESPACE_CUDA_STD_RANGES',
195+
'_CCCL_END_NAMESPACE_CUDA_STD_RANGES',
196+
'_CCCL_BEGIN_NAMESPACE_CUDA_STD_RANGES_ABI',
197+
'_CCCL_END_NAMESPACE_CUDA_STD_RANGES_ABI',
198+
'_CCCL_BEGIN_NAMESPACE_CUDA_STD_VIEWS',
199+
'_CCCL_END_NAMESPACE_CUDA_STD_VIEWS',
198200
'_CCCL_BEGIN_NAMESPACE_CPO',
199201
'_CCCL_END_NAMESPACE_CPO',
200-
'_CCCL_BEGIN_NAMESPACE_VIEWS',
201-
'_CCCL_END_NAMESPACE_VIEWS',
202202
]
203203
TabWidth: 2
204204
UseTab: Never

‎libcudacxx/include/cuda/std/__algorithm/in_fun_result.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
#include <cuda/std/__cccl/prologue.h>
2727

28-
_CCCL_BEGIN_NAMESPACE_RANGES
28+
_CCCL_BEGIN_NAMESPACE_CUDA_STD_RANGES
2929

3030
template <class _InIter1, class _Func1>
3131
struct in_fun_result
@@ -48,7 +48,7 @@ struct in_fun_result
4848
}
4949
};
5050

51-
_CCCL_END_NAMESPACE_RANGES
51+
_CCCL_END_NAMESPACE_CUDA_STD_RANGES
5252

5353
#include <cuda/std/__cccl/epilogue.h>
5454

‎libcudacxx/include/cuda/std/__algorithm/ranges_for_each.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232

3333
#include <cuda/std/__cccl/prologue.h>
3434

35-
_CCCL_BEGIN_NAMESPACE_RANGES
35+
_CCCL_BEGIN_NAMESPACE_CUDA_STD_RANGES
3636

3737
template <class _Iter, class _Func>
3838
using for_each_result = in_fun_result<_Iter, _Func>;
@@ -77,7 +77,7 @@ inline namespace __cpo
7777
_CCCL_GLOBAL_CONSTANT auto for_each = __for_each::__fn{};
7878
} // namespace __cpo
7979

80-
_CCCL_END_NAMESPACE_RANGES
80+
_CCCL_END_NAMESPACE_CUDA_STD_RANGES
8181

8282
#include <cuda/std/__cccl/epilogue.h>
8383

‎libcudacxx/include/cuda/std/__algorithm/ranges_for_each_n.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232

3333
#include <cuda/std/__cccl/prologue.h>
3434

35-
_CCCL_BEGIN_NAMESPACE_RANGES
35+
_CCCL_BEGIN_NAMESPACE_CUDA_STD_RANGES
3636

3737
template <class _Iter, class _Func>
3838
using for_each_n_result = in_fun_result<_Iter, _Func>;
@@ -61,7 +61,7 @@ inline namespace __cpo
6161
_CCCL_GLOBAL_CONSTANT auto for_each_n = __for_each_n::__fn{};
6262
} // namespace __cpo
6363

64-
_CCCL_END_NAMESPACE_RANGES
64+
_CCCL_END_NAMESPACE_CUDA_STD_RANGES
6565

6666
#include <cuda/std/__cccl/epilogue.h>
6767

‎libcudacxx/include/cuda/std/__algorithm/ranges_iterator_concept.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
#include <cuda/std/__cccl/prologue.h>
2828

29-
_CCCL_BEGIN_NAMESPACE_RANGES
29+
_CCCL_BEGIN_NAMESPACE_CUDA_STD_RANGES
3030

3131
template <class _IterMaybeQualified>
3232
_CCCL_API constexpr auto __get_iterator_concept()
@@ -58,7 +58,7 @@ _CCCL_API constexpr auto __get_iterator_concept()
5858
template <class _Iter>
5959
using __iterator_concept = decltype(__get_iterator_concept<_Iter>());
6060

61-
_CCCL_END_NAMESPACE_RANGES
61+
_CCCL_END_NAMESPACE_CUDA_STD_RANGES
6262

6363
#include <cuda/std/__cccl/epilogue.h>
6464

‎libcudacxx/include/cuda/std/__algorithm/ranges_min.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333

3434
#include <cuda/std/__cccl/prologue.h>
3535

36-
_CCCL_BEGIN_NAMESPACE_RANGES
36+
_CCCL_BEGIN_NAMESPACE_CUDA_STD_RANGES
3737
_CCCL_BEGIN_NAMESPACE_CPO(__min)
3838

3939
struct __fn
@@ -91,7 +91,7 @@ inline namespace __cpo
9191
_CCCL_GLOBAL_CONSTANT auto min = __min::__fn{};
9292
} // namespace __cpo
9393

94-
_CCCL_END_NAMESPACE_RANGES
94+
_CCCL_END_NAMESPACE_CUDA_STD_RANGES
9595

9696
#include <cuda/std/__cccl/epilogue.h>
9797

‎libcudacxx/include/cuda/std/__algorithm/ranges_min_element.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333

3434
#include <cuda/std/__cccl/prologue.h>
3535

36-
_CCCL_BEGIN_NAMESPACE_RANGES
36+
_CCCL_BEGIN_NAMESPACE_CUDA_STD_RANGES
3737

3838
_CCCL_BEGIN_NAMESPACE_CPO(__min_element)
3939
struct __fn
@@ -61,7 +61,7 @@ inline namespace __cpo
6161
_CCCL_GLOBAL_CONSTANT auto min_element = __min_element::__fn{};
6262
} // namespace __cpo
6363

64-
_CCCL_END_NAMESPACE_RANGES
64+
_CCCL_END_NAMESPACE_CUDA_STD_RANGES
6565

6666
#include <cuda/std/__cccl/epilogue.h>
6767

‎libcudacxx/include/cuda/std/__concepts/swappable.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
_CCCL_BEGIN_NV_DIAG_SUPPRESS(461) // nonstandard cast to array type ignored
4444
#endif // _CCCL_COMPILER(MSVC)
4545

46-
_CCCL_BEGIN_NAMESPACE_RANGES
46+
_CCCL_BEGIN_NAMESPACE_CUDA_STD_RANGES
4747

4848
// [concept.swappable]
4949

@@ -159,7 +159,7 @@ inline namespace __cpo
159159
{
160160
_CCCL_GLOBAL_CONSTANT auto swap = __swap::__fn{};
161161
} // namespace __cpo
162-
_CCCL_END_NAMESPACE_RANGES
162+
_CCCL_END_NAMESPACE_CUDA_STD_RANGES
163163

164164
_CCCL_BEGIN_NAMESPACE_CUDA_STD
165165

‎libcudacxx/include/cuda/std/__execution/env.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@
9595

9696
#include <cuda/std/__cccl/prologue.h>
9797

98-
_CCCL_BEGIN_NAMESPACE_EXECUTION
98+
_CCCL_BEGIN_NAMESPACE_CUDA_STD_EXECUTION
9999

100100
namespace __detail
101101
{
@@ -448,7 +448,7 @@ using __query_result_or_t _CCCL_NODEBUG_ALIAS = decltype(__query_or(
448448
::cuda::std::declval<_Default>(),
449449
::cuda::std::declval<_Args>()...));
450450

451-
_CCCL_END_NAMESPACE_EXECUTION
451+
_CCCL_END_NAMESPACE_CUDA_STD_EXECUTION
452452

453453
#include <cuda/std/__cccl/epilogue.h>
454454

‎libcudacxx/include/cuda/std/__execution/policy.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
#include <cuda/std/__cccl/prologue.h>
2727

28-
_CCCL_BEGIN_NAMESPACE_EXECUTION
28+
_CCCL_BEGIN_NAMESPACE_CUDA_STD_EXECUTION
2929

3030
enum class __execution_policy : uint32_t
3131
{
@@ -81,7 +81,7 @@ struct unsequenced_policy : public __policy<__execution_policy::__unsequenced>
8181
{};
8282
_CCCL_GLOBAL_CONSTANT unsequenced_policy unseq{};
8383

84-
_CCCL_END_NAMESPACE_EXECUTION
84+
_CCCL_END_NAMESPACE_CUDA_STD_EXECUTION
8585

8686
#include <cuda/std/__cccl/epilogue.h>
8787

0 commit comments

Comments
 (0)