Skip to content

Commit

Permalink
Fix nvc++ preprocessor issue around #pragma GCC system_header
Browse files Browse the repository at this point in the history 
nvc++ breaks if we put `#pragma GCC system_header` into a macro. As we really want that macro for compilers that are different than gcc we work around this by special casing nvc++ in the individual header files
  • Loading branch information
@miscco
miscco committed Oct 17, 2023
1 parent 2370b3b commit 64a5f56
Show file tree
Hide file tree
Showing 1,369 changed files with 5,497 additions and 7 deletions.
4 changes: 4 additions & 0 deletions cub/cub/agent/agent_adjacent_difference.cuh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,11 @@

#include "../config.cuh"

#if defined(_CCCL_COMPILER_NVHPC) && defined(_CCCL_USE_IMPLICIT_SYSTEM_DEADER)
#pragma GCC system_header
#else // ^^^ _CCCL_COMPILER_NVHPC ^^^ / vvv !_CCCL_COMPILER_NVHPC vvv
_CCCL_IMPLICIT_SYSTEM_HEADER
#endif // !_CCCL_COMPILER_NVHPC

#include "../util_type.cuh"
#include "../util_namespace.cuh"
Expand Down
4 changes: 4 additions & 0 deletions cub/cub/agent/agent_batch_memcpy.cuh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,11 @@

#include "../config.cuh"

#if defined(_CCCL_COMPILER_NVHPC) && defined(_CCCL_USE_IMPLICIT_SYSTEM_DEADER)
#pragma GCC system_header
#else // ^^^ _CCCL_COMPILER_NVHPC ^^^ / vvv !_CCCL_COMPILER_NVHPC vvv
_CCCL_IMPLICIT_SYSTEM_HEADER
#endif // !_CCCL_COMPILER_NVHPC

#include <cub/agent/single_pass_scan_operators.cuh>
#include <cub/block/block_exchange.cuh>
Expand Down
4 changes: 4 additions & 0 deletions cub/cub/agent/agent_histogram.cuh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,11 @@

#include "../config.cuh"

#if defined(_CCCL_COMPILER_NVHPC) && defined(_CCCL_USE_IMPLICIT_SYSTEM_DEADER)
#pragma GCC system_header
#else // ^^^ _CCCL_COMPILER_NVHPC ^^^ / vvv !_CCCL_COMPILER_NVHPC vvv
_CCCL_IMPLICIT_SYSTEM_HEADER
#endif // !_CCCL_COMPILER_NVHPC

#include <iterator>

Expand Down
4 changes: 4 additions & 0 deletions cub/cub/agent/agent_merge_sort.cuh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,11 @@

#include "../config.cuh"

#if defined(_CCCL_COMPILER_NVHPC) && defined(_CCCL_USE_IMPLICIT_SYSTEM_DEADER)
#pragma GCC system_header
#else // ^^^ _CCCL_COMPILER_NVHPC ^^^ / vvv !_CCCL_COMPILER_NVHPC vvv
_CCCL_IMPLICIT_SYSTEM_HEADER
#endif // !_CCCL_COMPILER_NVHPC

#include "../util_type.cuh"
#include "../util_namespace.cuh"
Expand Down
4 changes: 4 additions & 0 deletions cub/cub/agent/agent_radix_sort_downsweep.cuh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,11 @@

#include "../config.cuh"

#if defined(_CCCL_COMPILER_NVHPC) && defined(_CCCL_USE_IMPLICIT_SYSTEM_DEADER)
#pragma GCC system_header
#else // ^^^ _CCCL_COMPILER_NVHPC ^^^ / vvv !_CCCL_COMPILER_NVHPC vvv
_CCCL_IMPLICIT_SYSTEM_HEADER
#endif // !_CCCL_COMPILER_NVHPC

#include <stdint.h>
#include <type_traits>
Expand Down
4 changes: 4 additions & 0 deletions cub/cub/agent/agent_radix_sort_histogram.cuh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,11 @@

#include "../config.cuh"

#if defined(_CCCL_COMPILER_NVHPC) && defined(_CCCL_USE_IMPLICIT_SYSTEM_DEADER)
#pragma GCC system_header
#else // ^^^ _CCCL_COMPILER_NVHPC ^^^ / vvv !_CCCL_COMPILER_NVHPC vvv
_CCCL_IMPLICIT_SYSTEM_HEADER
#endif // !_CCCL_COMPILER_NVHPC

