Provide libcu++ transparent functors in C++11

Addresses part of: NVIDIA#1664
bernhardmgruber · Jun 12, 2024 · 6fbd21d · 6fbd21d
1 parent bab3b8c
commit 6fbd21d
Show file tree

Hide file tree

Showing 24 changed files with 6 additions and 137 deletions.
diff --git a/libcudacxx/include/cuda/std/__functional/operations.h b/libcudacxx/include/cuda/std/__functional/operations.h
@@ -4,7 +4,7 @@
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-// SPDX-FileCopyrightText: Copyright (c) 2023 NVIDIA CORPORATION & AFFILIATES.
+// SPDX-FileCopyrightText: Copyright (c) 2024 NVIDIA CORPORATION & AFFILIATES.
 //
 //===----------------------------------------------------------------------===//
 
@@ -55,11 +55,7 @@ struct _LIBCUDACXX_TEMPLATE_VIS plus<void>
   typedef void is_transparent;
 };
 
-#if _CCCL_STD_VER > 2011
 template <class _Tp = void>
-#else
-template <class _Tp>
-#endif
 struct _LIBCUDACXX_TEMPLATE_VIS minus : __binary_function<_Tp, _Tp, _Tp>
 {
   typedef _Tp __result_type; // used by valarray
@@ -71,7 +67,6 @@ struct _LIBCUDACXX_TEMPLATE_VIS minus : __binary_function<_Tp, _Tp, _Tp>
 };
 _LIBCUDACXX_CTAD_SUPPORTED_FOR_TYPE(minus);
 
-#if _CCCL_STD_VER > 2011
 template <>
 struct _LIBCUDACXX_TEMPLATE_VIS minus<void>
 {
@@ -85,7 +80,6 @@ struct _LIBCUDACXX_TEMPLATE_VIS minus<void>
   }
   typedef void is_transparent;
 };
-#endif
 
 template <class _Tp = void>
 struct _LIBCUDACXX_TEMPLATE_VIS multiplies : __binary_function<_Tp, _Tp, _Tp>
@@ -113,11 +107,7 @@ struct _LIBCUDACXX_TEMPLATE_VIS multiplies<void>
   typedef void is_transparent;
 };
 
-#if _CCCL_STD_VER > 2011
 template <class _Tp = void>
-#else
-template <class _Tp>
-#endif
 struct _LIBCUDACXX_TEMPLATE_VIS divides : __binary_function<_Tp, _Tp, _Tp>
 {
   typedef _Tp __result_type; // used by valarray
@@ -129,7 +119,6 @@ struct _LIBCUDACXX_TEMPLATE_VIS divides : __binary_function<_Tp, _Tp, _Tp>
 };
 _LIBCUDACXX_CTAD_SUPPORTED_FOR_TYPE(divides);
 
-#if _CCCL_STD_VER > 2011
 template <>
 struct _LIBCUDACXX_TEMPLATE_VIS divides<void>
 {
@@ -143,13 +132,8 @@ struct _LIBCUDACXX_TEMPLATE_VIS divides<void>
   }
   typedef void is_transparent;
 };
-#endif
 
-#if _CCCL_STD_VER > 2011
 template <class _Tp = void>
-#else
-template <class _Tp>
-#endif
 struct _LIBCUDACXX_TEMPLATE_VIS modulus : __binary_function<_Tp, _Tp, _Tp>
 {
   typedef _Tp __result_type; // used by valarray
@@ -161,7 +145,6 @@ struct _LIBCUDACXX_TEMPLATE_VIS modulus : __binary_function<_Tp, _Tp, _Tp>
 };
 _LIBCUDACXX_CTAD_SUPPORTED_FOR_TYPE(modulus);
 
-#if _CCCL_STD_VER > 2011
 template <>
 struct _LIBCUDACXX_TEMPLATE_VIS modulus<void>
 {
@@ -175,7 +158,6 @@ struct _LIBCUDACXX_TEMPLATE_VIS modulus<void>
   }
   typedef void is_transparent;
 };
-#endif
 
 template <class _Tp = void>
 struct _LIBCUDACXX_TEMPLATE_VIS negate : __unary_function<_Tp, _Tp>
