Check for _CUDA_STD_VERSION instead of _LIBCUDACXX_VERSION

miscco · miscco · commit 1c869289defb · 2025-10-30T15:15:27.000+01:00
diff --git a/libcudacxx/test/libcudacxx/libcxx/atomics/version.pass.cpp b/libcudacxx/test/libcudacxx/libcxx/atomics/version.pass.cpp
@@ -15,8 +15,8 @@
 
 #include "test_macros.h"
 
-#ifndef _LIBCUDACXX_VERSION
-#  error _LIBCUDACXX_VERSION not defined
+#ifndef _CUDA_STD_VERSION
+#  error _CUDA_STD_VERSION not defined
 #endif
 
 int main(int, char**)
diff --git a/libcudacxx/test/libcudacxx/libcxx/utilities/meta/version.pass.cpp b/libcudacxx/test/libcudacxx/libcxx/utilities/meta/version.pass.cpp
@@ -12,8 +12,8 @@
 
 #include "test_macros.h"
 
-#ifndef _LIBCUDACXX_VERSION
-#  error _LIBCUDACXX_VERSION not defined
+#ifndef _CUDA_STD_VERSION
+#  error _CUDA_STD_VERSION not defined
 #endif
 
 int main(int, char**)
diff --git a/libcudacxx/test/libcudacxx/std/atomics/atomics.lockfree/isalwayslockfree.pass.cpp b/libcudacxx/test/libcudacxx/std/atomics/atomics.lockfree/isalwayslockfree.pass.cpp
@@ -106,7 +106,7 @@ __host__ __device__ void run()
   CHECK_ALWAYS_LOCK_FREE(float);
   CHECK_ALWAYS_LOCK_FREE(double);
   // CHECK_ALWAYS_LOCK_FREE(long double); // long double is not supported
-#if _CCCL_HAS_ATTRIBUTE(vector_size) && defined(_LIBCUDACXX_VERSION) && !_CCCL_CUDA_COMPILATION()
+#if _CCCL_HAS_ATTRIBUTE(vector_size) && defined(_CUDA_STD_VERSION) && !_CCCL_CUDA_COMPILATION()
   // NOTE: NVCC doesn't support the vector_size attribute in device code.
   CHECK_ALWAYS_LOCK_FREE(int __attribute__((vector_size(1 * sizeof(int)))));
   CHECK_ALWAYS_LOCK_FREE(int __attribute__((vector_size(2 * sizeof(int)))));
@@ -123,7 +123,7 @@ __host__ __device__ void run()
   CHECK_ALWAYS_LOCK_FREE(double __attribute__((vector_size(4 * sizeof(double)))));
   CHECK_ALWAYS_LOCK_FREE(double __attribute__((vector_size(16 * sizeof(double)))));
   CHECK_ALWAYS_LOCK_FREE(double __attribute__((vector_size(32 * sizeof(double)))));
-#endif // _CCCL_HAS_ATTRIBUTE(vector_size) && defined(_LIBCUDACXX_VERSION)
+#endif // _CCCL_HAS_ATTRIBUTE(vector_size) && defined(_CUDA_STD_VERSION)
   CHECK_ALWAYS_LOCK_FREE(struct Empty{});
   CHECK_ALWAYS_LOCK_FREE(struct OneInt { int i; });
   CHECK_ALWAYS_LOCK_FREE(struct IntArr2 { int i[2]; });
diff --git a/libcudacxx/test/libcudacxx/std/thread/thread.barrier/version.pass.cpp b/libcudacxx/test/libcudacxx/std/thread/thread.barrier/version.pass.cpp
@@ -15,8 +15,8 @@
 
 #include "test_macros.h"
 
-#ifndef _LIBCUDACXX_VERSION
-#  error _LIBCUDACXX_VERSION not defined
+#ifndef _CUDA_STD_VERSION
+#  error _CUDA_STD_VERSION not defined
 #endif
 
 int main(int, char**)