#include "../block/block_load.cuh"
#include "../block/radix_rank_sort_operations.cuh"
Expand Down
4 changes: 4 additions & 0 deletions cub/cub/agent/agent_radix_sort_onesweep.cuh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,11 @@

#include "../config.cuh"

#if defined(_CCCL_COMPILER_NVHPC) && defined(_CCCL_USE_IMPLICIT_SYSTEM_DEADER)
#pragma GCC system_header
#else // ^^^ _CCCL_COMPILER_NVHPC ^^^ / vvv !_CCCL_COMPILER_NVHPC vvv
_CCCL_IMPLICIT_SYSTEM_HEADER
#endif // !_CCCL_COMPILER_NVHPC

#include "../block/block_radix_rank.cuh"
#include "../block/radix_rank_sort_operations.cuh"
Expand Down
4 changes: 4 additions & 0 deletions cub/cub/agent/agent_radix_sort_upsweep.cuh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,11 @@

#include "../config.cuh"

#if defined(_CCCL_COMPILER_NVHPC) && defined(_CCCL_USE_IMPLICIT_SYSTEM_DEADER)
#pragma GCC system_header
#else // ^^^ _CCCL_COMPILER_NVHPC ^^^ / vvv !_CCCL_COMPILER_NVHPC vvv
_CCCL_IMPLICIT_SYSTEM_HEADER
#endif // !_CCCL_COMPILER_NVHPC

#include "../thread/thread_reduce.cuh"
#include "../thread/thread_load.cuh"
Expand Down
4 changes: 4 additions & 0 deletions cub/cub/agent/agent_reduce.cuh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,11 @@

#include "../config.cuh"

#if defined(_CCCL_COMPILER_NVHPC) && defined(_CCCL_USE_IMPLICIT_SYSTEM_DEADER)
#pragma GCC system_header
#else // ^^^ _CCCL_COMPILER_NVHPC ^^^ / vvv !_CCCL_COMPILER_NVHPC vvv
_CCCL_IMPLICIT_SYSTEM_HEADER
#endif // !_CCCL_COMPILER_NVHPC

#include <iterator>

Expand Down
4 changes: 4 additions & 0 deletions cub/cub/agent/agent_reduce_by_key.cuh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,11 @@

#include "../config.cuh"

#if defined(_CCCL_COMPILER_NVHPC) && defined(_CCCL_USE_IMPLICIT_SYSTEM_DEADER)
#pragma GCC system_header
#else // ^^^ _CCCL_COMPILER_NVHPC ^^^ / vvv !_CCCL_COMPILER_NVHPC vvv
_CCCL_IMPLICIT_SYSTEM_HEADER
#endif // !_CCCL_COMPILER_NVHPC

#include <cub/agent/single_pass_scan_operators.cuh>
#include <cub/block/block_discontinuity.cuh>
Expand Down
4 changes: 4 additions & 0 deletions cub/cub/agent/agent_rle.cuh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,11 @@

#include "../config.cuh"

#if defined(_CCCL_COMPILER_NVHPC) && defined(_CCCL_USE_IMPLICIT_SYSTEM_DEADER)
#pragma GCC system_header
#else // ^^^ _CCCL_COMPILER_NVHPC ^^^ / vvv !_CCCL_COMPILER_NVHPC vvv
_CCCL_IMPLICIT_SYSTEM_HEADER
#endif // !_CCCL_COMPILER_NVHPC

#include <iterator>

Expand Down
4 changes: 4 additions & 0 deletions cub/cub/agent/agent_scan.cuh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,11 @@

#include "../config.cuh"

#if defined(_CCCL_COMPILER_NVHPC) && defined(_CCCL_USE_IMPLICIT_SYSTEM_DEADER)
#pragma GCC system_header
#else // ^^^ _CCCL_COMPILER_NVHPC ^^^ / vvv !_CCCL_COMPILER_NVHPC vvv
_CCCL_IMPLICIT_SYSTEM_HEADER
#endif // !_CCCL_COMPILER_NVHPC

#include <iterator>

Expand Down
4 changes: 4 additions & 0 deletions cub/cub/agent/agent_scan_by_key.cuh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,11 @@

#include "../config.cuh"

#if defined(_CCCL_COMPILER_NVHPC) && defined(_CCCL_USE_IMPLICIT_SYSTEM_DEADER)
#pragma GCC system_header
#else // ^^^ _CCCL_COMPILER_NVHPC ^^^ / vvv !_CCCL_COMPILER_NVHPC vvv
_CCCL_IMPLICIT_SYSTEM_HEADER
#endif // !_CCCL_COMPILER_NVHPC

