Skip to content

Replace _CCCL_HAS_CUDA_COMPILER() with _CCCL_CUDA_COMPILATION() #6399

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Replace _CCCL_HAS_CUDA_COMPILER() with _CCCL_CUDA_COMPILATION() #6399

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cub/cub/util_device.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -754,6 +754,6 @@ private:
};
CUB_NAMESPACE_END

#if _CCCL_HAS_CUDA_COMPILER() && !_CCCL_COMPILER(NVRTC)
#if _CCCL_CUDA_COMPILATION() && !_CCCL_COMPILER(NVRTC)
# include <cub/detail/launcher/cuda_runtime.cuh> // to complete the definition of TripleChevronFactory
#endif // _CCCL_HAS_CUDA_COMPILER() && !_CCCL_COMPILER(NVRTC)
#endif // _CCCL_CUDA_COMPILATION() && !_CCCL_COMPILER(NVRTC)
13 changes: 7 additions & 6 deletions cudax/include/cuda/experimental/__container/async_buffer.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@
# pragma system_header
#endif // no system header

#if _CCCL_HAS_CUDA_COMPILER()
#if _CCCL_CUDA_COMPILATION()
# include <cub/device/device_transform.cuh>
#endif // _CCCL_HAS_CUDA_COMPILER()
#endif // _CCCL_CUDA_COMPILATION()