diff --git a/libcudacxx/test/libcudacxx/std/thread/thread.latch/version.pass.cpp b/libcudacxx/test/libcudacxx/std/thread/thread.latch/version.pass.cpp
@@ -15,8 +15,8 @@
 
 #include "test_macros.h"
 
-#ifndef _LIBCUDACXX_VERSION
-#  error _LIBCUDACXX_VERSION not defined
+#ifndef _CUDA_STD_VERSION
+#  error _CUDA_STD_VERSION not defined
 #endif
 
 int main(int, char**)
diff --git a/libcudacxx/test/libcudacxx/std/thread/thread.semaphore/version.pass.cpp b/libcudacxx/test/libcudacxx/std/thread/thread.semaphore/version.pass.cpp
@@ -15,8 +15,8 @@
 
 #include "test_macros.h"
 
-#ifndef _LIBCUDACXX_VERSION
-#  error _LIBCUDACXX_VERSION not defined
+#ifndef _CUDA_STD_VERSION
+#  error _CUDA_STD_VERSION not defined
 #endif
 
 int main(int, char**)
diff --git a/libcudacxx/test/libcudacxx/std/utilities/function.objects/func.not_fn/not_fn.pass.cpp b/libcudacxx/test/libcudacxx/std/utilities/function.objects/func.not_fn/not_fn.pass.cpp
@@ -388,11 +388,11 @@ __host__ __device__ void constructor_tests()
     assert(ret() == false);
     auto ret2 = cuda::std::not_fn(value2);
     assert(ret2() == true);
-#if defined(_LIBCUDACXX_VERSION)
+#if defined(_CUDA_STD_VERSION)
     ret = ret2;
     assert(ret() == true);
     assert(ret2() == true);
-#endif // _LIBCUDACXX_VERSION
+#endif // _CUDA_STD_VERSION
   }
   {
     using T = MoveAssignableWrapper;
@@ -407,10 +407,10 @@ __host__ __device__ void constructor_tests()
     assert(ret() == false);
     auto ret2 = cuda::std::not_fn(cuda::std::move(value2));
     assert(ret2() == true);
-#if defined(_LIBCUDACXX_VERSION)
+#if defined(_CUDA_STD_VERSION)
     ret = cuda::std::move(ret2);
     assert(ret() == true);
-#endif // _LIBCUDACXX_VERSION
+#endif // _CUDA_STD_VERSION
   }
 }
 
diff --git a/libcudacxx/test/libcudacxx/std/utilities/memory/default.allocator/allocator.dtor.pass.cpp b/libcudacxx/test/libcudacxx/std/utilities/memory/default.allocator/allocator.dtor.pass.cpp
@@ -31,15 +31,15 @@ int main(int, char**)
 {
   test<int>();
   test<void>();
-#ifdef _LIBCUDACXX_VERSION // extension
+#ifdef _CUDA_STD_VERSION // extension
   test<int const>();
-#endif // _LIBCUDACXX_VERSION
+#endif // _CUDA_STD_VERSION
 
   static_assert(test<int>());
   static_assert(test<void>());
-#ifdef _LIBCUDACXX_VERSION // extension
+#ifdef _CUDA_STD_VERSION // extension
   static_assert(test<int const>());
-#endif // _LIBCUDACXX_VERSION
+#endif // _CUDA_STD_VERSION
 
   return 0;
 }