#include <cub/agent/single_pass_scan_operators.cuh>
#include <cub/block/block_discontinuity.cuh>
Expand Down
4 changes: 4 additions & 0 deletions cub/cub/agent/agent_segment_fixup.cuh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,11 @@

#include "../config.cuh"

#if defined(_CCCL_COMPILER_NVHPC) && defined(_CCCL_USE_IMPLICIT_SYSTEM_DEADER)
#pragma GCC system_header
#else // ^^^ _CCCL_COMPILER_NVHPC ^^^ / vvv !_CCCL_COMPILER_NVHPC vvv
_CCCL_IMPLICIT_SYSTEM_HEADER
#endif // !_CCCL_COMPILER_NVHPC

#include <iterator>

Expand Down
4 changes: 4 additions & 0 deletions cub/cub/agent/agent_segmented_radix_sort.cuh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,11 @@

#include "../config.cuh"

#if defined(_CCCL_COMPILER_NVHPC) && defined(_CCCL_USE_IMPLICIT_SYSTEM_DEADER)
#pragma GCC system_header
#else // ^^^ _CCCL_COMPILER_NVHPC ^^^ / vvv !_CCCL_COMPILER_NVHPC vvv
_CCCL_IMPLICIT_SYSTEM_HEADER
#endif // !_CCCL_COMPILER_NVHPC

#include <cub/agent/agent_radix_sort_downsweep.cuh>
#include <cub/agent/agent_radix_sort_upsweep.cuh>
Expand Down
4 changes: 4 additions & 0 deletions cub/cub/agent/agent_select_if.cuh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,11 @@

#include "../config.cuh"

#if defined(_CCCL_COMPILER_NVHPC) && defined(_CCCL_USE_IMPLICIT_SYSTEM_DEADER)
#pragma GCC system_header
#else // ^^^ _CCCL_COMPILER_NVHPC ^^^ / vvv !_CCCL_COMPILER_NVHPC vvv
_CCCL_IMPLICIT_SYSTEM_HEADER
#endif // !_CCCL_COMPILER_NVHPC

#include <iterator>

Expand Down
4 changes: 4 additions & 0 deletions cub/cub/agent/agent_spmv_orig.cuh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,11 @@

#include "../config.cuh"

#if defined(_CCCL_COMPILER_NVHPC) && defined(_CCCL_USE_IMPLICIT_SYSTEM_DEADER)
#pragma GCC system_header
#else // ^^^ _CCCL_COMPILER_NVHPC ^^^ / vvv !_CCCL_COMPILER_NVHPC vvv
_CCCL_IMPLICIT_SYSTEM_HEADER
#endif // !_CCCL_COMPILER_NVHPC

#include <iterator>

Expand Down
4 changes: 4 additions & 0 deletions cub/cub/agent/agent_sub_warp_merge_sort.cuh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,11 @@

#include "../config.cuh"

#if defined(_CCCL_COMPILER_NVHPC) && defined(_CCCL_USE_IMPLICIT_SYSTEM_DEADER)
#pragma GCC system_header
#else // ^^^ _CCCL_COMPILER_NVHPC ^^^ / vvv !_CCCL_COMPILER_NVHPC vvv
_CCCL_IMPLICIT_SYSTEM_HEADER
#endif // !_CCCL_COMPILER_NVHPC

#include <cub/block/radix_rank_sort_operations.cuh>
#include <cub/util_type.cuh>
Expand Down
4 changes: 4 additions & 0 deletions cub/cub/agent/agent_three_way_partition.cuh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,11 @@

#include "../config.cuh"

#if defined(_CCCL_COMPILER_NVHPC) && defined(_CCCL_USE_IMPLICIT_SYSTEM_DEADER)
#pragma GCC system_header
#else // ^^^ _CCCL_COMPILER_NVHPC ^^^ / vvv !_CCCL_COMPILER_NVHPC vvv
_CCCL_IMPLICIT_SYSTEM_HEADER
#endif // !_CCCL_COMPILER_NVHPC

#include <iterator>
#include <type_traits>
Expand Down
4 changes: 4 additions & 0 deletions cub/cub/agent/agent_unique_by_key.cuh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,11 @@

#include "../config.cuh"

