Deprecate thrust event, future and more (#3457)

Deprecate: * detail::dependencies_aware_execution_policy * detail::execute_with_allocator_and_dependencies * detail::execute_with_dependencies * [device_]unique_eager_event * [device_]event * [device_]unique_eager_future * [device_]future * new_stream[_t] * when_all And many utility entities around those
NVIDIA · Jan 23, 2025 · ffc5f6d · ffc5f6d
1 parent a15a057
commit ffc5f6d
Show file tree

Hide file tree

Showing 46 changed files with 291 additions and 110 deletions.
diff --git a/thrust/testing/allocator_aware_policies.cu b/thrust/testing/allocator_aware_policies.cu
@@ -1,3 +1,8 @@
+#include <cuda/__cccl_config>
+
+// need to suppress deprecation warnings for execute_with_allocator_and_dependencies here and inside type traits
+_CCCL_SUPPRESS_DEPRECATED_PUSH
+
 #include <thrust/detail/seq.h>
 #include <thrust/system/cpp/detail/par.h>
 #include <thrust/system/omp/detail/par.h>
@@ -118,3 +123,5 @@ SimpleUnitTest<TestAllocatorAttachment,
                                    omp_par_info,
                                    tbb_par_info>>
   TestAllocatorAttachmentInstance;
+
+_CCCL_SUPPRESS_DEPRECATED_POP
diff --git a/thrust/testing/async/exclusive_scan/counting_iterator.cu b/thrust/testing/async/exclusive_scan/counting_iterator.cu
@@ -1,3 +1,7 @@
+#include <cuda/__cccl_config>
+
+_CCCL_SUPPRESS_DEPRECATED_PUSH
+
 #include <thrust/detail/config.h>
 
 #if _CCCL_STD_VER >= 2014
@@ -40,3 +44,5 @@ struct test_counting_iterator
 DECLARE_GENERIC_SIZED_UNITTEST_WITH_TYPES(test_counting_iterator, UnsignedIntegralTypes);
 
 #endif // C++14
+
+_CCCL_SUPPRESS_DEPRECATED_POP
diff --git a/thrust/testing/async/exclusive_scan/discard_output.cu b/thrust/testing/async/exclusive_scan/discard_output.cu
@@ -1,3 +1,7 @@
+#include <cuda/__cccl_config>
+
+_CCCL_SUPPRESS_DEPRECATED_PUSH
+
 #include <thrust/detail/config.h>
 
 #if _CCCL_STD_VER >= 2014
@@ -37,3 +41,5 @@ struct test_discard
 DECLARE_GENERIC_SIZED_UNITTEST_WITH_TYPES(test_discard, NumericTypes);
 
 #endif // C++14
+
+_CCCL_SUPPRESS_DEPRECATED_POP
diff --git a/thrust/testing/async/exclusive_scan/large_indices.cu b/thrust/testing/async/exclusive_scan/large_indices.cu
@@ -1,3 +1,7 @@
+#include <cuda/__cccl_config>
+
+_CCCL_SUPPRESS_DEPRECATED_PUSH
+
 #include <thrust/detail/config.h>
 
 #if _CCCL_STD_VER >= 2014
@@ -237,3 +241,5 @@ void test_large_indices_custom_scan_op()
 DECLARE_UNITTEST(test_large_indices_custom_scan_op);
 
 #endif // C++14
+
+_CCCL_SUPPRESS_DEPRECATED_POP
diff --git a/thrust/testing/async/exclusive_scan/large_types.cu b/thrust/testing/async/exclusive_scan/large_types.cu
@@ -1,3 +1,7 @@
+#include <cuda/__cccl_config>
+
+_CCCL_SUPPRESS_DEPRECATED_PUSH
+
 #include <thrust/detail/config.h>
 
 #if _CCCL_STD_VER >= 2014
@@ -52,3 +56,5 @@ struct test_large_types
 DECLARE_UNITTEST(test_large_types);
 
 #endif // C++14
+
+_CCCL_SUPPRESS_DEPRECATED_POP
diff --git a/thrust/testing/async/exclusive_scan/mixed_types.cu b/thrust/testing/async/exclusive_scan/mixed_types.cu
@@ -1,3 +1,7 @@
+#include <cuda/__cccl_config>
+
+_CCCL_SUPPRESS_DEPRECATED_PUSH
+
 #include <thrust/detail/config.h>
 
 #if _CCCL_STD_VER >= 2014
@@ -115,3 +119,5 @@ void test_scan_mixed_types(size_t num_values)
 DECLARE_SIZED_UNITTEST(test_scan_mixed_types);
 
 #endif // C++14
+
+_CCCL_SUPPRESS_DEPRECATED_POP
diff --git a/thrust/testing/async/exclusive_scan/simple.cu b/thrust/testing/async/exclusive_scan/simple.cu
@@ -1,3 +1,7 @@
+#include <cuda/__cccl_config>
+
+_CCCL_SUPPRESS_DEPRECATED_PUSH
+
 #include <thrust/detail/config.h>
 
 #if _CCCL_STD_VER >= 2014
@@ -65,3 +69,5 @@ struct test_simple_in_place
 DECLARE_GENERIC_SIZED_UNITTEST_WITH_TYPES(test_simple_in_place, NumericTypes);
 
 #endif // C++14
+
+_CCCL_SUPPRESS_DEPRECATED_POP
diff --git a/thrust/testing/async/exclusive_scan/stateful_operator.cu b/thrust/testing/async/exclusive_scan/stateful_operator.cu
@@ -1,3 +1,7 @@
+#include <cuda/__cccl_config>
+
+_CCCL_SUPPRESS_DEPRECATED_PUSH
+
 #include <thrust/detail/config.h>
 
 #if _CCCL_STD_VER >= 2014
@@ -62,3 +66,5 @@ struct test_stateful_operator
 DECLARE_GENERIC_SIZED_UNITTEST_WITH_TYPES(test_stateful_operator, NumericTypes);
 
 #endif // C++14
+
+_CCCL_SUPPRESS_DEPRECATED_POP
diff --git a/thrust/testing/async/exclusive_scan/using_vs_adl.cu b/thrust/testing/async/exclusive_scan/using_vs_adl.cu
@@ -1,3 +1,7 @@
+#include <cuda/__cccl_config>
+
+_CCCL_SUPPRESS_DEPRECATED_PUSH
+
 #include <thrust/detail/config.h>
 
 #if _CCCL_STD_VER >= 2014
@@ -168,3 +172,5 @@ void test_using_cpo()
 DECLARE_UNITTEST(test_using_cpo);
 
 #endif // C++14
+
+_CCCL_SUPPRESS_DEPRECATED_POP
diff --git a/thrust/testing/async/inclusive_scan/counting_iterator.cu b/thrust/testing/async/inclusive_scan/counting_iterator.cu
@@ -1,3 +1,7 @@
+#include <cuda/__cccl_config>
+
+_CCCL_SUPPRESS_DEPRECATED_PUSH
+
 #include <thrust/detail/config.h>
 
 #if _CCCL_STD_VER >= 2014
@@ -39,3 +43,5 @@ struct test_counting_iterator
 DECLARE_GENERIC_SIZED_UNITTEST_WITH_TYPES(test_counting_iterator, UnsignedIntegralTypes);
 
 #endif // C++14
+
+_CCCL_SUPPRESS_DEPRECATED_POP
diff --git a/thrust/testing/async/inclusive_scan/discard_output.cu b/thrust/testing/async/inclusive_scan/discard_output.cu
@@ -1,3 +1,7 @@
+#include <cuda/__cccl_config>
+
+_CCCL_SUPPRESS_DEPRECATED_PUSH
+
 #include <thrust/detail/config.h>
 
 #if _CCCL_STD_VER >= 2014
@@ -35,3 +39,5 @@ struct test_discard
 DECLARE_GENERIC_SIZED_UNITTEST_WITH_TYPES(test_discard, NumericTypes);
 
 #endif // C++14
+
+_CCCL_SUPPRESS_DEPRECATED_POP
diff --git a/thrust/testing/async/inclusive_scan/large_indices.cu b/thrust/testing/async/inclusive_scan/large_indices.cu
@@ -1,3 +1,7 @@
+#include <cuda/__cccl_config>
+
+_CCCL_SUPPRESS_DEPRECATED_PUSH
+
 #include <thrust/detail/config.h>
 
 #if _CCCL_STD_VER >= 2014
@@ -232,3 +236,5 @@ void test_large_indices_custom_scan_op()
 DECLARE_UNITTEST(test_large_indices_custom_scan_op);
 
 #endif // C++14
+
+_CCCL_SUPPRESS_DEPRECATED_POP
diff --git a/thrust/testing/async/inclusive_scan/large_types.cu b/thrust/testing/async/inclusive_scan/large_types.cu
@@ -1,3 +1,7 @@
+#include <cuda/__cccl_config>
+
+_CCCL_SUPPRESS_DEPRECATED_PUSH
+
 #include <thrust/detail/config.h>
 
 #if _CCCL_STD_VER >= 2014
@@ -52,3 +56,5 @@ struct test_large_types
 DECLARE_UNITTEST(test_large_types);
 
 #endif // C++14
+
+_CCCL_SUPPRESS_DEPRECATED_POP
diff --git a/thrust/testing/async/inclusive_scan/mixed_types.cu b/thrust/testing/async/inclusive_scan/mixed_types.cu
@@ -1,3 +1,7 @@
+#include <cuda/__cccl_config>
+
+_CCCL_SUPPRESS_DEPRECATED_PUSH
+
 #include <thrust/detail/config.h>
 
 #if _CCCL_STD_VER >= 2014
@@ -106,3 +110,5 @@ void test_scan_mixed_types(size_t num_values)
 DECLARE_SIZED_UNITTEST(test_scan_mixed_types);
 
 #endif // C++14
+
+_CCCL_SUPPRESS_DEPRECATED_POP
diff --git a/thrust/testing/async/inclusive_scan/simple.cu b/thrust/testing/async/inclusive_scan/simple.cu
@@ -1,3 +1,7 @@
+#include <cuda/__cccl_config>
+
+_CCCL_SUPPRESS_DEPRECATED_PUSH
+
 #include <thrust/detail/config.h>
 
 #if _CCCL_STD_VER >= 2014
@@ -90,3 +94,5 @@ struct test_simple_in_place
 DECLARE_GENERIC_SIZED_UNITTEST_WITH_TYPES(test_simple_in_place, NumericTypes);
 
 #endif // C++14
+
+_CCCL_SUPPRESS_DEPRECATED_POP
diff --git a/thrust/testing/async/inclusive_scan/stateful_operator.cu b/thrust/testing/async/inclusive_scan/stateful_operator.cu
@@ -1,3 +1,7 @@
+#include <cuda/__cccl_config>
+
+_CCCL_SUPPRESS_DEPRECATED_PUSH
+
 #include <thrust/detail/config.h>
 
 #if _CCCL_STD_VER >= 2014
@@ -62,3 +66,5 @@ struct test_stateful_operator
 DECLARE_GENERIC_SIZED_UNITTEST_WITH_TYPES(test_stateful_operator, NumericTypes);
 
 #endif // C++14
+
+_CCCL_SUPPRESS_DEPRECATED_POP
diff --git a/thrust/testing/async/inclusive_scan/using_vs_adl.cu b/thrust/testing/async/inclusive_scan/using_vs_adl.cu
@@ -1,3 +1,7 @@
+#include <cuda/__cccl_config>
+
+_CCCL_SUPPRESS_DEPRECATED_PUSH
+
 #include <thrust/detail/config.h>
 
 #if _CCCL_STD_VER >= 2014
@@ -166,3 +170,5 @@ void test_using_cpo()
 DECLARE_UNITTEST(test_using_cpo);
 
 #endif // C++14
+
+_CCCL_SUPPRESS_DEPRECATED_POP
diff --git a/thrust/testing/async_copy.cu b/thrust/testing/async_copy.cu
@@ -1,3 +1,8 @@
+#include <cuda/__cccl_config>
+
+// need to suppress deprecation warnings inside a lot of thrust headers
+_CCCL_SUPPRESS_DEPRECATED_PUSH
+
 #include <thrust/detail/config.h>
 
 #if _CCCL_STD_VER >= 2014
@@ -10,8 +15,6 @@
 #  include <unittest/unittest.h>
 #  include <unittest/util_async.h>
 
-_CCCL_SUPPRESS_DEPRECATED_PUSH
-
 #  define DEFINE_ASYNC_COPY_CALLABLE(name, ...)                                               \
     struct THRUST_PP_CAT2(name, _fn)                                                          \
     {                                                                                         \
@@ -321,3 +324,5 @@ DECLARE_GENERIC_SIZED_UNITTEST_WITH_TYPES(test_async_copy_after, BuiltinNumericT
 // Can't do this today because we can't do cross-system with explicit policies.
 
 #endif
+
+_CCCL_SUPPRESS_DEPRECATED_POP
diff --git a/thrust/testing/async_reduce.cu b/thrust/testing/async_reduce.cu
@@ -1,5 +1,10 @@
 #define THRUST_ENABLE_FUTURE_RAW_DATA_MEMBER
 
+#include <cuda/__cccl_config>
+
+// need to suppress deprecation warnings inside several thrust headers
+_CCCL_SUPPRESS_DEPRECATED_PUSH
+
 #include <thrust/detail/config.h>
 
 #if _CCCL_STD_VER >= 2014
@@ -12,8 +17,6 @@
 #  include <unittest/unittest.h>
 #  include <unittest/util_async.h>
 
-_CCCL_SUPPRESS_DEPRECATED_PUSH
-
 template <typename T>
 struct custom_plus
 {
@@ -541,16 +544,12 @@ struct test_async_reduce_using
     // When you import the customization points into the global namespace,
     // they should be selected instead of the synchronous algorithms.
     {
-      _CCCL_SUPPRESS_DEPRECATED_PUSH
       using namespace thrust::async;
       f0a = reduce(d0a.begin(), d0a.end());
-      _CCCL_SUPPRESS_DEPRECATED_POP
     }
     {
-      _CCCL_SUPPRESS_DEPRECATED_PUSH
       using thrust::async::reduce;
       f0b = reduce(d0b.begin(), d0b.end());
-      _CCCL_SUPPRESS_DEPRECATED_POP
     }
 
     // ADL should find the synchronous algorithms.
@@ -884,3 +883,5 @@ struct test_async_reduce_bug1886
 DECLARE_UNITTEST(test_async_reduce_bug1886);
 
 #endif
+
+_CCCL_SUPPRESS_DEPRECATED_POP
diff --git a/thrust/testing/async_sort.cu b/thrust/testing/async_sort.cu
@@ -1,3 +1,8 @@
+#include <cuda/__cccl_config>
+
+// need to suppress deprecation warnings inside a lot of thrust headers
+_CCCL_SUPPRESS_DEPRECATED_PUSH
+
 #include <thrust/detail/config.h>
 
 // Disabled on MSVC && NVCC < 11.1 for GH issue #1098.
@@ -15,8 +20,6 @@
 
 #  include <unittest/unittest.h>
 
-_CCCL_SUPPRESS_DEPRECATED_PUSH
-
 enum wait_policy
 {
   wait_for_futures,
@@ -177,3 +180,5 @@ DECLARE_GENERIC_SIZED_UNITTEST_WITH_TYPES_AND_NAME(
 // TODO: Test future return type.
 
 #endif
+
+_CCCL_SUPPRESS_DEPRECATED_POP
diff --git a/thrust/testing/dependencies_aware_policies.cu b/thrust/testing/dependencies_aware_policies.cu
@@ -1,3 +1,8 @@
+#include <cuda/__cccl_config>
+
+// need to suppress deprecation warnings for execute_with_allocator_and_dependencies inside type traits
+_CCCL_SUPPRESS_DEPRECATED_PUSH
+
 #include <thrust/detail/config.h>
 
 #include <thrust/detail/seq.h>
@@ -113,3 +118,5 @@ SimpleUnitTest<TestDependencyAttachment,
 #endif
                  >>
   TestDependencyAttachmentInstance;
+
+_CCCL_SUPPRESS_DEPRECATED_POP
diff --git a/thrust/testing/event.cu b/thrust/testing/event.cu
@@ -7,6 +7,10 @@
 #  include <unittest/unittest.h>
 #  include <unittest/util_async.h>
 
+// note: there is no matching _CCCL_SUPPRESS_DEPRECATED_POP, so the warning suppression leaks into more content of the
+// generated cudafe1.stub.c file.
+_CCCL_SUPPRESS_DEPRECATED_PUSH
+
 ///////////////////////////////////////////////////////////////////////////////
 
 _CCCL_HOST void test_event_default_constructed()

diff --git a/thrust/testing/future.cu b/thrust/testing/future.cu
@@ -7,6 +7,10 @@
 #  include <unittest/unittest.h>
 #  include <unittest/util_async.h>
 
+// note: there is no matching _CCCL_SUPPRESS_DEPRECATED_POP, so the warning suppression leaks into more content of the
+// generated cudafe1.stub.c file.
+_CCCL_SUPPRESS_DEPRECATED_PUSH
+
 struct mock
 {};
 

diff --git a/thrust/thrust/async/copy.h b/thrust/thrust/async/copy.h
@@ -51,6 +51,7 @@ namespace async
 namespace unimplemented
 {
 
+_CCCL_SUPPRESS_DEPRECATED_PUSH
 template <typename FromPolicy, typename ToPolicy, typename ForwardIt, typename Sentinel, typename OutputIt>
 CCCL_DEPRECATED _CCCL_HOST event<FromPolicy> async_copy(
   thrust::execution_policy<FromPolicy>& from_exec,
@@ -63,6 +64,7 @@ CCCL_DEPRECATED _CCCL_HOST event<FromPolicy> async_copy(
                            "this algorithm is not implemented for the specified system");
   return {};
 }
+_CCCL_SUPPRESS_DEPRECATED_POP
 
 } // namespace unimplemented
 

diff --git a/thrust/thrust/async/for_each.h b/thrust/thrust/async/for_each.h
@@ -51,6 +51,7 @@ namespace async
 namespace unimplemented
 {
 
+_CCCL_SUPPRESS_DEPRECATED_PUSH
 template <typename DerivedPolicy, typename ForwardIt, typename Sentinel, typename UnaryFunction>
 CCCL_DEPRECATED _CCCL_HOST event<DerivedPolicy>
 async_for_each(thrust::execution_policy<DerivedPolicy>&, ForwardIt, Sentinel, UnaryFunction)
@@ -59,6 +60,7 @@ async_for_each(thrust::execution_policy<DerivedPolicy>&, ForwardIt, Sentinel, Un
                            "this algorithm is not implemented for the specified system");
   return {};
 }
+_CCCL_SUPPRESS_DEPRECATED_POP
 
 } // namespace unimplemented