Merge branch 'NVIDIA:main' into main

Author: ericniebler

.clang-format

@@ -28,7 +28,7 @@ AlwaysBreakAfterReturnType: None
 AlwaysBreakBeforeMultilineStrings: false
 AlwaysBreakTemplateDeclarations: Yes
 AttributeMacros: [
-  STDEXEC_SYSTEM_CONTEXT_INLINE
+  STDEXEC_PARALLEL_SCHEDULER_INLINE
   STDEXEC_IMMOVABLE_NO_UNIQUE_ADDRESS
 ]
 BinPackArguments: false
@@ -71,7 +71,9 @@ EmptyLineAfterAccessModifier: Never
 EmptyLineBeforeAccessModifier: Leave
 FixNamespaceComments: true
 IfMacros: [
-  'STDEXEC_CATCH'
+  'STDEXEC_CATCH',
+  'STDEXEC_IF_CONSTEVAL',
+  'STDEXEC_IF_NOT_CONSTEVAL'
 ]
 IncludeBlocks: Preserve
 IndentAccessModifiers: false

.clang-tidy

@@ -11,11 +11,11 @@ ImplementationFileExtensions:
   - cpp
   - cu
 HeaderFilterRegex: '^.*[.](h|hpp|cuh)$'
-ExcludeHeaderFilterRegex: '^.*__system_context_default_impl_entry[.]hpp$'
+ExcludeHeaderFilterRegex: '^.*__parallel_scheduler_default_impl_entry[.]hpp$'
 FormatStyle:     none
 User:            eniebler
 ExtraArgsBefore: [
-  '-DSTDEXEC_SYSTEM_CONTEXT_HEADER_ONLY=1',
+  '-DSTDEXEC_PARALLEL_SCHEDULER_HEADER_ONLY=1',
   '-DSTDEXEC_CLANG_TIDY_INVOKED=1',
 ]
 CheckOptions:

.clangd

@@ -21,10 +21,10 @@ CompileFlags:
 
 # The following file assumes a define.
 If:
-  PathMatch: .*/__system_context_default_impl_entry\.hpp
+  PathMatch: .*/__parallel_scheduler_default_impl_entry\.hpp
 CompileFlags:
   Add:
-    - "-DSTDEXEC_SYSTEM_CONTEXT_INLINE=inline"
+    - "-DSTDEXEC_PARALLEL_SCHEDULER_INLINE=inline"
 
 ---
 

.github/workflows/ci.cpu.yml

@@ -24,14 +24,16 @@ jobs:
           - { name: "CPU (clang 16, Debug, TSAN)",   build: "Debug",   tag: llvm16-cuda12.9, cxxstd: "20", cxxflags: "-fsanitize=thread" }
           - { name: "CPU (clang 16, Release)",       build: "Release", tag: llvm16-cuda12.9, cxxstd: "20", cxxflags: "-stdlib=libc++" }
           - { name: "CPU (clang 16, Release, ASAN)", build: "Release", tag: llvm16-cuda12.9, cxxstd: "20", cxxflags: "-stdlib=libc++ -fsanitize=address -fsanitize-ignorelist=/home/coder/stdexec/sanitizer-ignorelist.txt" }
-          - { name: "CPU (gcc 11, Debug)",           build: "Debug",   tag: gcc11-cuda12.9,  cxxstd: "20", cxxflags: "", }
-          - { name: "CPU (gcc 11, Release)",         build: "Release", tag: gcc11-cuda12.9,  cxxstd: "20", cxxflags: "", }
-          - { name: "CPU (gcc 11, Release, ASAN)",   build: "Release", tag: gcc11-cuda12.9,  cxxstd: "20", cxxflags: "-fsanitize=address" }
+          - { name: "CPU (gcc 12, Debug)",           build: "Debug",   tag: gcc12-cuda12.9,  cxxstd: "20", cxxflags: "", }
+          - { name: "CPU (gcc 12, Release)",         build: "Release", tag: gcc12-cuda12.9,  cxxstd: "20", cxxflags: "", }
+          # With the following config, 2 tests mysteriously time out, but only in CI and not locally.
+          # - { name: "CPU (gcc 12, Release, ASAN)",   build: "Release", tag: gcc12-cuda12.9,  cxxstd: "20", cxxflags: "-fsanitize=address" }
           - { name: "CPU (gcc 12, Release, TSAN)",   build: "Release", tag: gcc12-cuda12.9,  cxxstd: "20", cxxflags: "-fsanitize=thread" }
           - { name: "CPU (gcc 13, Debug)",           build: "Debug",   tag: gcc13-cuda12.9,  cxxstd: "20", cxxflags: "", }
           - { name: "CPU (gcc 14, Debug)",           build: "Debug",   tag: gcc14-cuda12.9,  cxxstd: "20", cxxflags: "", }
           - { name: "CPU (gcc 14, Debug, ASAN)",     build: "Debug",   tag: gcc14-cuda12.9,  cxxstd: "20", cxxflags: "-fsanitize=address" }
           - { name: "CPU (gcc 14, Debug, TSAN)",     build: "Debug",   tag: gcc14-cuda12.9,  cxxstd: "20", cxxflags: "-fsanitize=thread" }