@@ -204,11 +186,7 @@ struct _LIBCUDACXX_TEMPLATE_VIS negate<void>
 
 // Bitwise operations
 
-#if _CCCL_STD_VER > 2011
 template <class _Tp = void>
-#else
-template <class _Tp>
-#endif
 struct _LIBCUDACXX_TEMPLATE_VIS bit_and : __binary_function<_Tp, _Tp, _Tp>
 {
   typedef _Tp __result_type; // used by valarray
@@ -220,7 +198,6 @@ struct _LIBCUDACXX_TEMPLATE_VIS bit_and : __binary_function<_Tp, _Tp, _Tp>
 };
 _LIBCUDACXX_CTAD_SUPPORTED_FOR_TYPE(bit_and);
 
-#if _CCCL_STD_VER > 2011
 template <>
 struct _LIBCUDACXX_TEMPLATE_VIS bit_and<void>
 {
@@ -234,9 +211,7 @@ struct _LIBCUDACXX_TEMPLATE_VIS bit_and<void>
   }
   typedef void is_transparent;
 };
-#endif
 
-#if _CCCL_STD_VER > 2011
 template <class _Tp = void>
 struct _LIBCUDACXX_TEMPLATE_VIS bit_not : __unary_function<_Tp, _Tp>
 {
@@ -260,13 +235,8 @@ struct _LIBCUDACXX_TEMPLATE_VIS bit_not<void>
   }
   typedef void is_transparent;
 };
-#endif
 
-#if _CCCL_STD_VER > 2011
 template <class _Tp = void>
-#else
-template <class _Tp>
-#endif
 struct _LIBCUDACXX_TEMPLATE_VIS bit_or : __binary_function<_Tp, _Tp, _Tp>
 {
   typedef _Tp __result_type; // used by valarray
@@ -278,7 +248,6 @@ struct _LIBCUDACXX_TEMPLATE_VIS bit_or : __binary_function<_Tp, _Tp, _Tp>
 };
 _LIBCUDACXX_CTAD_SUPPORTED_FOR_TYPE(bit_or);
 
-#if _CCCL_STD_VER > 2011
 template <>
 struct _LIBCUDACXX_TEMPLATE_VIS bit_or<void>
 {
@@ -292,13 +261,8 @@ struct _LIBCUDACXX_TEMPLATE_VIS bit_or<void>
   }
   typedef void is_transparent;
 };
-#endif
 
-#if _CCCL_STD_VER > 2011
 template <class _Tp = void>
-#else
-template <class _Tp>
-#endif
 struct _LIBCUDACXX_TEMPLATE_VIS bit_xor : __binary_function<_Tp, _Tp, _Tp>
 {
   typedef _Tp __result_type; // used by valarray
@@ -310,7 +274,6 @@ struct _LIBCUDACXX_TEMPLATE_VIS bit_xor : __binary_function<_Tp, _Tp, _Tp>
 };
 _LIBCUDACXX_CTAD_SUPPORTED_FOR_TYPE(bit_xor);
 
-#if _CCCL_STD_VER > 2011
 template <>
 struct _LIBCUDACXX_TEMPLATE_VIS bit_xor<void>
 {
@@ -324,15 +287,10 @@ struct _LIBCUDACXX_TEMPLATE_VIS bit_xor<void>
   }
   typedef void is_transparent;
 };
-#endif
 
 // Comparison operations
 
-#if _CCCL_STD_VER > 2011
 template <class _Tp = void>
-#else
-template <class _Tp>
-#endif
 struct _LIBCUDACXX_TEMPLATE_VIS equal_to : __binary_function<_Tp, _Tp, bool>
 {
   typedef bool __result_type; // used by valarray
@@ -344,7 +302,6 @@ struct _LIBCUDACXX_TEMPLATE_VIS equal_to : __binary_function<_Tp, _Tp, bool>
 };
 _LIBCUDACXX_CTAD_SUPPORTED_FOR_TYPE(equal_to);
 
-#if _CCCL_STD_VER > 2011
 template <>
 struct _LIBCUDACXX_TEMPLATE_VIS equal_to<void>
 {
@@ -358,13 +315,8 @@ struct _LIBCUDACXX_TEMPLATE_VIS equal_to<void>
   }
   typedef void is_transparent;
 };
