Skip to content

Commit

Permalink
Use absolute includes for libcu++
Browse files Browse the repository at this point in the history
Relative includes are difficult for some of our supported configurations. Now that we dropped the libcxx compilation mode we can just move to absolute includes.

This is a precursor to actually flattening the folder structure

Addresses [FEA]: Avoid relative includes in all CCCL headers #641
  • Loading branch information
miscco committed Mar 25, 2024
1 parent 4d49c2f commit 072bb06
Show file tree
Hide file tree
Showing 492 changed files with 3,049 additions and 3,049 deletions.
2 changes: 1 addition & 1 deletion libcudacxx/include/cuda/__cccl_config
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
#ifndef _CUDA__CCCL_CONFIG
#define _CUDA__CCCL_CONFIG

#include "std/detail/libcxx/include/__cccl_config"
#include <cuda/std/detail/libcxx/include/__cccl_config>

#endif // _CUDA__CCCL_CONFIG
12 changes: 6 additions & 6 deletions libcudacxx/include/cuda/annotated_ptr
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
#ifndef _CUDA_ANNOTATED_PTR
#define _CUDA_ANNOTATED_PTR

#include "__cccl_config"
#include <cuda/__cccl_config>

#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
# pragma GCC system_header
Expand All @@ -64,10 +64,10 @@
# pragma system_header
#endif // no system header

#include "barrier"
#include "discard_memory"
#include "std/cstdint"
#include "std/detail/__access_property"
#include <cuda/barrier>
#include <cuda/discard_memory>
#include <cuda/std/cstdint>
#include <cuda/std/detail/__access_property>

_LIBCUDACXX_BEGIN_NAMESPACE_CUDA