#include <cuda/__memory_resource/any_resource.h>
#include <cuda/__memory_resource/get_memory_resource.h>
Expand Down Expand Up @@ -604,12 +604,13 @@ __fill_n(cuda::stream_ref __stream, _Tp* __first, ::cuda::std::size_t __count, c
}
else
{
#if _CCCL_HAS_CUDA_COMPILER()
#if _CCCL_CUDA_COMPILATION()
::cuda::experimental::__ensure_current_device __guard(__stream);
::cub::DeviceTransform::Fill(__first, __count, __value, __stream.get());
#else
static_assert(0, "CUDA compiler is required to initialize an async_buffer with elements larger than 4 bytes");
#endif
#else // ^^^ _CCCL_CUDA_COMPILATION() ^^^ / vvv !_CCCL_CUDA_COMPILATION() vvv
static_assert(sizeof(_Tp) <= 4,
"CUDA compiler is required to initialize an async_buffer with elements larger than 4 bytes");
#endif // ^^^ !_CCCL_CUDA_COMPILATION() ^^^
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions libcudacxx/codegen/generators/header.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ inline void FormatHeader(std::ostream& out)

_CCCL_BEGIN_NAMESPACE_CUDA_STD

#if _CCCL_HAS_CUDA_COMPILER()
#if _CCCL_CUDA_COMPILATION()

extern "C" _CCCL_DEVICE void __atomic_cas_128b_unsupported_before_SM_90();
extern "C" _CCCL_DEVICE void __atomic_exchange_128b_unsupported_before_SM_90();
Expand All @@ -72,7 +72,7 @@ extern "C" _CCCL_DEVICE void __atomic_ldst_128b_unsupported_before_SM_70();
inline void FormatTail(std::ostream& out)
{
std::string tail = R"XXX(
#endif // _CCCL_HAS_CUDA_COMPILER()
#endif // _CCCL_CUDA_COMPILATION()

_CCCL_END_NAMESPACE_CUDA_STD

Expand Down
4 changes: 2 additions & 2 deletions libcudacxx/include/cuda/__memcpy_async/memcpy_async.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
# pragma system_header
#endif // no system header

#if _CCCL_HAS_CUDA_COMPILER()
#if _CCCL_CUDA_COMPILATION()

# include <cuda/__barrier/async_contract_fulfillment.h>
# include <cuda/__barrier/barrier.h>
Expand Down Expand Up @@ -174,6 +174,6 @@ _CCCL_END_NAMESPACE_CUDA

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

#endif // _CCCL_HAS_CUDA_COMPILER()
#endif // _CCCL_CUDA_COMPILATION()

#endif // _CUDA___MEMCPY_ASYNC_MEMCPY_ASYNC_H_
4 changes: 2 additions & 2 deletions libcudacxx/include/cuda/std/__atomic/functions/cuda_ptx_generated.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@

_CCCL_BEGIN_NAMESPACE_CUDA_STD

#if _CCCL_HAS_CUDA_COMPILER()
#if _CCCL_CUDA_COMPILATION()

extern "C" _CCCL_DEVICE void __atomic_cas_128b_unsupported_before_SM_90();
extern "C" _CCCL_DEVICE void __atomic_exchange_128b_unsupported_before_SM_90();
Expand Down Expand Up @@ -4426,7 +4426,7 @@ template <class _Type, class _Up, class _Sco>
return __atomic_fetch_add_cuda(__ptr, -__op, __memorder, _Sco{});
}

#endif // _CCCL_HAS_CUDA_COMPILER()
#endif // _CCCL_CUDA_COMPILATION()

_CCCL_END_NAMESPACE_CUDA_STD

Expand Down
2 changes: 1 addition & 1 deletion thrust/examples/include/host_device.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

#include <cuda/__cccl_config>

#if !_CCCL_HAS_CUDA_COMPILER()
#if !_CCCL_CUDA_COMPILATION()

# ifndef __host__
# define __host__
Expand Down
2 changes: 1 addition & 1 deletion thrust/thrust/random/detail/normal_distribution_base.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ class normal_distribution_portable
template <typename RealType>
struct normal_distribution_base
{
#if _CCCL_HAS_CUDA_COMPILER() && !_CCCL_CUDA_COMPILER(NVHPC)
#if _CCCL_CUDA_COMPILATION() && !_CCCL_CUDA_COMPILER(NVHPC)
using type = normal_distribution_nvcc<RealType>;
#else
using type = normal_distribution_portable<RealType>;
Expand Down
2 changes: 1 addition & 1 deletion thrust/thrust/system/cuda/detail/adjacent_difference.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
# pragma system_header
#endif // no system header

#if _CCCL_HAS_CUDA_COMPILER()
#if _CCCL_CUDA_COMPILATION()

# include <thrust/system/cuda/config.h>

Expand Down
2 changes: 1 addition & 1 deletion thrust/thrust/system/cuda/detail/assign_value.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
# pragma system_header
#endif // no system header

#if _CCCL_HAS_CUDA_COMPILER()
#if _CCCL_CUDA_COMPILATION()

# include <thrust/detail/raw_pointer_cast.h>
# include <thrust/system/cuda/detail/cross_system.h>
Expand Down
16 changes: 8 additions & 8 deletions thrust/thrust/system/cuda/detail/copy.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,9 @@
#include <thrust/system/cuda/detail/util.h>
#include <thrust/type_traits/is_trivially_relocatable.h>

#if _CCCL_HAS_CUDA_COMPILER()
#if _CCCL_CUDA_COMPILATION()
# include <cub/device/dispatch/tuning/tuning_transform.cuh>
#endif // _CCCL_HAS_CUDA_COMPILER()
#endif // _CCCL_CUDA_COMPILATION()

#include <cuda/__fwd/zip_iterator.h>
#include <cuda/std/tuple>
Expand Down Expand Up @@ -131,7 +131,7 @@ OutputIt _CCCL_HOST non_trivial_cross_system_copy_n(
return ret;
}

#if _CCCL_HAS_CUDA_COMPILER()
#if _CCCL_CUDA_COMPILATION()
// non-trivial copy D->H, only supported with NVCC compiler
// because copy ctor must have __device__ annotations, which is nvcc-only
// feature
Expand All @@ -158,7 +158,7 @@ OutputIt _CCCL_HOST non_trivial_cross_system_copy_n(
OutputIt ret = thrust::copy_n(host_s, temp_host.data(), num_items, result);
return ret;
}
#endif // _CCCL_HAS_CUDA_COMPILER()
#endif // _CCCL_CUDA_COMPILATION()

template <class System1, class System2, class InputIt, class Size, class OutputIt>
OutputIt _CCCL_HOST cross_system_copy_n(cross_system<System1, System2> systems, InputIt begin, Size n, OutputIt result)
Expand Down Expand Up @@ -188,7 +188,7 @@ OutputIt _CCCL_HOST cross_system_copy_n(cross_system<System1, System2> systems,
}
}

#if _CCCL_HAS_CUDA_COMPILER()
#if _CCCL_CUDA_COMPILATION()
template <class Derived, class InputIt, class OutputIt>
OutputIt THRUST_RUNTIME_FUNCTION
device_to_device(execution_policy<Derived>& policy, InputIt first, InputIt last, OutputIt result)
Expand Down Expand Up @@ -229,10 +229,10 @@ device_to_device(execution_policy<Derived>& policy, InputIt first, InputIt last,
policy, first, last, result, ::cuda::proclaim_copyable_arguments(::cuda::std::identity{}));
}
}
#endif // _CCCL_HAS_CUDA_COMPILER()
#endif // _CCCL_CUDA_COMPILATION()
} // namespace __copy