+          - { name: "CPU (gcc 14, Release, ASAN)",   build: "Release", tag: gcc14-cuda12.9,  cxxstd: "20", cxxflags: "-fsanitize=address" }
           - { name: "CPU (gcc 14, Release, LEAK)",   build: "Release", tag: gcc14-cuda12.9,  cxxstd: "20", cxxflags: "-fsanitize=leak", }
           - { name: "CPU (gcc 14, Release, c++23)",  build: "Release", tag: gcc14-cuda12.9,  cxxstd: "23", cxxflags: "", }
     container:

.github/workflows/style.yml

@@ -23,4 +23,5 @@ jobs:
       - run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
       - shell: bash
         run: |
+          clang-format-21 --version
           git ls-files '*.[ch]' '*.[ch]pp' '*.cu' '*.cuh' | xargs clang-format-21 --dry-run --Werror

.github/workflows/test-windows.ps1

@@ -24,6 +24,7 @@ Invoke-NativeCommand cmake -B $BuildDirectory -G Ninja `
 	"-DCMAKE_MSVC_DEBUG_INFORMATION_FORMAT:STRING=Embedded" `
 	"-DSTDEXEC_ENABLE_ASIO:BOOL=TRUE" `
 	"-DSTDEXEC_ASIO_IMPLEMENTATION:STRING=boost" `