Expand Down Expand Up @@ -125,7 +125,7 @@ class access_property {

_LIBCUDACXX_END_NAMESPACE_CUDA

#include "std/detail/__annotated_ptr"
#include <cuda/std/detail/__annotated_ptr>

_LIBCUDACXX_BEGIN_NAMESPACE_CUDA

Expand Down
2 changes: 1 addition & 1 deletion libcudacxx/include/cuda/atomic
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
#ifndef _CUDA_ATOMIC
#define _CUDA_ATOMIC

#include "std/atomic"
#include <cuda/std/atomic>

#endif // _CUDA_ATOMIC
6 changes: 3 additions & 3 deletions libcudacxx/include/cuda/barrier
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#ifndef _CUDA_BARRIER
#define _CUDA_BARRIER

#include "__cccl_config"
#include <cuda/__cccl_config>

#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
# pragma GCC system_header
Expand All @@ -21,8 +21,8 @@
# pragma system_header
#endif // no system header

#include "std/barrier"
#include "ptx"
#include <cuda/std/barrier>
#include <cuda/ptx>

// Forward-declare CUtensorMap for use in cp_async_bulk_tensor_* PTX wrapping
// functions. These functions take a pointer to CUtensorMap, so do not need to
Expand Down
6 changes: 3 additions & 3 deletions libcudacxx/include/cuda/discard_memory
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#ifndef _CUDA_DISCARD_MEMORY
#define _CUDA_DISCARD_MEMORY

#include "__cccl_config"
#include <cuda/__cccl_config>

#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
# pragma GCC system_header
Expand All @@ -21,8 +21,8 @@
# pragma system_header
#endif // no system header

#include "std/cstdint"
#include "ptx"
#include <cuda/std/cstdint>
#include <cuda/ptx>

_LIBCUDACXX_BEGIN_NAMESPACE_CUDA

Expand Down
8 changes: 4 additions & 4 deletions libcudacxx/include/cuda/functional
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
#ifndef _CUDA_FUNCTIONAL_
#define _CUDA_FUNCTIONAL_

#include "__cccl_config"
#include <cuda/__cccl_config>

#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
# pragma GCC system_header
Expand All @@ -65,9 +65,9 @@
# pragma system_header
#endif // no system header

#include "std/type_traits"
#include "std/functional"
#include "std/utility"
#include <cuda/std/type_traits>
#include <cuda/std/functional>
#include <cuda/std/utility>

_LIBCUDACXX_BEGIN_NAMESPACE_CUDA
namespace __detail
Expand Down
2 changes: 1 addition & 1 deletion libcudacxx/include/cuda/latch
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
#ifndef _CUDA_LATCH
#define _CUDA_LATCH

#include "std/latch"
#include <cuda/std/latch>

#endif // _CUDA_LATCH
8 changes: 4 additions & 4 deletions libcudacxx/include/cuda/memory_resource
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ class resource_ref {

#include <cuda_runtime_api.h> // cuda_runtime_api needs to come first

#include "__cccl_config"
#include <cuda/__cccl_config>

#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
# pragma GCC system_header
Expand All @@ -94,9 +94,9 @@ class resource_ref {
# pragma system_header
#endif // no system header

#include "std/concepts"
#include "std/type_traits"
#include "stream_ref"
#include <cuda/std/concepts>
#include <cuda/std/type_traits>
#include <cuda/stream_ref>

#if _CCCL_STD_VER > 2011
_LIBCUDACXX_BEGIN_NAMESPACE_CUDA
Expand Down
8 changes: 4 additions & 4 deletions libcudacxx/include/cuda/pipeline
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
#ifndef _CUDA_PIPELINE
#define _CUDA_PIPELINE

#include "__cccl_config"
#include <cuda/__cccl_config>

#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
# pragma GCC system_header
Expand All @@ -63,9 +63,9 @@
# pragma system_header
#endif // no system header

#include "barrier"
#include "atomic"
#include "std/chrono"
#include <cuda/barrier>
#include <cuda/atomic>
#include <cuda/std/chrono>

_LIBCUDACXX_BEGIN_NAMESPACE_CUDA

Expand Down
8 changes: 4 additions & 4 deletions libcudacxx/include/cuda/ptx
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@
#ifndef _CUDA_PTX
#define _CUDA_PTX

#include "std/detail/__config"
#include <cuda/std/detail/__config>

#include "std/detail/__pragma_push"
#include <cuda/std/detail/__pragma_push>

#include "std/detail/libcxx/include/__cuda/ptx.h"
#include <cuda/std/detail/libcxx/include/__cuda/ptx.h>

#include "std/detail/__pragma_pop"
#include <cuda/std/detail/__pragma_pop>

#endif // _CUDA_PTX
2 changes: 1 addition & 1 deletion libcudacxx/include/cuda/semaphore
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
#ifndef _CUDA_SEMAPHORE
#define _CUDA_SEMAPHORE

#include "std/semaphore"
#include <cuda/std/semaphore>

#endif // _CUDA_SEMAPHORE
8 changes: 4 additions & 4 deletions libcudacxx/include/cuda/std/__algorithm
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@
#ifndef _CUDA_STD_ALGORITHM
#define _CUDA_STD_ALGORITHM

#include "detail/__config"
#include <cuda/std/detail/__config>

#include "detail/__pragma_push"
#include <cuda/std/detail/__pragma_push>

#include "detail/libcxx/include/algorithm"
#include <cuda/std/detail/libcxx/include/algorithm>

#include "detail/__pragma_pop"
#include <cuda/std/detail/__pragma_pop>

#endif // _CUDA_STD_ALGORITHM
8 changes: 4 additions & 4 deletions libcudacxx/include/cuda/std/array
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@
#ifndef _CUDA_STD_ARRAY
#define _CUDA_STD_ARRAY

#include "detail/__config"
#include <cuda/std/detail/__config>

#include "detail/__pragma_push"
#include <cuda/std/detail/__pragma_push>

#include "detail/libcxx/include/array"
#include <cuda/std/detail/libcxx/include/array>

#include "detail/__pragma_pop"
#include <cuda/std/detail/__pragma_pop>

#endif // _CUDA_STD_ARRAY
8 changes: 4 additions & 4 deletions libcudacxx/include/cuda/std/atomic
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@
#ifndef _CUDA_STD_ATOMIC
#define _CUDA_STD_ATOMIC

#include "detail/__config"
#include <cuda/std/detail/__config>

#include "detail/__pragma_push"
#include <cuda/std/detail/__pragma_push>

#include "detail/libcxx/include/atomic"
#include <cuda/std/detail/libcxx/include/atomic>

#include "detail/__pragma_pop"
#include <cuda/std/detail/__pragma_pop>

#endif // _CUDA_STD_ATOMIC
8 changes: 4 additions & 4 deletions libcudacxx/include/cuda/std/barrier
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@
# error "CUDA synchronization primitives are only supported for sm_70 and up."
#endif

#include "detail/__config"
#include <cuda/std/detail/__config>

#include "detail/__pragma_push"
#include <cuda/std/detail/__pragma_push>

#include "detail/libcxx/include/barrier"
#include <cuda/std/detail/libcxx/include/barrier>

#include "detail/__pragma_pop"
#include <cuda/std/detail/__pragma_pop>

#endif // _CUDA_STD_BARRIER
8 changes: 4 additions & 4 deletions libcudacxx/include/cuda/std/bit
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@
#ifndef _CUDA_STD_BIT
#define _CUDA_STD_BIT

#include "detail/__config"
#include <cuda/std/detail/__config>

#include "detail/__pragma_push"
#include <cuda/std/detail/__pragma_push>

#include "detail/libcxx/include/bit"
#include <cuda/std/detail/libcxx/include/bit>

#include "detail/__pragma_pop"
#include <cuda/std/detail/__pragma_pop>

#endif // _CUDA_STD_BIT
8 changes: 4 additions & 4 deletions libcudacxx/include/cuda/std/cassert
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@
#ifndef _CUDA_STD_CASSERT
#define _CUDA_STD_CASSERT

#include "detail/__config"
#include <cuda/std/detail/__config>

#include "detail/__pragma_push"
#include <cuda/std/detail/__pragma_push>

#include "detail/libcxx/include/cassert"
#include <cuda/std/detail/libcxx/include/cassert>

#include "detail/__pragma_pop"
#include <cuda/std/detail/__pragma_pop>

#endif // _CUDA_STD_CASSERT
2 changes: 1 addition & 1 deletion libcudacxx/include/cuda/std/ccomplex
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@
#ifndef _CUDA_STD_CCOMPLEX
#define _CUDA_STD_CCOMPLEX

#include "complex"
#include <cuda/std/complex>

#endif // _CUDA_STD_CCOMPLEX
8 changes: 4 additions & 4 deletions libcudacxx/include/cuda/std/cfloat
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@
#ifndef _CUDA_STD_CFLOAT
#define _CUDA_STD_CFLOAT

#include "detail/__config"
#include <cuda/std/detail/__config>

#include "detail/__pragma_push"
#include <cuda/std/detail/__pragma_push>

#include "detail/libcxx/include/cfloat"
#include <cuda/std/detail/libcxx/include/cfloat>

#include "detail/__pragma_pop"
#include <cuda/std/detail/__pragma_pop>

#endif // _CUDA_STD_CFLOAT
8 changes: 4 additions & 4 deletions libcudacxx/include/cuda/std/chrono
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@
#ifndef _CUDA_STD_CHRONO
#define _CUDA_STD_CHRONO

#include "detail/__config"
#include <cuda/std/detail/__config>

#include "detail/__pragma_push"
#include <cuda/std/detail/__pragma_push>

#include "detail/libcxx/include/chrono"
#include <cuda/std/detail/libcxx/include/chrono>

#include "detail/__pragma_pop"
#include <cuda/std/detail/__pragma_pop>

#endif // _CUDA_STD_CHRONO
8 changes: 4 additions & 4 deletions libcudacxx/include/cuda/std/climits
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@
#ifndef _CUDA_STD_CLIMITS
#define _CUDA_STD_CLIMITS

#include "detail/__config"
#include <cuda/std/detail/__config>

#include "detail/__pragma_push"
#include <cuda/std/detail/__pragma_push>

#include "detail/libcxx/include/climits"
#include <cuda/std/detail/libcxx/include/climits>

#include "detail/__pragma_pop"
#include <cuda/std/detail/__pragma_pop>

#endif // _CUDA_STD_CLIMITS
8 changes: 4 additions & 4 deletions libcudacxx/include/cuda/std/cmath
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@
#ifndef _CUDA_STD_CMATH
#define _CUDA_STD_CMATH

#include "detail/__config"
#include <cuda/std/detail/__config>

#include "detail/__pragma_push"
#include <cuda/std/detail/__pragma_push>

#include "detail/libcxx/include/cmath"
#include <cuda/std/detail/libcxx/include/cmath>

#include "detail/__pragma_pop"
#include <cuda/std/detail/__pragma_pop>

#endif // _CUDA_STD_CMATH
8 changes: 4 additions & 4 deletions libcudacxx/include/cuda/std/complex
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@
#ifndef _CUDA_STD_COMPLEX
#define _CUDA_STD_COMPLEX

#include "detail/__config"
#include <cuda/std/detail/__config>

#include "detail/__pragma_push"
#include <cuda/std/detail/__pragma_push>

#include "detail/libcxx/include/complex"
#include <cuda/std/detail/libcxx/include/complex>

#include "detail/__pragma_pop"
#include <cuda/std/detail/__pragma_pop>

#endif // _CUDA_STD_COMPLEX
8 changes: 4 additions & 4 deletions libcudacxx/include/cuda/std/concepts
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@
#ifndef _CUDA_STD_CONCEPTS
#define _CUDA_STD_CONCEPTS

#include "detail/__config"
#include <cuda/std/detail/__config>

#include "detail/__pragma_push"
#include <cuda/std/detail/__pragma_push>

#include "detail/libcxx/include/concepts"
#include <cuda/std/detail/libcxx/include/concepts>

#include "detail/__pragma_pop"
#include <cuda/std/detail/__pragma_pop>

#endif // _CUDA_STD_CONCEPTS
Loading

0 comments on commit 072bb06

Please sign in to comment.