#if _CCCL_HAS_CUDA_COMPILER()
#if _CCCL_CUDA_COMPILATION()

_CCCL_EXEC_CHECK_DISABLE
template <class System, class InputIterator, class OutputIterator>
Expand All @@ -253,7 +253,7 @@ copy_n(execution_policy<System>& system, InputIterator first, Size n, OutputIter
(result = thrust::copy_n(cvt_to_seq(derived_cast(system)), first, n, result);));
return result;
}
#endif // _CCCL_HAS_CUDA_COMPILER()
#endif // _CCCL_CUDA_COMPILATION()

template <class System1, class System2, class InputIterator, class OutputIterator>
OutputIterator _CCCL_HOST
Expand Down
2 changes: 1 addition & 1 deletion thrust/thrust/system/cuda/detail/copy_if.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
# pragma system_header
#endif // no system header

#if _CCCL_HAS_CUDA_COMPILER()
#if _CCCL_CUDA_COMPILATION()

# include <thrust/system/cuda/config.h>

Expand Down
2 changes: 1 addition & 1 deletion thrust/thrust/system/cuda/detail/core/agent_launcher.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
# pragma system_header
#endif // no system header

#if _CCCL_HAS_CUDA_COMPILER()
#if _CCCL_CUDA_COMPILATION()
Copy link
Contributor

@miscco miscco Nov 5, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I observe that this is not changing the comment at the end of the block, please adopt

# include <thrust/system/cuda/detail/core/triple_chevron_launch.h>
# include <thrust/system/cuda/detail/core/util.h>

Expand Down
2 changes: 1 addition & 1 deletion thrust/thrust/system/cuda/detail/count.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
# pragma system_header
#endif // no system header

#if _CCCL_HAS_CUDA_COMPILER()
#if _CCCL_CUDA_COMPILATION()
# include <thrust/system/cuda/config.h>

# include <thrust/distance.h>
Expand Down
2 changes: 1 addition & 1 deletion thrust/thrust/system/cuda/detail/equal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
# pragma system_header
#endif // no system header

#if _CCCL_HAS_CUDA_COMPILER()
#if _CCCL_CUDA_COMPILATION()
# include <thrust/system/cuda/config.h>

# include <thrust/system/cuda/detail/mismatch.h>
Expand Down
2 changes: 1 addition & 1 deletion thrust/thrust/system/cuda/detail/extrema.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
# pragma system_header
#endif // no system header

#if _CCCL_HAS_CUDA_COMPILER()
#if _CCCL_CUDA_COMPILATION()

# include <thrust/system/cuda/config.h>

Expand Down
2 changes: 1 addition & 1 deletion thrust/thrust/system/cuda/detail/fill.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
# pragma system_header
#endif // no system header

#if _CCCL_HAS_CUDA_COMPILER()
#if _CCCL_CUDA_COMPILATION()
# include <cub/device/device_transform.cuh>

# include <thrust/fill.h>
Expand Down
2 changes: 1 addition & 1 deletion thrust/thrust/system/cuda/detail/find.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
# pragma system_header
#endif // no system header

#if _CCCL_HAS_CUDA_COMPILER()
#if _CCCL_CUDA_COMPILATION()
# include <thrust/system/cuda/config.h>

# include <thrust/system/cuda/detail/execution_policy.h>
Expand Down
2 changes: 1 addition & 1 deletion thrust/thrust/system/cuda/detail/for_each.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
# pragma system_header
#endif // no system header

#if _CCCL_HAS_CUDA_COMPILER()
#if _CCCL_CUDA_COMPILATION()
# include <thrust/system/cuda/config.h>

# include <cub/device/device_for.cuh>
Expand Down
2 changes: 1 addition & 1 deletion thrust/thrust/system/cuda/detail/gather.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
# pragma system_header
#endif // no system header

#if _CCCL_HAS_CUDA_COMPILER()
#if _CCCL_CUDA_COMPILATION()
# include <thrust/iterator/permutation_iterator.h>
# include <thrust/system/cuda/detail/transform.h>

Expand Down
2 changes: 1 addition & 1 deletion thrust/thrust/system/cuda/detail/generate.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# pragma system_header
#endif // no system header

#if _CCCL_HAS_CUDA_COMPILER()
#if _CCCL_CUDA_COMPILATION()
# include <cub/device/device_transform.cuh>