-#endif
 
-#if _CCCL_STD_VER > 2011
 template <class _Tp = void>
-#else
-template <class _Tp>
-#endif
 struct _LIBCUDACXX_TEMPLATE_VIS not_equal_to : __binary_function<_Tp, _Tp, bool>
 {
   typedef bool __result_type; // used by valarray
@@ -376,7 +328,6 @@ struct _LIBCUDACXX_TEMPLATE_VIS not_equal_to : __binary_function<_Tp, _Tp, bool>
 };
 _LIBCUDACXX_CTAD_SUPPORTED_FOR_TYPE(not_equal_to);
 
-#if _CCCL_STD_VER > 2011
 template <>
 struct _LIBCUDACXX_TEMPLATE_VIS not_equal_to<void>
 {
@@ -390,13 +341,8 @@ struct _LIBCUDACXX_TEMPLATE_VIS not_equal_to<void>
   }
   typedef void is_transparent;
 };
-#endif
 
-#if _CCCL_STD_VER > 2011
 template <class _Tp = void>
-#else
-template <class _Tp>
-#endif
 struct _LIBCUDACXX_TEMPLATE_VIS less : __binary_function<_Tp, _Tp, bool>
 {
   typedef bool __result_type; // used by valarray
@@ -408,7 +354,6 @@ struct _LIBCUDACXX_TEMPLATE_VIS less : __binary_function<_Tp, _Tp, bool>
 };
 _LIBCUDACXX_CTAD_SUPPORTED_FOR_TYPE(less);
 
-#if _CCCL_STD_VER > 2011
 template <>
 struct _LIBCUDACXX_TEMPLATE_VIS less<void>
 {
@@ -422,13 +367,8 @@ struct _LIBCUDACXX_TEMPLATE_VIS less<void>
   }
   typedef void is_transparent;
 };
-#endif
 
-#if _CCCL_STD_VER > 2011
 template <class _Tp = void>
-#else
-template <class _Tp>
-#endif
 struct _LIBCUDACXX_TEMPLATE_VIS less_equal : __binary_function<_Tp, _Tp, bool>
 {
   typedef bool __result_type; // used by valarray
@@ -440,7 +380,6 @@ struct _LIBCUDACXX_TEMPLATE_VIS less_equal : __binary_function<_Tp, _Tp, bool>
 };
 _LIBCUDACXX_CTAD_SUPPORTED_FOR_TYPE(less_equal);
 
-#if _CCCL_STD_VER > 2011
 template <>
 struct _LIBCUDACXX_TEMPLATE_VIS less_equal<void>
 {
@@ -454,13 +393,8 @@ struct _LIBCUDACXX_TEMPLATE_VIS less_equal<void>
   }
   typedef void is_transparent;
 };
-#endif
 
-#if _CCCL_STD_VER > 2011
 template <class _Tp = void>
-#else
-template <class _Tp>
-#endif
 struct _LIBCUDACXX_TEMPLATE_VIS greater_equal : __binary_function<_Tp, _Tp, bool>
 {
   typedef bool __result_type; // used by valarray
@@ -472,7 +406,6 @@ struct _LIBCUDACXX_TEMPLATE_VIS greater_equal : __binary_function<_Tp, _Tp, bool
 };
 _LIBCUDACXX_CTAD_SUPPORTED_FOR_TYPE(greater_equal);
 
-#if _CCCL_STD_VER > 2011
 template <>
 struct _LIBCUDACXX_TEMPLATE_VIS greater_equal<void>
 {
@@ -486,13 +419,8 @@ struct _LIBCUDACXX_TEMPLATE_VIS greater_equal<void>
   }
   typedef void is_transparent;
 };
-#endif
 
-#if _CCCL_STD_VER > 2011
 template <class _Tp = void>
-#else
-template <class _Tp>
-#endif
 struct _LIBCUDACXX_TEMPLATE_VIS greater : __binary_function<_Tp, _Tp, bool>
 {
   typedef bool __result_type; // used by valarray
@@ -504,7 +432,6 @@ struct _LIBCUDACXX_TEMPLATE_VIS greater : __binary_function<_Tp, _Tp, bool>
 };
 _LIBCUDACXX_CTAD_SUPPORTED_FOR_TYPE(greater);
 