diff --git a/libcudacxx/test/libcudacxx/std/utilities/memory/default.allocator/allocator_types.pass.cpp b/libcudacxx/test/libcudacxx/std/utilities/memory/default.allocator/allocator_types.pass.cpp
@@ -64,7 +64,7 @@ __host__ __device__ void test()
 int main(int, char**)
 {
   test<char>();
-#ifdef _LIBCUDACXX_VERSION
+#ifdef _CUDA_STD_VERSION
   test<char const>(); // extension
 #endif
   return 0;
diff --git a/libcudacxx/test/libcudacxx/std/utilities/template.bitset/bitset.members/index_const.pass.cpp b/libcudacxx/test/libcudacxx/std/utilities/template.bitset/bitset.members/index_const.pass.cpp
@@ -26,7 +26,7 @@ __host__ __device__ constexpr void test_index_const()
     {
       assert(v[N / 2] == v.test(N / 2));
     }
-#if !defined(_LIBCUDACXX_VERSION) || defined(_LIBCUDACXX_ABI_BITSET_span_BOOL_CONST_SUBSCRIPT_RETURN_BOOL)
+#if !defined(_CUDA_STD_VERSION) || defined(_LIBCUDACXX_ABI_BITSET_span_BOOL_CONST_SUBSCRIPT_RETURN_BOOL)
     static_assert(cuda::std::is_same_v<decltype(v[0]), bool>);
 #else
     static_assert(cuda::std::is_same_v<decltype(v[0]), typename cuda::std::bitset<N>::const_reference>);
@@ -50,7 +50,7 @@ __host__ __device__ constexpr bool test()
   const auto& set = set_;
   auto b          = set[0];
   set_[0]         = true;
-#if !defined(_LIBCUDACXX_VERSION) || defined(_LIBCUDACXX_ABI_BITSET_span_BOOL_CONST_SUBSCRIPT_RETURN_BOOL)
+#if !defined(_CUDA_STD_VERSION) || defined(_LIBCUDACXX_ABI_BITSET_span_BOOL_CONST_SUBSCRIPT_RETURN_BOOL)
   assert(!b);
 #else
   assert(b);
diff --git a/libcudacxx/test/libcudacxx/std/utilities/tuple/tuple.tuple/tuple.cnstr/PR31384.pass.cpp b/libcudacxx/test/libcudacxx/std/utilities/tuple/tuple.tuple/tuple.cnstr/PR31384.pass.cpp
@@ -82,7 +82,7 @@ int main(int, char**)
   count = 0;
   {
     // FIXME: Libc++ incorrectly rejects this code.
-#ifndef _LIBCUDACXX_VERSION
+#ifndef _CUDA_STD_VERSION
     cuda::std::tuple<Implicit> foo = ExplicitDerived<int>{42};
     static_assert(cuda::std::is_convertible<ExplicitDerived<int>, cuda::std::tuple<Implicit>>::value,
                   "correct STLs accept this");
diff --git a/libcudacxx/test/libcudacxx/std/utilities/tuple/tuple.tuple/tuple.cnstr/UTypes.pass.cpp b/libcudacxx/test/libcudacxx/std/utilities/tuple/tuple.tuple/tuple.cnstr/UTypes.pass.cpp
@@ -68,7 +68,7 @@ __host__ __device__ void test_default_constructible_extension_sfinae()
     static_assert(cuda::std::is_constructible<NestedTuple, MoveOnly, Tuple, MoveOnly, MoveOnly>::value, "");
   }
   // testing extensions
-#ifdef _LIBCUDACXX_VERSION
+#ifdef _CUDA_STD_VERSION
   {
     using Tuple       = cuda::std::tuple<MoveOnly, int>;
     using NestedTuple = cuda::std::tuple<MoveOnly, Tuple, MoveOnly, MoveOnly>;
@@ -98,7 +98,7 @@ int main(int, char**)
     assert(cuda::std::get<2>(t) == 2);
   }
   // extensions, MSVC issues
-#if defined(_LIBCUDACXX_VERSION) && !TEST_COMPILER(MSVC)
+#if defined(_CUDA_STD_VERSION) && !TEST_COMPILER(MSVC)
   {
     using E   = MoveOnly;
     using Tup = cuda::std::tuple<E, E, E>;
diff --git a/libcudacxx/test/libcudacxx/std/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_copy.pass.cpp b/libcudacxx/test/libcudacxx/std/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_copy.pass.cpp
@@ -51,7 +51,7 @@ int main(int, char**)
     assert(cuda::std::get<0>(t) == 2);
   }
 // testing extensions
-#ifdef _LIBCUDACXX_VERSION
+#ifdef _CUDA_STD_VERSION
   {
     using T = cuda::std::tuple<alloc_first, alloc_last>;
     T t0(2, 3);
diff --git a/libcudacxx/test/libcudacxx/std/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_move.pass.cpp b/libcudacxx/test/libcudacxx/std/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_move.pass.cpp
@@ -52,7 +52,7 @@ int main(int, char**)
     assert(cuda::std::get<0>(t) == 1);
   }
 // testing extensions
-#ifdef _LIBCUDACXX_VERSION
+#ifdef _CUDA_STD_VERSION
   {
     using T = cuda::std::tuple<MoveOnly, alloc_first>;
     T t0(0, 1);
diff --git a/libcudacxx/test/libcudacxx/std/utilities/tuple/tuple.tuple/tuple.cnstr/const_Types.pass.cpp b/libcudacxx/test/libcudacxx/std/utilities/tuple/tuple.tuple/tuple.cnstr/const_Types.pass.cpp
@@ -152,7 +152,7 @@ int main(int, char**)
   // extensions
   // cuda::std::string not supported
   /*
-#ifdef _LIBCUDACXX_VERSION
+#ifdef _CUDA_STD_VERSION
   {
       cuda::std::tuple<int, char*, cuda::std::string> t(2);
       assert(cuda::std::get<0>(t) == 2);
diff --git a/libcudacxx/test/libcudacxx/std/utilities/tuple/tuple.tuple/tuple.cnstr/test_lazy_sfinae.pass.cpp b/libcudacxx/test/libcudacxx/std/utilities/tuple/tuple.tuple/tuple.cnstr/test_lazy_sfinae.pass.cpp
@@ -65,7 +65,7 @@ struct AllowAssertT
 // will cause a static assertion.
 __host__ __device__ void test_tuple_like_lazy_sfinae()
 {
-#if defined(_LIBCUDACXX_VERSION)
+#if defined(_CUDA_STD_VERSION)
   // This test requires libc++'s reduced arity initialization.
   using T1 = ConstructibleFromT<cuda::std::pair<int, int>>;
   using T2 = CtorAssertsT<int>;
diff --git a/libcudacxx/test/libcudacxx/std/utilities/variant/variant.variant/variant.swap/swap.pass.cpp b/libcudacxx/test/libcudacxx/std/utilities/variant/variant.variant/variant.swap/swap.pass.cpp
@@ -434,7 +434,7 @@ void test_exceptions_different_alternatives()
     assert(cuda::std::get<1>(v2).value == 100);
   }
 // FIXME: The tests below are just very libc++ specific
-#  ifdef _LIBCUDACXX_VERSION
+#  ifdef _CUDA_STD_VERSION
   {
     using T1 = ThrowsOnSecondMove;
     using T2 = NonThrowingNonNoexceptType;
@@ -466,7 +466,7 @@ void test_exceptions_different_alternatives()
     assert(v1.valueless_by_exception());
     assert(cuda::std::get<0>(v2).value == 42);
   }
-#  endif // _LIBCUDACXX_VERSION
+#  endif // _CUDA_STD_VERSION
 }
 #endif // TEST_HAS_EXCEPTIONS()
 
@@ -585,10 +585,10 @@ __host__ __device__ void test_swap_noexcept()
   }
 }
 
-#ifdef _LIBCUDACXX_VERSION
+#ifdef _CUDA_STD_VERSION
 // This is why variant should SFINAE member swap. :-)
 template class cuda::std::variant<int, NotSwappable>;
-#endif // _LIBCUDACXX_VERSION
+#endif // _CUDA_STD_VERSION
 
 int main(int, char**)
 {
diff --git a/libcudacxx/test/support/check_assertion.h b/libcudacxx/test/support/check_assertion.h
@@ -27,7 +27,7 @@
 #include "test_macros.h"
 #include <sys/wait.h>
 
-#ifndef _LIBCUDACXX_VERSION
+#ifndef _CUDA_STD_VERSION
 #  error "This header may only be used for libc++ tests"
 #endif
 
diff --git a/libcudacxx/test/support/container_debug_tests.h b/libcudacxx/test/support/container_debug_tests.h
@@ -11,7 +11,7 @@
 #define TEST_SUPPORT_CONTAINER_DEBUG_TESTS_H
 
 #include <ciso646>
-#ifndef _LIBCUDACXX_VERSION
+#ifndef _CUDA_STD_VERSION
 #  error This header may only be used for libc++ tests
 #endif
 
diff --git a/libcudacxx/test/support/deduction_guides_sfinae_checks.h b/libcudacxx/test/support/deduction_guides_sfinae_checks.h
@@ -54,9 +54,9 @@ __host__ __device__ constexpr void SequenceContainerDeductionGuidesSfinaeAway()
   // containers because they have constructors of the form `(size_type count,
   // const value_type& value)`. These constructors would be used when passing
   // two integral types and would deduce `value_type` to be an integral type.
-#ifdef _LIBCUDACXX_VERSION
+#ifdef _CUDA_STD_VERSION
   using OutputIter = cuda::std::insert_iterator<InstantiatedContainer>;
-#endif // _LIBCUDACXX_VERSION
+#endif // _CUDA_STD_VERSION
 
   // (iter, iter)
   //
@@ -97,9 +97,9 @@ __host__ __device__ constexpr void AssociativeContainerDeductionGuidesSfinaeAway
   // The only requirement in the Standard is that integral types cannot be
   // considered input iterators, beyond that it is unspecified.
   using BadIter = int;
-#ifdef _LIBCUDACXX_VERSION
+#ifdef _CUDA_STD_VERSION
   using OutputIter = cuda::std::insert_iterator<InstantiatedContainer>;
-#endif // _LIBCUDACXX_VERSION
+#endif // _CUDA_STD_VERSION
   using AllocAsComp = Alloc;
 
   // (iter, iter)
@@ -171,9 +171,9 @@ __host__ __device__ constexpr void UnorderedContainerDeductionGuidesSfinaeAway()
   // The only requirement in the Standard is that integral types cannot be
   // considered input iterators, beyond that it is unspecified.
   using BadIter = int;
-#ifdef _LIBCUDACXX_VERSION
+#ifdef _CUDA_STD_VERSION
   using OutputIter = cuda::std::insert_iterator<InstantiatedContainer>;
-#endif // _LIBCUDACXX_VERSION
+#endif // _CUDA_STD_VERSION
   using AllocAsHash = Alloc;
   using AllocAsPred = Alloc;
 
diff --git a/libcudacxx/test/support/experimental_any_helpers.h b/libcudacxx/test/support/experimental_any_helpers.h
@@ -34,7 +34,7 @@ struct IsSmallObject
 template <class Type>
 bool isSmallType()
 {
-#if defined(_LIBCUDACXX_VERSION)
+#if defined(_CUDA_STD_VERSION)
   return std::experimental::__any_imp::_IsSmallObject<Type>::value;
 #else
   return IsSmallObject<Type>::value;
diff --git a/libcudacxx/test/support/filesystem_include.h b/libcudacxx/test/support/filesystem_include.h
@@ -5,7 +5,7 @@
 
 #include "test_macros.h"
 
-#if defined(_LIBCUDACXX_VERSION)
+#if defined(_CUDA_STD_VERSION)
 namespace fs = std::__fs::filesystem;
 #else
 namespace fs = std::filesystem;
diff --git a/libcudacxx/test/support/msvc_stdlib_force_include.h b/libcudacxx/test/support/msvc_stdlib_force_include.h
@@ -24,7 +24,7 @@
 #include <stdlib.h>
 #include <vcruntime.h>
 
-#if defined(_LIBCUDACXX_VERSION)
+#if defined(_CUDA_STD_VERSION)
 #  error This header may not be used when targeting libc++
 #endif
 

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ __host__ __device__ void test()`
`64`	`64`	`int main(int, char**)`
`65`	`65`	`{`
`66`	`66`	`test<char>();`
`67`		`-#ifdef _LIBCUDACXX_VERSION`
	`67`	`+#ifdef _CUDA_STD_VERSION`
`68`	`68`	`test<char const>(); // extension`
`69`	`69`	`#endif`
`70`	`70`	`return 0;`