Merge branch 'main' into misc-tweaks

Author: ericniebler

CMakeLists.txt

@@ -151,6 +151,23 @@ set(stdexec_export_targets)
 # Define the main library
 add_library(stdexec INTERFACE)
 
+file(GLOB_RECURSE exec_headers CONFIGURE_DEPENDS include/exec/*.hpp)
+file(GLOB_RECURSE stdexec_headers CONFIGURE_DEPENDS include/stdexec/*.hpp)
+target_sources(stdexec
+PUBLIC
+  FILE_SET headers
+  TYPE HEADERS
+  BASE_DIRS include
+  FILES
+    ${exec_headers}
+    ${stdexec_headers}
+  # stdexec_version_config.hpp is generated by rapids' script
+  FILE_SET version_config
+  TYPE HEADERS
+  BASE_DIRS ${CMAKE_BINARY_DIR}/include
+  FILES
+    ${CMAKE_BINARY_DIR}/include/stdexec_version_config.hpp
+)
 list(APPEND stdexec_export_targets stdexec)
 
 # Set library version
@@ -160,10 +177,6 @@ set_target_properties(stdexec PROPERTIES
 
 # Declare the public include directories
 include(GNUInstallDirs)
-target_include_directories(stdexec INTERFACE
-                           $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/>
-                           $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
-                           )
 
 target_link_libraries(stdexec INTERFACE Threads::Threads)
 
@@ -269,9 +282,15 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "NVHPC")
 endif()
 
 if(STDEXEC_ENABLE_CUDA)
-
-    file(GLOB_RECURSE nvexec_sources include/nvexec/*.cuh)
-    add_library(nvexec INTERFACE ${nvexec_sources})
+    file(GLOB_RECURSE nvexec_headers CONFIGURE_DEPENDS include/nvexec/*.cuh)
+    add_library(nvexec INTERFACE)
+    target_sources(nvexec
+    PUBLIC
+      FILE_SET headers
+      TYPE HEADERS
+      BASE_DIRS include
+      FILES ${nvexec_headers}
+    )
     list(APPEND stdexec_export_targets nvexec)
     add_library(STDEXEC::nvexec ALIAS nvexec)
 
@@ -283,6 +302,10 @@ if(STDEXEC_ENABLE_CUDA)
     target_link_options(nvexec INTERFACE
       $<$<AND:$<CXX_COMPILER_ID:NVHPC>,$<COMPILE_LANGUAGE:CXX>>:-stdpar -gpu=cc${CMAKE_CUDA_ARCHITECTURES}>)
 
+    install(TARGETS nvexec
+        EXPORT stdexec-exports
+        FILE_SET headers)
+
     if(NOT (CMAKE_CXX_COMPILER_ID STREQUAL "NVHPC"))
         include(rapids-cuda)
         # Needs to run before `enable_language(CUDA)`
@@ -330,16 +353,29 @@ if (STDEXEC_ENABLE_TBB)
         INSTALL_EXPORT_SET stdexec-exports
     )
 
-    file(GLOB_RECURSE tbbpool_sources include/execpools/tbb/*.hpp)
-    add_library(tbbpool INTERFACE ${tbbpool_sources})
+    # CONFIGURE_DEPENDS ensures that CMake reconfigures when a relevant hpp file is
+    # added or removed.
+    file(GLOB_RECURSE tbbpool_headers CONFIGURE_DEPENDS include/execpools/tbb/*.hpp)
+    add_library(tbbpool INTERFACE)
     list(APPEND stdexec_export_targets tbbpool)
     add_library(STDEXEC::tbbpool ALIAS tbbpool)
+    target_sources(tbbpool
+    PUBLIC
+      FILE_SET headers
+      TYPE HEADERS
+      BASE_DIRS include
+      FILES ${tbbpool_headers}
+    )
 
     target_link_libraries(tbbpool
         INTERFACE
         STDEXEC::stdexec
         TBB::tbb
         )
+
+    install(TARGETS tbbpool
+        EXPORT stdexec-exports
+        FILE_SET headers)
 endif()
 
 option(STDEXEC_ENABLE_TASKFLOW "Enable TaskFlow targets" OFF)
@@ -435,10 +471,6 @@ endif()
 
 set(SYSTEM_CONTEXT_SOURCES src/system_context/system_context.cpp)
 add_library(system_context STATIC ${SYSTEM_CONTEXT_SOURCES})
-target_include_directories(system_context PRIVATE
-                           $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/>
-                           $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
-                           )
 target_compile_features(system_context PUBLIC cxx_std_20)
 set_target_properties(system_context PROPERTIES
     CXX_STANDARD 20
@@ -448,7 +480,7 @@ target_compile_options(system_context PUBLIC
     $<$<COMPILE_LANG_AND_ID:CXX,MSVC>:/Zc:__cplusplus /Zc:preprocessor>
     )
 add_library(STDEXEC::system_context ALIAS system_context)
-
+target_link_libraries(system_context PUBLIC stdexec)
 
 
 if(CMAKE_CROSSCOMPILING)
@@ -499,16 +531,9 @@ endif()
 include(CPack)
 
 install(TARGETS stdexec system_context
-        DESTINATION ${CMAKE_INSTALL_LIBDIR}
-        EXPORT stdexec-exports)
-
-install(
-  DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/
-  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
-
-install(
-  FILES ${CMAKE_CURRENT_BINARY_DIR}/include/stdexec_version_config.hpp
-  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+	EXPORT stdexec-exports
+	FILE_SET headers
+	FILE_SET version_config)
 
 ##############################################################################
 # Install exports ------------------------------------------------------------

include/exec/any_sender_of.hpp

@@ -567,8 +567,13 @@ namespace exec {
       }
     };
 
-    template <class _VTable = __empty_vtable, class _Allocator = std::allocator<std::byte>>
-    using __immovable_storage_t = __t<__immovable_storage<_VTable, _Allocator>>;
+    template <
+      class _VTable = __empty_vtable,
+      class _Allocator = std::allocator<std::byte>,
+      std::size_t _InlineSize = 3 * sizeof(void*),
+      std::size_t _Alignment = alignof(std::max_align_t)>
+    using __immovable_storage_t =
+      __t<__immovable_storage<_VTable, _Allocator, _InlineSize, _Alignment>>;
 
     template <class _VTable, class _Allocator = std::allocator<std::byte>>
     using __unique_storage_t = __t<__storage<_VTable, _Allocator>>;
@@ -791,7 +796,8 @@ namespace exec {
       }
     };
 
-    using __immovable_operation_storage = __immovable_storage_t<__operation_vtable>;
+    using __immovable_operation_storage =
+      __immovable_storage_t<__operation_vtable, std::allocator<std::byte>, 6 * sizeof(void*)>;
 
     template <class _Sigs, class _Queries>
     using __receiver_ref = __mapply<__mbind_front<__q<__rec::__ref>, _Sigs>, _Queries>;
@@ -1205,6 +1211,7 @@ namespace exec {
 
       template <auto... _SchedulerQueries>
       class any_scheduler {
+        // Add the required set_value_t() completions to the schedule-sender.
         using __schedule_completions = stdexec::__concat_completion_signatures<
           _Completions,
           stdexec::completion_signatures<stdexec::set_value_t()>>;
@@ -1216,10 +1223,11 @@ namespace exec {
         template <class _Tag>
         struct __ret_equals_to {
           template <class _Sig>
-          using __f = std::is_same<_Tag, decltype(__ret_fn(static_cast<_Sig>(nullptr)))>;
+          using __f =
+            stdexec::__mbool<STDEXEC_IS_SAME(_Tag, decltype(__ret_fn(static_cast<_Sig>(nullptr))))>;
         };
 
-        using schedule_sender_queries = stdexec::__minvoke<
+        using __schedule_sender_queries = stdexec::__minvoke<
           stdexec::__mremove_if<
             __ret_equals_to<stdexec::get_completion_scheduler_t<stdexec::set_value_t>>>,
           decltype(_SenderQueries)...>;
@@ -1238,7 +1246,7 @@ namespace exec {
           stdexec::get_completion_scheduler<stdexec::set_value_t>.template signature<any_scheduler() noexcept>>;
 #endif
         using __schedule_sender =
-          stdexec::__mapply<stdexec::__q<__schedule_sender_fn>, schedule_sender_queries>;
+          stdexec::__mapply<stdexec::__q<__schedule_sender_fn>, __schedule_sender_queries>;
 
         using __scheduler_base =
           __any::__scheduler<__schedule_sender, queries<_SchedulerQueries...>>;

include/exec/task.hpp

@@ -38,10 +38,14 @@ namespace exec {
   namespace __task {
     using namespace stdexec;
 
-    using __any_scheduler =                                                     //
-      any_receiver_ref<                                                         //
-        completion_signatures<set_error_t(std::exception_ptr), set_stopped_t()> //
-        >::any_sender<>::any_scheduler<>;
+    // The required set_value_t() scheduler-sender completion signature is added in
+    // any_receiver_ref::any_sender::any_scheduler.
+    using __any_scheduler_completions =
+      completion_signatures<set_error_t(std::exception_ptr), set_stopped_t()>;
+
+    using __any_scheduler =
+      any_receiver_ref<__any_scheduler_completions>::any_sender<>::any_scheduler<>;
+
     static_assert(scheduler<__any_scheduler>);
 
     template <class _Ty>