# include <thrust/system/cuda/detail/cdp_dispatch.h>
Expand Down
2 changes: 1 addition & 1 deletion thrust/thrust/system/cuda/detail/get_value.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
# pragma system_header
#endif // no system header

#if _CCCL_HAS_CUDA_COMPILER()
#if _CCCL_CUDA_COMPILATION()
# include <thrust/system/cuda/config.h>

# include <thrust/detail/raw_pointer_cast.h>
Expand Down
2 changes: 1 addition & 1 deletion thrust/thrust/system/cuda/detail/inner_product.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
# pragma system_header
#endif // no system header

#if _CCCL_HAS_CUDA_COMPILER()
#if _CCCL_CUDA_COMPILATION()
# include <thrust/distance.h>
# include <thrust/iterator/transform_iterator.h>
# include <thrust/iterator/zip_iterator.h>
Expand Down
2 changes: 1 addition & 1 deletion thrust/thrust/system/cuda/detail/iter_swap.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
# pragma system_header
#endif // no system header

#if _CCCL_HAS_CUDA_COMPILER()
#if _CCCL_CUDA_COMPILATION()

# include <thrust/system/cuda/config.h>

Expand Down
2 changes: 1 addition & 1 deletion thrust/thrust/system/cuda/detail/merge.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# pragma system_header
#endif // no system header

#if _CCCL_HAS_CUDA_COMPILER()
#if _CCCL_CUDA_COMPILATION()

# include <cub/device/device_merge.cuh>

Expand Down
2 changes: 1 addition & 1 deletion thrust/thrust/system/cuda/detail/mismatch.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
# pragma system_header
#endif // no system header

#if _CCCL_HAS_CUDA_COMPILER()
#if _CCCL_CUDA_COMPILATION()
# include <thrust/system/cuda/config.h>

# include <thrust/pair.h>
Expand Down
2 changes: 1 addition & 1 deletion thrust/thrust/system/cuda/detail/parallel_for.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
# pragma system_header
#endif // no system header

#if _CCCL_HAS_CUDA_COMPILER()
#if _CCCL_CUDA_COMPILATION()

# include <thrust/system/cuda/config.h>

Expand Down
2 changes: 1 addition & 1 deletion thrust/thrust/system/cuda/detail/partition.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
# pragma system_header
#endif // no system header

#if _CCCL_HAS_CUDA_COMPILER()
#if _CCCL_CUDA_COMPILATION()

# include <thrust/system/cuda/config.h>

Expand Down
2 changes: 1 addition & 1 deletion thrust/thrust/system/cuda/detail/per_device_resource.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
# pragma system_header
#endif // no system header

#if _CCCL_HAS_CUDA_COMPILER()
#if _CCCL_CUDA_COMPILATION()

# include <thrust/system/cuda/config.h>

Expand Down
2 changes: 1 addition & 1 deletion thrust/thrust/system/cuda/detail/reduce.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
# pragma system_header
#endif // no system header

#if _CCCL_HAS_CUDA_COMPILER()
#if _CCCL_CUDA_COMPILATION()

# include <thrust/system/cuda/config.h>

Expand Down
2 changes: 1 addition & 1 deletion thrust/thrust/system/cuda/detail/reduce_by_key.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
# pragma system_header
#endif // no system header

#if _CCCL_HAS_CUDA_COMPILER()
#if _CCCL_CUDA_COMPILATION()

# include <thrust/system/cuda/config.h>

Expand Down
2 changes: 1 addition & 1 deletion thrust/thrust/system/cuda/detail/remove.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
# pragma system_header
#endif // no system header

#if _CCCL_HAS_CUDA_COMPILER()
#if _CCCL_CUDA_COMPILATION()
# include <thrust/system/cuda/detail/copy_if.h>

THRUST_NAMESPACE_BEGIN
Expand Down
2 changes: 1 addition & 1 deletion thrust/thrust/system/cuda/detail/replace.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
# pragma system_header
#endif // no system header

#if _CCCL_HAS_CUDA_COMPILER()
#if _CCCL_CUDA_COMPILATION()
# include <thrust/detail/internal_functional.h>
# include <thrust/system/cuda/detail/transform.h>

Expand Down
2 changes: 1 addition & 1 deletion thrust/thrust/system/cuda/detail/reverse.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
# pragma system_header
#endif // no system header

#if _CCCL_HAS_CUDA_COMPILER()
#if _CCCL_CUDA_COMPILATION()
# include <thrust/system/cuda/detail/execution_policy.h>

THRUST_NAMESPACE_BEGIN
Expand Down
Loading