fixing minor errrors

Author: Sai Charan

libs/core/executors/include/hpx/executors/scheduler_executor.hpp

@@ -198,6 +198,7 @@ namespace hpx::execution::experimental {
         }
 
         // BulkTwoWayExecutor interface
+#if defined(HPX_HAVE_STDEXEC)
         // clang-format off
         template <typename F, typename S, typename... Ts,
             HPX_CONCEPT_REQUIRES_(
@@ -214,7 +215,7 @@ namespace hpx::execution::experimental {
 
             if constexpr (std::is_void_v<result_type>)
             {
-                return make_future(bulk(schedule(exec.sched_), shape,
+                return make_future(bulk(schedule(exec.sched_), stdexec::par, shape,
                     hpx::bind_back(HPX_FORWARD(F, f), HPX_FORWARD(Ts, ts)...)));
             }
             else
@@ -253,12 +254,14 @@ namespace hpx::execution::experimental {
                 start_detached(
                     bulk(transfer_just(exec.sched_, HPX_MOVE(promises),
                              HPX_FORWARD(F, f), shape, HPX_FORWARD(Ts, ts)...),
-                        n, HPX_MOVE(f_helper)));
+                        stdexec::par, n, HPX_MOVE(f_helper)));
 
                 return results;
             }
         }
+#endif
 
+#if defined(HPX_HAVE_STDEXEC)
         // clang-format off
         template <typename F, typename S, typename... Ts,
             HPX_CONCEPT_REQUIRES_(
@@ -270,10 +273,12 @@ namespace hpx::execution::experimental {
             scheduler_executor const& exec, F&& f, S const& shape, Ts&&... ts)
         {
             hpx::this_thread::experimental::sync_wait(
-                bulk(schedule(exec.sched_), shape,
+                bulk(schedule(exec.sched_), stdexec::par, shape,
                     hpx::bind_back(HPX_FORWARD(F, f), HPX_FORWARD(Ts, ts)...)));
         }
+#endif
 
+#if defined(HPX_HAVE_STDEXEC)
         // clang-format off
         template <typename F, typename S, typename Future, typename... Ts,
             HPX_CONCEPT_REQUIRES_(
@@ -295,8 +300,8 @@ namespace hpx::execution::experimental {
                 auto pre_req =
                     when_all(keep_future(HPX_FORWARD(Future, predecessor)));
 
-                auto loop = bulk(transfer(HPX_MOVE(pre_req), exec.sched_),
-                    shape,
+                auto loop = bulk(continues_on(HPX_MOVE(pre_req), exec.sched_),
+                    stdexec::par, shape,
                     hpx::bind_back(HPX_FORWARD(F, f), HPX_FORWARD(Ts, ts)...));
 
                 return make_future(HPX_MOVE(loop));
@@ -309,7 +314,7 @@ namespace hpx::execution::experimental {
                         just(std::vector<result_type>(hpx::util::size(shape))));
 
                 auto loop =
-                    bulk(transfer(HPX_MOVE(pre_req), exec.sched_), shape,
+                    bulk(continues_on(HPX_MOVE(pre_req), exec.sched_), stdexec::par, shape,
                         detail::captured_args_then(
                             HPX_FORWARD(F, f), HPX_FORWARD(Ts, ts)...));
 
@@ -319,6 +324,7 @@ namespace hpx::execution::experimental {
                     }));
             }
         }
+#endif
 
     private:
         std::decay_t<BaseScheduler> sched_;

libs/core/executors/include/hpx/executors/thread_pool_scheduler.hpp

@@ -438,6 +438,7 @@ namespace hpx::execution::experimental {
 #endif
         };
 
+#if defined(HPX_HAVE_STDEXEC)
         friend constexpr hpx::execution::experimental::
             forward_progress_guarantee
             tag_invoke(
@@ -455,6 +456,7 @@ namespace hpx::execution::experimental {
                     forward_progress_guarantee::concurrent;
             }
         }
+#endif
 
         friend constexpr sender<thread_pool_policy_scheduler> tag_invoke(
             hpx::execution::experimental::schedule_t,

libs/core/executors/include/hpx/executors/thread_pool_scheduler_bulk.hpp

@@ -786,7 +786,7 @@ namespace hpx::execution::experimental::detail {
             hpx::util::cache_aligned_data<std::atomic<std::size_t>>
                 tasks_remaining;
 
-            using value_types = value_types_of_t<Sender, empty_env,
+            using value_types = value_types_of_t<Sender, stdexec::env<>,
                 decayed_tuple, hpx::variant>;
             hpx::util::detail::prepend_t<value_types, hpx::monostate> ts;
             std::atomic<bool> bad_alloc_thrown{false};

libs/core/executors/tests/regressions/bulk_sync_wait.cpp

@@ -17,6 +17,7 @@ namespace tt = hpx::this_thread::experimental;
 
 int hpx_main()
 {
+#if defined(HPX_HAVE_STDEXEC)
     std::atomic<bool> called = false;
 
     ex::thread_pool_scheduler sch{};
@@ -27,6 +28,7 @@ int hpx_main()
     tt::sync_wait(s);
 
     HPX_TEST(called.load());
+#endif
 
     return hpx::local::finalize();
 }