Try to always include the definition of barrier_native_handle when ne…

…eded (#3556)
NVIDIA · Jan 28, 2025 · 392c3b8 · 392c3b8
1 parent cc4b86e
commit 392c3b8
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 0 deletions.
diff --git a/libcudacxx/include/cuda/__barrier/barrier_native_handle.h b/libcudacxx/include/cuda/__barrier/barrier_native_handle.h
@@ -25,6 +25,8 @@
 #include <cuda/__fwd/barrier.h>
 #include <cuda/std/cstdint>
 
+#if _CCCL_HAS_CUDA_COMPILER
+
 _LIBCUDACXX_BEGIN_NAMESPACE_CUDA_DEVICE
 
 _CCCL_DEVICE inline _CUDA_VSTD::uint64_t* barrier_native_handle(barrier<thread_scope_block>& __b)
@@ -34,4 +36,6 @@ _CCCL_DEVICE inline _CUDA_VSTD::uint64_t* barrier_native_handle(barrier<thread_s
 
 _LIBCUDACXX_END_NAMESPACE_CUDA_DEVICE
 
+#endif // _CCCL_HAS_CUDA_COMPILER
+
 #endif // _CUDA___BARRIER_BARRIER_NATIVE_HANDLE_H
diff --git a/libcudacxx/include/cuda/__memcpy_async/try_get_barrier_handle.h b/libcudacxx/include/cuda/__memcpy_async/try_get_barrier_handle.h
@@ -22,6 +22,7 @@
 #endif // no system header
 
 #include <cuda/__barrier/barrier_block_scope.h>
+#include <cuda/__barrier/barrier_native_handle.h>
 #include <cuda/std/__atomic/scopes.h>
 #include <cuda/std/__barrier/barrier.h>
 #include <cuda/std/__barrier/empty_completion.h>

diff --git a/libcudacxx/include/cuda/barrier b/libcudacxx/include/cuda/barrier
@@ -34,6 +34,7 @@
 #include <cuda/__barrier/barrier_arrive_tx.h>
 #include <cuda/__barrier/barrier_block_scope.h>
 #include <cuda/__barrier/barrier_expect_tx.h>
+#include <cuda/__barrier/barrier_native_handle.h>
 #include <cuda/__barrier/barrier_thread_scope.h>
 #include <cuda/__memcpy_async/memcpy_async.h>
 #include <cuda/__memcpy_async/memcpy_async_tx.h>