Try #641:

pika-org · Mar 31, 2023 · 34ed14d · 34ed14d
2 parents 5ff20cc + 6d114b6
commit 34ed14d
Show file tree

Hide file tree

Showing 55 changed files with 154 additions and 160 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -231,7 +231,7 @@ jobs:
                 -DPIKA_WITH_PRECOMPILED_HEADERS=Off \
                 -DPIKA_WITH_MALLOC=system \
                 -DPIKA_WITH_MPI=ON \
-                -DPIKA_WITH_P2300_REFERENCE_IMPLEMENTATION=ON \
+                -DPIKA_WITH_STDEXEC=ON \
                 -DPIKA_WITH_EXAMPLES=On \
                 -DPIKA_WITH_TESTS=On \
                 -DPIKA_WITH_TESTS_HEADERS=On \

diff --git a/.jenkins/cscs-ault/env-hipcc.sh b/.jenkins/cscs-ault/env-hipcc.sh
@@ -22,4 +22,4 @@ configure_extra_options+=" -DCMAKE_HIP_ARCHITECTURES=gfx906:xnack-"
 configure_extra_options+=" -DPIKA_WITH_HIP=ON"
 configure_extra_options+=" -DPIKA_WITH_CXX_STANDARD=${cxx_std}"
 configure_extra_options+=" -DPIKA_WITH_MALLOC=system"
-configure_extra_options+=" -DPIKA_WITH_P2300_REFERENCE_IMPLEMENTATION=ON"
+configure_extra_options+=" -DPIKA_WITH_STDEXEC=ON"
diff --git a/.jenkins/cscs/env-clang-13.sh b/.jenkins/cscs/env-clang-13.sh
@@ -12,10 +12,10 @@ spack_compiler="clang@${clang_version}"
 spack_arch="cray-cnl7-broadwell"
 stdexec_version="6510f5bd69cc03b24668f26eda3dd3cca7e81bb2"
 
-spack_spec="pika@main arch=${spack_arch} %${spack_compiler} cxxflags=-stdlib=libc++ malloc=system cxxstd=${cxx_std} +p2300 ^boost@${boost_version} ^hwloc@${hwloc_version} ^fmt cxxflags=-stdlib=libc++ ^stdexec@${stdexec_version}"
+spack_spec="pika@main arch=${spack_arch} %${spack_compiler} cxxflags=-stdlib=libc++ malloc=system cxxstd=${cxx_std} +stdexec ^boost@${boost_version} ^hwloc@${hwloc_version} ^fmt cxxflags=-stdlib=libc++ ^stdexec@${stdexec_version}"
 
 configure_extra_options+=" -DCMAKE_CXX_FLAGS=-stdlib=libc++"
 configure_extra_options+=" -DPIKA_WITH_CXX_STANDARD=${cxx_std}"
 configure_extra_options+=" -DPIKA_WITH_MALLOC=system"
 configure_extra_options+=" -DPIKA_WITH_SPINLOCK_DEADLOCK_DETECTION=ON"
-configure_extra_options+=" -DPIKA_WITH_P2300_REFERENCE_IMPLEMENTATION=ON"
+configure_extra_options+=" -DPIKA_WITH_STDEXEC=ON"
diff --git a/.jenkins/cscs/env-clang-14-cuda.sh b/.jenkins/cscs/env-clang-14-cuda.sh
@@ -13,13 +13,13 @@ spack_compiler="clang@${clang_version}"
 spack_arch="cray-cnl7-haswell"
 stdexec_version="6510f5bd69cc03b24668f26eda3dd3cca7e81bb2"
 