#if defined(_CCCL_COMPILER_NVHPC) && defined(_CCCL_USE_IMPLICIT_SYSTEM_DEADER)
#pragma GCC system_header
#else // ^^^ _CCCL_COMPILER_NVHPC ^^^ / vvv !_CCCL_COMPILER_NVHPC vvv
_CCCL_IMPLICIT_SYSTEM_HEADER
#endif // !_CCCL_COMPILER_NVHPC

#include <iterator>
#include <type_traits>
Expand Down
4 changes: 4 additions & 0 deletions cub/cub/agent/single_pass_scan_operators.cuh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,11 @@

#include "../config.cuh"

#if defined(_CCCL_COMPILER_NVHPC) && defined(_CCCL_USE_IMPLICIT_SYSTEM_DEADER)
#pragma GCC system_header
#else // ^^^ _CCCL_COMPILER_NVHPC ^^^ / vvv !_CCCL_COMPILER_NVHPC vvv
_CCCL_IMPLICIT_SYSTEM_HEADER
#endif // !_CCCL_COMPILER_NVHPC

#include <iterator>

Expand Down
4 changes: 4 additions & 0 deletions cub/cub/block/block_adjacent_difference.cuh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,11 @@

#include "../config.cuh"

#if defined(_CCCL_COMPILER_NVHPC) && defined(_CCCL_USE_IMPLICIT_SYSTEM_DEADER)
#pragma GCC system_header
#else // ^^^ _CCCL_COMPILER_NVHPC ^^^ / vvv !_CCCL_COMPILER_NVHPC vvv
_CCCL_IMPLICIT_SYSTEM_HEADER
#endif // !_CCCL_COMPILER_NVHPC

#include "../util_type.cuh"
#include "../util_ptx.cuh"
Expand Down
4 changes: 4 additions & 0 deletions cub/cub/block/block_discontinuity.cuh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,11 @@

#include "../config.cuh"

#if defined(_CCCL_COMPILER_NVHPC) && defined(_CCCL_USE_IMPLICIT_SYSTEM_DEADER)
#pragma GCC system_header
#else // ^^^ _CCCL_COMPILER_NVHPC ^^^ / vvv !_CCCL_COMPILER_NVHPC vvv
_CCCL_IMPLICIT_SYSTEM_HEADER
#endif // !_CCCL_COMPILER_NVHPC

#include "../util_type.cuh"
#include "../util_ptx.cuh"
Expand Down
4 changes: 4 additions & 0 deletions cub/cub/block/block_exchange.cuh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,11 @@

#include "../config.cuh"

#if defined(_CCCL_COMPILER_NVHPC) && defined(_CCCL_USE_IMPLICIT_SYSTEM_DEADER)
#pragma GCC system_header
#else // ^^^ _CCCL_COMPILER_NVHPC ^^^ / vvv !_CCCL_COMPILER_NVHPC vvv
_CCCL_IMPLICIT_SYSTEM_HEADER
#endif // !_CCCL_COMPILER_NVHPC

#include <cub/detail/uninitialized_copy.cuh>
#include <cub/util_ptx.cuh>
Expand Down
4 changes: 4 additions & 0 deletions cub/cub/block/block_histogram.cuh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,11 @@

#include "../config.cuh"

#if defined(_CCCL_COMPILER_NVHPC) && defined(_CCCL_USE_IMPLICIT_SYSTEM_DEADER)
#pragma GCC system_header
#else // ^^^ _CCCL_COMPILER_NVHPC ^^^ / vvv !_CCCL_COMPILER_NVHPC vvv
_CCCL_IMPLICIT_SYSTEM_HEADER
#endif // !_CCCL_COMPILER_NVHPC

#include "specializations/block_histogram_sort.cuh"
#include "specializations/block_histogram_atomic.cuh"
Expand Down
4 changes: 4 additions & 0 deletions cub/cub/block/block_load.cuh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,11 @@

#include "../config.cuh"

#if defined(_CCCL_COMPILER_NVHPC) && defined(_CCCL_USE_IMPLICIT_SYSTEM_DEADER)
#pragma GCC system_header
#else // ^^^ _CCCL_COMPILER_NVHPC ^^^ / vvv !_CCCL_COMPILER_NVHPC vvv
_CCCL_IMPLICIT_SYSTEM_HEADER
#endif // !_CCCL_COMPILER_NVHPC

#include <iterator>
#include <type_traits>
Expand Down
4 changes: 4 additions & 0 deletions cub/cub/block/block_merge_sort.cuh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,11 @@

#include "../config.cuh"