-#if _CCCL_STD_VER > 2011
 template <>
 struct _LIBCUDACXX_TEMPLATE_VIS greater<void>
 {
@@ -518,15 +445,10 @@ struct _LIBCUDACXX_TEMPLATE_VIS greater<void>
   }
   typedef void is_transparent;
 };
-#endif
 
 // Logical operations
 
-#if _CCCL_STD_VER > 2011
 template <class _Tp = void>
-#else
-template <class _Tp>
-#endif
 struct _LIBCUDACXX_TEMPLATE_VIS logical_and : __binary_function<_Tp, _Tp, bool>
 {
   typedef bool __result_type; // used by valarray
@@ -538,7 +460,6 @@ struct _LIBCUDACXX_TEMPLATE_VIS logical_and : __binary_function<_Tp, _Tp, bool>
 };
 _LIBCUDACXX_CTAD_SUPPORTED_FOR_TYPE(logical_and);
 
-#if _CCCL_STD_VER > 2011
 template <>
 struct _LIBCUDACXX_TEMPLATE_VIS logical_and<void>
 {
@@ -552,13 +473,8 @@ struct _LIBCUDACXX_TEMPLATE_VIS logical_and<void>
   }
   typedef void is_transparent;
 };
-#endif
 
-#if _CCCL_STD_VER > 2011
 template <class _Tp = void>
-#else
-template <class _Tp>
-#endif
 struct _LIBCUDACXX_TEMPLATE_VIS logical_not : __unary_function<_Tp, bool>
 {
   typedef bool __result_type; // used by valarray
@@ -570,7 +486,6 @@ struct _LIBCUDACXX_TEMPLATE_VIS logical_not : __unary_function<_Tp, bool>
 };
 _LIBCUDACXX_CTAD_SUPPORTED_FOR_TYPE(logical_not);
 
-#if _CCCL_STD_VER > 2011
 template <>
 struct _LIBCUDACXX_TEMPLATE_VIS logical_not<void>
 {
@@ -583,13 +498,8 @@ struct _LIBCUDACXX_TEMPLATE_VIS logical_not<void>
   }
   typedef void is_transparent;
 };
-#endif
 
-#if _CCCL_STD_VER > 2011
 template <class _Tp = void>
-#else
-template <class _Tp>
-#endif
 struct _LIBCUDACXX_TEMPLATE_VIS logical_or : __binary_function<_Tp, _Tp, bool>
 {
   typedef bool __result_type; // used by valarray
@@ -601,7 +511,6 @@ struct _LIBCUDACXX_TEMPLATE_VIS logical_or : __binary_function<_Tp, _Tp, bool>
 };
 _LIBCUDACXX_CTAD_SUPPORTED_FOR_TYPE(logical_or);
 
-#if _CCCL_STD_VER > 2011
 template <>
 struct _LIBCUDACXX_TEMPLATE_VIS logical_or<void>
 {
@@ -615,7 +524,6 @@ struct _LIBCUDACXX_TEMPLATE_VIS logical_or<void>
   }
   typedef void is_transparent;
 };
-#endif
 
 _LIBCUDACXX_END_NAMESPACE_STD
 

diff --git a/...cxx/test/libcudacxx/std/utilities/function.objects/arithmetic.operations/divides.pass.cpp b/...cxx/test/libcudacxx/std/utilities/function.objects/arithmetic.operations/divides.pass.cpp
@@ -47,7 +47,6 @@ int main(int, char**)
   static_assert((cuda::std::is_same<int, F::result_type>::value), "");
 #endif
   assert(f(36, 4) == 9);
-#if TEST_STD_VER > 2011
   typedef cuda::std::divides<> F2;
   const F2 f2 = F2();
   assert(f2(36, 4) == 9);
@@ -59,7 +58,6 @@ int main(int, char**)
 
   constexpr double bar = cuda::std::divides<>()(3.0, 2);
   static_assert(bar == 1.5, ""); // exact in binary
-#endif
 
   return 0;
 }