-spack_spec="pika@main arch=${spack_arch} %${spack_compiler} +cuda malloc=system cxxstd=${cxx_std} +p2300 ^boost@${boost_version} ^cuda@${cuda_version} +allow-unsupported-compilers ^hwloc@${hwloc_version} ^stdexec@${stdexec_version}"
+spack_spec="pika@main arch=${spack_arch} %${spack_compiler} +cuda malloc=system cxxstd=${cxx_std} +stdexec ^boost@${boost_version} ^cuda@${cuda_version} +allow-unsupported-compilers ^hwloc@${hwloc_version} ^stdexec@${stdexec_version}"
 
 configure_extra_options+=" -DPIKA_WITH_CXX_STANDARD=${cxx_std}"
 configure_extra_options+=" -DPIKA_WITH_CUDA=ON"
 configure_extra_options+=" -DPIKA_WITH_MALLOC=system"
 configure_extra_options+=" -DPIKA_WITH_SPINLOCK_DEADLOCK_DETECTION=ON"
-configure_extra_options+=" -DPIKA_WITH_P2300_REFERENCE_IMPLEMENTATION=ON"
+configure_extra_options+=" -DPIKA_WITH_STDEXEC=ON"
 configure_extra_options+=" -DCMAKE_CUDA_COMPILER=c++"
 configure_extra_options+=" -DCMAKE_CUDA_ARCHITECTURES=60"
 

diff --git a/.jenkins/cscs/env-nvhpc.sh b/.jenkins/cscs/env-nvhpc.sh
@@ -18,4 +18,4 @@ configure_extra_options+=" -DPIKA_WITH_CXX_STANDARD=${cxx_std}"
 configure_extra_options+=" -DPIKA_WITH_MALLOC=system"
 configure_extra_options+=" -DPIKA_WITH_CUDA=ON"
 configure_extra_options+=" -DCMAKE_CUDA_ARCHITECTURES=60"
-configure_extra_options+=" -DPIKA_WITH_P2300_REFERENCE_IMPLEMENTATION=ON"
+configure_extra_options+=" -DPIKA_WITH_STDEXEC=ON"
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -991,12 +991,11 @@ if(PIKA_WITH_THREAD_DEBUG_INFO)
 endif()
 
 pika_option(
-  PIKA_WITH_P2300_REFERENCE_IMPLEMENTATION BOOL
-  "Use the P2300 reference implementation for sender/receiver functionality."
-  OFF CATEGORY "Advanced"
+  PIKA_WITH_STDEXEC BOOL "Use stdexec for sender/receiver functionality." OFF
+  CATEGORY "Advanced"
 )
-if(PIKA_WITH_P2300_REFERENCE_IMPLEMENTATION)
-  pika_add_config_define(PIKA_HAVE_P2300_REFERENCE_IMPLEMENTATION)
+if(PIKA_WITH_STDEXEC)
+  pika_add_config_define(PIKA_HAVE_STDEXEC)
 endif()
 
 # Developer tools
@@ -1310,8 +1309,8 @@ if(PIKA_WITH_COMPILER_WARNINGS)
   endif()
 endif()
 
-# GCC gives a bogus warning in the P2300 reference implementation
-if(PIKA_WITH_P2300_REFERENCE_IMPLEMENTATION AND CMAKE_COMPILER_IS_GNUCXX)
+# GCC gives a bogus warning in stdexec
+if(PIKA_WITH_STDEXEC AND CMAKE_COMPILER_IS_GNUCXX)
   pika_add_compile_flag_if_available(-Wno-non-template-friend)
 endif()
 

diff --git a/README.rst b/README.rst
@@ -47,9 +47,9 @@ pika optionally requires:
 * `HIP <https://rocmdocs.amd.com/en/latest/index.html>`_ 5.2.0 or greater
 * `MPI <https://www.mpi-forum.org/>`_
 * `Boost.Context, Thread, and Chrono <https://boost.org>`_ on macOS