#if defined(_CCCL_COMPILER_NVHPC) && defined(_CCCL_USE_IMPLICIT_SYSTEM_DEADER)
#pragma GCC system_header
#else // ^^^ _CCCL_COMPILER_NVHPC ^^^ / vvv !_CCCL_COMPILER_NVHPC vvv
_CCCL_IMPLICIT_SYSTEM_HEADER
#endif // !_CCCL_COMPILER_NVHPC

#include <cub/thread/thread_sort.cuh>
#include <cub/util_math.cuh>
Expand Down
4 changes: 4 additions & 0 deletions cub/cub/block/block_radix_rank.cuh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,11 @@

#include "../config.cuh"

#if defined(_CCCL_COMPILER_NVHPC) && defined(_CCCL_USE_IMPLICIT_SYSTEM_DEADER)
#pragma GCC system_header
#else // ^^^ _CCCL_COMPILER_NVHPC ^^^ / vvv !_CCCL_COMPILER_NVHPC vvv
_CCCL_IMPLICIT_SYSTEM_HEADER
#endif // !_CCCL_COMPILER_NVHPC

#include <stdint.h>

Expand Down
4 changes: 4 additions & 0 deletions cub/cub/block/block_radix_sort.cuh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,11 @@

#include "../config.cuh"

#if defined(_CCCL_COMPILER_NVHPC) && defined(_CCCL_USE_IMPLICIT_SYSTEM_DEADER)
#pragma GCC system_header
#else // ^^^ _CCCL_COMPILER_NVHPC ^^^ / vvv !_CCCL_COMPILER_NVHPC vvv
_CCCL_IMPLICIT_SYSTEM_HEADER
#endif // !_CCCL_COMPILER_NVHPC

#include "block_exchange.cuh"
#include "block_radix_rank.cuh"
Expand Down
4 changes: 4 additions & 0 deletions cub/cub/block/block_raking_layout.cuh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,11 @@

#include "../config.cuh"

#if defined(_CCCL_COMPILER_NVHPC) && defined(_CCCL_USE_IMPLICIT_SYSTEM_DEADER)
#pragma GCC system_header
#else // ^^^ _CCCL_COMPILER_NVHPC ^^^ / vvv !_CCCL_COMPILER_NVHPC vvv
_CCCL_IMPLICIT_SYSTEM_HEADER
#endif // !_CCCL_COMPILER_NVHPC

#include "../util_type.cuh"

Expand Down
4 changes: 4 additions & 0 deletions cub/cub/block/block_reduce.cuh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,11 @@

#include "../config.cuh"

#if defined(_CCCL_COMPILER_NVHPC) && defined(_CCCL_USE_IMPLICIT_SYSTEM_DEADER)
#pragma GCC system_header
#else // ^^^ _CCCL_COMPILER_NVHPC ^^^ / vvv !_CCCL_COMPILER_NVHPC vvv
_CCCL_IMPLICIT_SYSTEM_HEADER
#endif // !_CCCL_COMPILER_NVHPC

#include "specializations/block_reduce_raking.cuh"
#include "specializations/block_reduce_raking_commutative_only.cuh"
Expand Down
4 changes: 4 additions & 0 deletions cub/cub/block/block_run_length_decode.cuh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,11 @@

#include "../config.cuh"

#if defined(_CCCL_COMPILER_NVHPC) && defined(_CCCL_USE_IMPLICIT_SYSTEM_DEADER)
#pragma GCC system_header
#else // ^^^ _CCCL_COMPILER_NVHPC ^^^ / vvv !_CCCL_COMPILER_NVHPC vvv
_CCCL_IMPLICIT_SYSTEM_HEADER
#endif // !_CCCL_COMPILER_NVHPC

#include "../thread/thread_search.cuh"
#include "../util_math.cuh"
Expand Down
4 changes: 4 additions & 0 deletions cub/cub/block/block_scan.cuh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,11 @@

#include "../config.cuh"

#if defined(_CCCL_COMPILER_NVHPC) && defined(_CCCL_USE_IMPLICIT_SYSTEM_DEADER)
#pragma GCC system_header
#else // ^^^ _CCCL_COMPILER_NVHPC ^^^ / vvv !_CCCL_COMPILER_NVHPC vvv
_CCCL_IMPLICIT_SYSTEM_HEADER
#endif // !_CCCL_COMPILER_NVHPC

#include "specializations/block_scan_raking.cuh"
#include "specializations/block_scan_warp_scans.cuh"
Expand Down
Loading

0 comments on commit 64a5f56

Please sign in to comment.