+	"-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON" `
 	"-DSTDEXEC_BUILD_TESTS:BOOL=TRUE" .
 Invoke-NativeCommand cmake --build $BuildDirectory
 Invoke-NativeCommand ctest --test-dir $BuildDirectory --output-on-failure --verbose --timeout 60

CMakeLists.txt

@@ -91,8 +91,9 @@ rapids_cmake_build_type(Release)
 
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules")
 
-# Disable the tests by default unless it is the top level project and build testing was specified.
-if (STDEXEC_MAIN_PROJECT AND BUILD_TESTING)
+# Disable the tests by default unless it is the top level project or build testing was
+# specified.
+if (STDEXEC_MAIN_PROJECT OR BUILD_TESTING)
     set(STDEXEC_BUILD_TESTS_DEFAULT ON)
 else()
     set(STDEXEC_BUILD_TESTS_DEFAULT OFF)
@@ -108,6 +109,7 @@ set(BUILD_TESTING ${STDEXEC_BUILD_TESTS})
 if (STDEXEC_BUILD_TESTS)
   # CTest automatically calls enable_testing() if BUILD_TESTING is ON
   # https://cmake.org/cmake/help/latest/module/CTest.html#module:CTest
+  list(APPEND CMAKE_CTEST_ARGUMENTS "--output-on-failure")
   include(CTest)
 endif()
 
@@ -434,23 +436,29 @@ if (STDEXEC_ENABLE_NUMA)
   target_compile_definitions(stdexec INTERFACE STDEXEC_ENABLE_NUMA)
 endif()
 
-option(STDEXEC_BUILD_SYSTEM_CONTEXT "Build the system_context compiled library" OFF)
+option(STDEXEC_BUILD_PARALLEL_SCHEDULER "Build the parallel_scheduler compiled library" OFF)
+if (DEFINED STDEXEC_BUILD_SYSTEM_CONTEXT)
+  message(DEPRECATION "STDEXEC_BUILD_SYSTEM_CONTEXT is deprecated. Use STDEXEC_BUILD_PARALLEL_SCHEDULER instead.")
+  set(STDEXEC_BUILD_PARALLEL_SCHEDULER ${STDEXEC_BUILD_SYSTEM_CONTEXT})
+endif()
 
-if(STDEXEC_BUILD_SYSTEM_CONTEXT)
-  set(SYSTEM_CONTEXT_SOURCES src/system_context/system_context.cpp)
-  add_library(system_context ${SYSTEM_CONTEXT_SOURCES})
-  target_compile_features(system_context PUBLIC cxx_std_20)
-  set_target_properties(system_context PROPERTIES
+if(STDEXEC_BUILD_PARALLEL_SCHEDULER)
+  set(STDEXEC_PARALLEL_SCHEDULER_SOURCES src/parallel_scheduler/parallel_scheduler.cpp)
+  add_library(parallel_scheduler ${STDEXEC_PARALLEL_SCHEDULER_SOURCES})
+  target_compile_features(parallel_scheduler PUBLIC cxx_std_20)
+  set_target_properties(parallel_scheduler PROPERTIES
       CXX_STANDARD 20
       CXX_STANDARD_REQUIRED ON
       CXX_EXTENSIONS OFF)
-  target_compile_options(system_context PUBLIC
+  target_compile_options(parallel_scheduler PUBLIC
       $<$<COMPILE_LANG_AND_ID:CXX,MSVC>:/Zc:__cplusplus /Zc:preprocessor /Zc:externConstexpr>
       )
-  add_library(STDEXEC::system_context ALIAS system_context)
-  target_link_libraries(system_context PUBLIC stdexec)
-endif()
+  target_link_libraries(parallel_scheduler PUBLIC stdexec)
 
+  add_library(STDEXEC::parallel_scheduler ALIAS parallel_scheduler)
+  add_library(system_context ALIAS parallel_scheduler)
+  add_library(STDEXEC::system_context ALIAS parallel_scheduler)
+endif()
 
 option(STDEXEC_ENABLE_IO_URING "Enable the use of the io_uring scheduler on Linux" OFF)
 
@@ -516,8 +524,8 @@ if(STDEXEC_INSTALL)
 	include(CPack)
 
   set(stdexec_install_targets stdexec)
-  if(STDEXEC_BUILD_SYSTEM_CONTEXT)
-    list(APPEND stdexec_install_targets system_context)
+  if(STDEXEC_BUILD_PARALLEL_SCHEDULER)
+    list(APPEND stdexec_install_targets parallel_scheduler)
   endif()
 
   install(TARGETS ${stdexec_install_targets}

CODE_OF_CONDUCT.md

@@ -0,0 +1,85 @@
+# Contributor Covenant Code of Conduct
+
+## Overview
+
+Define the code of conduct followed and enforced for __STDEXEC__.
+
+### Intended audience
+
+Community | Developers | Project Leads
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, sex characteristics, gender identity and expression,
+level of experience, education, socio-economic status, nationality, personal
+appearance, race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+  advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+  address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting GitHub_Conduct@nvidia.com. All complaints will be reviewed and
+investigated and will result in a response that is deemed necessary and appropriate
+to the circumstances. The project team is obligated to maintain confidentiality with
+regard to the reporter of an incident. Further details of specific enforcement policies
+may be posted separately. 
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see
+https://www.contributor-covenant.org/faq
+

README.md

@@ -97,7 +97,7 @@ below](#nvhpc-sdk) for more details).
 `stdexec` requires compiling with C++20 (`-std=c++20`) but otherwise does not have any
 dependencies and only requires a sufficiently new compiler:
 
-- gcc 11+
+- gcc 12+
 - clang 16+
 - MSVC 14.43+
 - XCode 16+

conanfile.py

@@ -15,10 +15,13 @@ class StdexecPackage(ConanFile):
 
   settings = "os", "arch", "compiler", "build_type"
   options = {
+    # Legacy name for backward compatibility. Use parallel_scheduler instead.
     "system_context": [True, False],
+    "parallel_scheduler": [True, False],
   }
   default_options = {
     "system_context": False,
+    "parallel_scheduler": False,
   }
   exports_sources = (
     "include/*",
@@ -32,6 +35,8 @@ class StdexecPackage(ConanFile):
 
   def configure(self):
     if self.options.system_context:
+      self.options.parallel_scheduler = True
+    if self.options.parallel_scheduler:
       self.package_type = "static-library"
     else:
       self.package_type = "header-library"
@@ -49,19 +54,19 @@ def layout(self):
 
   def build(self):
     tests = "OFF" if self.conf.get("tools.build:skip_test", default=False) else "ON"
-    system_context = "ON" if self.options.system_context else "OFF"
+    parallel_scheduler = "ON" if self.options.parallel_scheduler else "OFF"
 
     cmake = CMake(self)
     cmake.configure(variables={
       "STDEXEC_BUILD_TESTS": tests,
       "STDEXEC_BUILD_EXAMPLES": tests,
-      "STDEXEC_BUILD_SYSTEM_CONTEXT": system_context,
+      "STDEXEC_BUILD_PARALLEL_SCHEDULER": parallel_scheduler,
     })
     cmake.build()
     cmake.test()
 
   def package_id(self):
-    if not self.info.options.system_context:
+    if not self.info.options.parallel_scheduler:
       # Clear settings because this package is header-only.
       self.info.clear()
 
@@ -73,8 +78,8 @@ def package_info(self):
     self.cpp_info.set_property("cmake_file_name", "P2300")
     self.cpp_info.set_property("cmake_target_name", "P2300::P2300")
     self.cpp_info.set_property("cmake_target_aliases", ["STDEXEC::stdexec"])
-    if self.options.system_context:
-      self.cpp_info.components["system_context"].libs = ["system_context"]
-      self.cpp_info.components["system_context"].set_property(
-        "cmake_target_name", "STDEXEC::system_context"
+    if self.options.parallel_scheduler:
+      self.cpp_info.components["parallel_scheduler"].libs = ["parallel_scheduler"]
+      self.cpp_info.components["parallel_scheduler"].set_property(
+        "cmake_target_name", "STDEXEC::parallel_scheduler"
       )