-* `stdexec <https://github.com/NVIDIA/stdexec>`_ when
-  ``PIKA_WITH_P2300_REFERENCE_IMPLEMENTATION`` is enabled (currently tested with
-  commit `6510f5bd69cc03b24668f26eda3dd3cca7e81bb2
+* `stdexec <https://github.com/NVIDIA/stdexec>`_ when ``PIKA_WITH_STDEXEC`` is
+  enabled (currently tested with commit
+  `6510f5bd69cc03b24668f26eda3dd3cca7e81bb2
   <https://github.com/NVIDIA/stdexec/commit/6510f5bd69cc03b24668f26eda3dd3cca7e81bb2>`_).
   The integration is experimental.
 

diff --git a/cmake/pika_setup_stdexec.cmake b/cmake/pika_setup_stdexec.cmake
@@ -4,12 +4,12 @@
 # Distributed under the Boost Software License, Version 1.0. (See accompanying
 # file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-if(PIKA_WITH_P2300_REFERENCE_IMPLEMENTATION)
+if(PIKA_WITH_STDEXEC)
 
   if(PIKA_WITH_CXX_STANDARD LESS 20)
 
     pika_error(
-      "PIKA_WITH_P2300_REFERENCE_IMPLEMENTATION requires at least C++20 (PIKA_WITH_CXX_STANDARD is currently ${PIKA_WITH_CXX_STANDARD})"
+      "PIKA_WITH_STDEXEC requires at least C++20 (PIKA_WITH_CXX_STANDARD is currently ${PIKA_WITH_CXX_STANDARD})"
     )
 
   endif()

diff --git a/libs/pika/async_cuda/include/pika/async_cuda/cuda_scheduler.hpp b/libs/pika/async_cuda/include/pika/async_cuda/cuda_scheduler.hpp
@@ -109,7 +109,7 @@ namespace pika::cuda::experimental {
             cuda_scheduler_sender(cuda_scheduler_sender const&) = delete;
             cuda_scheduler_sender& operator=(cuda_scheduler_sender const&) = delete;
 
-#if defined(PIKA_HAVE_P2300_REFERENCE_IMPLEMENTATION)
+#if defined(PIKA_HAVE_STDEXEC)
             using completion_signatures = pika::execution::experimental::completion_signatures<
                 pika::execution::experimental::set_value_t()>;
 #else

diff --git a/libs/pika/async_cuda/include/pika/async_cuda/then_on_host.hpp b/libs/pika/async_cuda/include/pika/async_cuda/then_on_host.hpp
@@ -146,7 +146,7 @@ namespace pika::cuda::experimental {
             then_on_host_sender_type(then_on_host_sender_type const&) = default;
             then_on_host_sender_type& operator=(then_on_host_sender_type const&) = default;
 
-#if defined(PIKA_HAVE_P2300_REFERENCE_IMPLEMENTATION)
+#if defined(PIKA_HAVE_STDEXEC)
             template <typename... Ts>
             requires std::is_invocable_v<F, Ts...>
             using invoke_result_helper =

diff --git a/libs/pika/async_cuda/include/pika/async_cuda/then_with_stream.hpp b/libs/pika/async_cuda/include/pika/async_cuda/then_with_stream.hpp
@@ -162,7 +162,7 @@ namespace pika::cuda::experimental::then_with_stream_detail {
         then_with_cuda_stream_sender_type& operator=(
             then_with_cuda_stream_sender_type const&) = default;
 
-#if defined(PIKA_HAVE_P2300_REFERENCE_IMPLEMENTATION)
+#if defined(PIKA_HAVE_STDEXEC)
         template <typename... Ts>
         requires std::is_invocable_v<F, cuda_stream const&,
             std::add_lvalue_reference_t<std::decay_t<Ts>>...>
@@ -457,7 +457,7 @@ namespace pika::cuda::experimental::then_with_stream_detail {
                 using type = pika::util::detail::transform_t<Tuple, std::decay>;
             };
 
-#if defined(PIKA_HAVE_P2300_REFERENCE_IMPLEMENTATION)
+#if defined(PIKA_HAVE_STDEXEC)
             using ts_type = pika::util::detail::prepend_t<
                 pika::util::detail::transform_t<
                     pika::execution::experimental::value_types_of_t<std::decay_t<Sender>,
@@ -502,7 +502,7 @@ namespace pika::cuda::experimental::then_with_stream_detail {
             {
                 using type = pika::detail::monostate;
             };
-#if defined(PIKA_HAVE_P2300_REFERENCE_IMPLEMENTATION)
+#if defined(PIKA_HAVE_STDEXEC)
             using result_type = pika::util::detail::change_pack_t<pika::detail::variant,
                 pika::util::detail::unique_t<pika::util::detail::prepend_t<
                     pika::util::detail::transform_t<

diff --git a/libs/pika/async_cuda/tests/performance/synchronize.cu b/libs/pika/async_cuda/tests/performance/synchronize.cu
@@ -122,7 +122,7 @@ int pika_main(pika::program_options::variables_map& vm)
 
 // The compilation of this loop unrolling with llvm-amdgpu's
 // Clang 5.3.3 is hanging.
-#if !(defined(PIKA_HAVE_P2300_REFERENCE_IMPLEMENTATION) || defined(PIKA_HAVE_HIP))
+#if !(defined(PIKA_HAVE_STDEXEC) || defined(PIKA_HAVE_HIP))
     {
         cu::enable_user_polling poll("default");
 

diff --git a/libs/pika/async_cuda/tests/unit/cublas_matmul.cpp b/libs/pika/async_cuda/tests/unit/cublas_matmul.cpp
@@ -188,9 +188,9 @@ void matrixMultiply(pika::cuda::experimental::cuda_scheduler& cuda_sched, sMatri
 
     // See https://github.com/brycelelbach/wg21_p2300_std_execution/issues/466
     // for details.
-#if defined(PIKA_HAVE_P2300_REFERENCE_IMPLEMENTATION)
-    std::cout << "skipping remainder of test because the P2300 reference implementation of split "
-                 "does not yet support move-only senders"
+#if defined(PIKA_HAVE_STDEXEC)
+    std::cout << "skipping remainder of test because the stdexec implementation of split does not "
+                 "yet support move-only senders"
               << std::endl;
 #else
     pika::chrono::detail::high_resolution_timer t2;
@@ -353,7 +353,7 @@ int main(int argc, char** argv)
     pika::init_params init_args;
     init_args.desc_cmdline = cmdline;
 
-#if defined(PIKA_HAVE_P2300_REFERENCE_IMPLEMENTATION)
+#if defined(PIKA_HAVE_STDEXEC)
     PIKA_TEST(true);
 #endif
 

diff --git a/libs/pika/async_cuda/tests/unit/cuda_bulk.cu b/libs/pika/async_cuda/tests/unit/cuda_bulk.cu
@@ -77,7 +77,7 @@ int pika_main()
     }
 
     // The reference implementation does not support ranges as the shape
-#if !defined(PIKA_HAVE_P2300_REFERENCE_IMPLEMENTATION)
+#if !defined(PIKA_HAVE_STDEXEC)
     // Range
     for (element_type n : {1, 42, 10007})
     {

diff --git a/libs/pika/async_mpi/include/pika/async_mpi/transform_mpi.hpp b/libs/pika/async_mpi/include/pika/async_mpi/transform_mpi.hpp
@@ -97,7 +97,7 @@ namespace pika::mpi::experimental {
             std::decay_t<F> f;
             stream_type stream;
 
-#if defined(PIKA_HAVE_P2300_REFERENCE_IMPLEMENTATION)
+#if defined(PIKA_HAVE_STDEXEC)
             template <typename... Ts>
             requires is_mpi_request_invocable_v<F, Ts...>
             using invoke_result_helper = pika::execution::experimental::completion_signatures<
@@ -250,7 +250,7 @@ namespace pika::mpi::experimental {
                     using type = pika::util::detail::transform_t<Tuple, std::decay>;
                 };
 
-#if defined(PIKA_HAVE_P2300_REFERENCE_IMPLEMENTATION)
+#if defined(PIKA_HAVE_STDEXEC)
                 using ts_type = pika::util::detail::prepend_t<
                     pika::util::detail::transform_t<
                         pika::execution::experimental::value_types_of_t<std::decay_t<Sender>,
@@ -297,7 +297,7 @@ namespace pika::mpi::experimental {
                 {
                     using type = pika::detail::monostate;
                 };
-#if defined(PIKA_HAVE_P2300_REFERENCE_IMPLEMENTATION)
+#if defined(PIKA_HAVE_STDEXEC)
                 using result_type = pika::util::detail::change_pack_t<pika::detail::variant,
                     pika::util::detail::unique_t<pika::util::detail::prepend_t<
                         pika::util::detail::transform_t<

diff --git a/libs/pika/execution/include/pika/execution/algorithms/bulk.hpp b/libs/pika/execution/include/pika/execution/algorithms/bulk.hpp
@@ -9,8 +9,8 @@
 
 #include <pika/config.hpp>
 
-#if defined(PIKA_HAVE_P2300_REFERENCE_IMPLEMENTATION)
-# include <pika/execution_base/p2300_forward.hpp>
+#if defined(PIKA_HAVE_STDEXEC)
+# include <pika/execution_base/stdexec_forward.hpp>
 #else
 # include <pika/concepts/concepts.hpp>
 # include <pika/datastructures/variant.hpp>

diff --git a/libs/pika/execution/include/pika/execution/algorithms/drop_value.hpp b/libs/pika/execution/include/pika/execution/algorithms/drop_value.hpp
@@ -82,7 +82,7 @@ namespace pika::drop_value_detail {
 
         PIKA_NO_UNIQUE_ADDRESS std::decay_t<Sender> sender;
 
-#if defined(PIKA_HAVE_P2300_REFERENCE_IMPLEMENTATION)
+#if defined(PIKA_HAVE_STDEXEC)
         template <class...>
         using empty_set_value = pika::execution::experimental::completion_signatures<
             pika::execution::experimental::set_value_t()>;

diff --git a/libs/pika/execution/include/pika/execution/algorithms/ensure_started.hpp b/libs/pika/execution/include/pika/execution/algorithms/ensure_started.hpp
@@ -8,8 +8,8 @@
 
 #include <pika/config.hpp>
 
-#if defined(PIKA_HAVE_P2300_REFERENCE_IMPLEMENTATION)
-# include <pika/execution_base/p2300_forward.hpp>
+#if defined(PIKA_HAVE_STDEXEC)
+# include <pika/execution_base/stdexec_forward.hpp>
 #else
 # include <pika/allocator_support/allocator_deleter.hpp>
 # include <pika/allocator_support/internal_allocator.hpp>

diff --git a/libs/pika/execution/include/pika/execution/algorithms/execute.hpp b/libs/pika/execution/include/pika/execution/algorithms/execute.hpp
@@ -8,8 +8,8 @@
 
 #include <pika/config.hpp>
 
-#if defined(PIKA_HAVE_P2300_REFERENCE_IMPLEMENTATION)
-# include <pika/execution_base/p2300_forward.hpp>
+#if defined(PIKA_HAVE_STDEXEC)
+# include <pika/execution_base/stdexec_forward.hpp>
 #else
 # include <pika/execution/algorithms/start_detached.hpp>
 # include <pika/execution/algorithms/then.hpp>

diff --git a/libs/pika/execution/include/pika/execution/algorithms/just.hpp b/libs/pika/execution/include/pika/execution/algorithms/just.hpp
@@ -8,8 +8,8 @@
 
 #include <pika/config.hpp>
 
-#if defined(PIKA_HAVE_P2300_REFERENCE_IMPLEMENTATION)
-# include <pika/execution_base/p2300_forward.hpp>
+#if defined(PIKA_HAVE_STDEXEC)
+# include <pika/execution_base/stdexec_forward.hpp>
 #else
 # include <pika/datastructures/member_pack.hpp>
 # include <pika/errors/try_catch_exception_ptr.hpp>

diff --git a/libs/pika/execution/include/pika/execution/algorithms/let_error.hpp b/libs/pika/execution/include/pika/execution/algorithms/let_error.hpp
@@ -8,8 +8,8 @@
 
 #include <pika/config.hpp>
 
-#if defined(PIKA_HAVE_P2300_REFERENCE_IMPLEMENTATION)
-# include <pika/execution_base/p2300_forward.hpp>
+#if defined(PIKA_HAVE_STDEXEC)
+# include <pika/execution_base/stdexec_forward.hpp>
 #else
 # include <pika/assert.hpp>
 # include <pika/concepts/concepts.hpp>

diff --git a/libs/pika/execution/include/pika/execution/algorithms/let_value.hpp b/libs/pika/execution/include/pika/execution/algorithms/let_value.hpp
@@ -8,8 +8,8 @@
 
 #include <pika/config.hpp>
 
-#if defined(PIKA_HAVE_P2300_REFERENCE_IMPLEMENTATION)
-# include <pika/execution_base/p2300_forward.hpp>
+#if defined(PIKA_HAVE_STDEXEC)
+# include <pika/execution_base/stdexec_forward.hpp>
 #else
 # include <pika/assert.hpp>
 # include <pika/concepts/concepts.hpp>

diff --git a/libs/pika/execution/include/pika/execution/algorithms/make_future.hpp b/libs/pika/execution/include/pika/execution/algorithms/make_future.hpp
@@ -8,8 +8,8 @@
 
 #include <pika/config.hpp>
 
-#if defined(PIKA_HAVE_P2300_REFERENCE_IMPLEMENTATION)
-# include <pika/execution_base/p2300_forward.hpp>
+#if defined(PIKA_HAVE_STDEXEC)
+# include <pika/execution_base/stdexec_forward.hpp>
 #endif
 
 #include <pika/allocator_support/allocator_deleter.hpp>
@@ -185,7 +185,7 @@ namespace pika::make_future_detail {
     {
         using allocator_type = Allocator;
 
-#if defined(PIKA_HAVE_P2300_REFERENCE_IMPLEMENTATION)
+#if defined(PIKA_HAVE_STDEXEC)
         using value_types =
             typename pika::execution::experimental::value_types_of_t<std::decay_t<Sender>,
                 pika::execution::experimental::empty_env, pika::util::detail::pack,

diff --git a/libs/pika/execution/include/pika/execution/algorithms/schedule_from.hpp b/libs/pika/execution/include/pika/execution/algorithms/schedule_from.hpp
@@ -8,8 +8,8 @@
 
 #include <pika/config.hpp>
 
-#if defined(PIKA_HAVE_P2300_REFERENCE_IMPLEMENTATION)
-# include <pika/execution_base/p2300_forward.hpp>
+#if defined(PIKA_HAVE_STDEXEC)
+# include <pika/execution_base/stdexec_forward.hpp>
 #else
 # include <pika/concepts/concepts.hpp>
 # include <pika/datastructures/variant.hpp>

diff --git a/libs/pika/execution/include/pika/execution/algorithms/split.hpp b/libs/pika/execution/include/pika/execution/algorithms/split.hpp
@@ -8,8 +8,8 @@
 
 #include <pika/config.hpp>
 
-#if defined(PIKA_HAVE_P2300_REFERENCE_IMPLEMENTATION)
-# include <pika/execution_base/p2300_forward.hpp>
+#if defined(PIKA_HAVE_STDEXEC)
+# include <pika/execution_base/stdexec_forward.hpp>
 #else
 # include <pika/allocator_support/allocator_deleter.hpp>
 # include <pika/allocator_support/internal_allocator.hpp>

diff --git a/libs/pika/execution/include/pika/execution/algorithms/split_tuple.hpp b/libs/pika/execution/include/pika/execution/algorithms/split_tuple.hpp
@@ -74,7 +74,7 @@ namespace pika::split_tuple_detail {
         std::optional<operation_state_type> os;
 
         // nvcc does not like decay_t, so this uses decay<>::type instead.
-#if defined(PIKA_HAVE_P2300_REFERENCE_IMPLEMENTATION)
+#if defined(PIKA_HAVE_STDEXEC)
         using value_type = typename std::decay<
             pika::execution::experimental::detail::single_result_t<typename pika::execution::
                     experimental::value_types_of_t<Sender, pika::execution::experimental::empty_env,
@@ -86,7 +86,7 @@ namespace pika::split_tuple_detail {
                     pika::util::detail::pack, pika::util::detail::pack>>>::type;
 #endif
 
-#if defined(PIKA_HAVE_P2300_REFERENCE_IMPLEMENTATION)
+#if defined(PIKA_HAVE_STDEXEC)
         using error_type = pika::util::detail::unique_t<pika::util::detail::prepend_t<
             pika::util::detail::transform_t<
                 typename pika::execution::experimental::error_types_of_t<Sender,
@@ -132,7 +132,7 @@ namespace pika::split_tuple_detail {
                 // This typedef is duplicated from the parent struct. The
                 // parent typedef is not instantiated early enough for use
                 // here.
-#if defined(PIKA_HAVE_P2300_REFERENCE_IMPLEMENTATION)
+#if defined(PIKA_HAVE_STDEXEC)
             using value_type =
                 typename std::decay<pika::execution::experimental::detail::single_result_t<
                     typename pika::execution::experimental::value_types_of_t<Sender,
@@ -197,7 +197,7 @@ namespace pika::split_tuple_detail {
             void operator()(pika::execution::detail::stopped_type)
             {
                 constexpr bool sends_stopped =
-#if defined(PIKA_HAVE_P2300_REFERENCE_IMPLEMENTATION)
+#if defined(PIKA_HAVE_STDEXEC)
                     pika::execution::experimental::sends_stopped<Sender,
                         pika::execution::experimental::empty_env>
 #else
@@ -388,7 +388,7 @@ namespace pika::split_tuple_detail {
         using shared_state_type = shared_state<Sender, Allocator>;
 
         // nvcc does not like decay_t, so this uses decay<>::type instead.
-#if defined(PIKA_HAVE_P2300_REFERENCE_IMPLEMENTATION)
+#if defined(PIKA_HAVE_STDEXEC)
         using value_type = typename std::decay<
             pika::execution::experimental::detail::single_result_t<typename pika::execution::
                     experimental::value_types_of_t<Sender, pika::execution::experimental::empty_env,
@@ -409,7 +409,7 @@ namespace pika::split_tuple_detail {
             using type = std::add_lvalue_reference_t<std::add_const_t<T>>;
         };
 
-#if defined(PIKA_HAVE_P2300_REFERENCE_IMPLEMENTATION)
+#if defined(PIKA_HAVE_STDEXEC)
         template <typename...>
         using set_value_helper = pika::execution::experimental::completion_signatures<
             pika::execution::experimental::set_value_t(split_tuple_sender_value_type)>;
@@ -523,7 +523,7 @@ namespace pika::split_tuple_detail {
         pika::intrusive_ptr<shared_state_type> state = p.release();
 
         // nvcc does not like decay_t, so this uses decay<>::type instead.
-#if defined(PIKA_HAVE_P2300_REFERENCE_IMPLEMENTATION)
+#if defined(PIKA_HAVE_STDEXEC)
         using value_type = typename std::decay<
             pika::execution::experimental::detail::single_result_t<typename pika::execution::
                     experimental::value_types_of_t<Sender, pika::execution::experimental::empty_env,