WIP [skip-vdc][skip-docs][skip-tpt]

Author: alliepiper

.gersemirc

@@ -5,7 +5,8 @@ definitions: [
   "cmake/", # CCCL level utilities
   "lib/cmake/thrust/", # thrust_create_target and friends
   # helper-function heavy:
-  "cub/test/"
+  "cub/test/",
+  "thrust/testing/",
 ]
 disable_formatting: false
 extensions: [".gersemi/ext/builtins.py", ".gersemi/ext/cccl.py", ".gersemi/ext/thirdparty.py"]

CMakeLists.txt

@@ -80,12 +80,15 @@ if (CCCL_TOPLEVEL_PROJECT)
   include(cmake/CCCLUtilities.cmake) # include this before other CCCL helpers
 
   include(cmake/CCCLAddExecutable.cmake)
+  include(cmake/CCCLAddTestsFromSrc.cmake)
+  include(cmake/CCCLAddXFailCompileTargetTest.cmake)
   include(cmake/CCCLBuildCompilerTargets.cmake)
   include(cmake/CCCLClangdCompileInfo.cmake)
   include(cmake/CCCLConfigureTarget.cmake)
   include(cmake/CCCLEnsureMetaTargets.cmake)
   include(cmake/CCCLGenerateHeaderTests.cmake)
   include(cmake/CCCLGetDependencies.cmake)
+  include(cmake/CCCLParseArguments.cmake)
   include(cmake/CCCLTestParams.cmake)
 
   cccl_build_compiler_targets()

CMakePresets.json

@@ -203,6 +203,7 @@
         "CMAKE_CUDA_ARCHITECTURES": "minmax-major-cccl",
         "CCCL_ENABLE_THRUST": true,
         "THRUST_ENABLE_MULTICONFIG": true,
+        "THRUST_MULTICONFIG_WORKLOAD": "MEDIUM",
         "THRUST_MULTICONFIG_ENABLE_SYSTEM_CPP": true,
         "THRUST_MULTICONFIG_ENABLE_SYSTEM_CUDA": true,
         "THRUST_MULTICONFIG_ENABLE_SYSTEM_OMP": true,

c2h/CMakeLists.txt

@@ -46,5 +46,5 @@ else()
   target_compile_definitions(cccl.c2h PRIVATE C2H_HAS_CURAND=0)
 endif()
 
-add_library(cccl.c2h.main OBJECT catch2_runner.cpp catch2_runner_helper.cu)
+add_library(cccl.c2h.main STATIC catch2_runner.cpp catch2_runner_helper.cu)
 target_link_libraries(cccl.c2h.main PUBLIC cccl.c2h)

ci/matrix.yaml

@@ -21,6 +21,13 @@ workflows:
   #       args: '--preset libcudacxx --lit-tests "cuda/utility/basic_any.pass.cpp"' }
   #
   override:
+    - {jobs: ['test'], project: ['thrust'], std: 20, cxx: ['gcc', 'clang', 'msvc'], gpu: 'rtx4090' }
+    - {jobs: ['test'], project: ['cub'],    std: 20, cxx: ['gcc', 'clang', 'msvc'], gpu: 'rtxa6000' }
+    # TODO add coverage for these:
+    - {jobs: ['test_nolid', 'test_lid0', 'test_lid2'],
+       project: 'cub',    std: 20, cxx: ['gcc', 'clang', 'msvc'], cmake_options: "-DCUB_FORCE_RDC=ON", gpu: 'rtxa6000' }
+    - {jobs: ['test_gpu'],
+       project: 'thrust', std: 20, cxx: ['gcc', 'clang', 'msvc'], cmake_options: "-DTHRUST_FORCE_RDC=ON", gpu: 'rtx4090' }
 
   pull_request:
     # Old CTK: Oldest/newest supported host compilers:
@@ -546,7 +553,6 @@ projects:
 
 # testing -> Runner with GPU is in a nv-gh-runners testing pool
 gpus:
-  v100:     { sm: 70 } # 32 GB,  40 runners
   t4:       { sm: 75 } # 16 GB,  10 runners
   rtx2080:  { sm: 75 } #  8 GB,  12 runners
   rtxa6000: { sm: 86 } # 48 GB,  12 runners

ci/upload_cub_test_artifacts.sh

@@ -47,7 +47,6 @@ build_dir_regex="build${CCCL_BUILD_INFIX:+/$CCCL_BUILD_INFIX}/cub[^/]*"
 
 # Just collect the minimum set of files needed for running each ctest preset:
 for preset_variant in ${preset_variants[@]}; do
-
   # Shared across all presets:
   ci/util/artifacts/stage.sh "$artifact_prefix-$preset_variant" \
       "$build_dir_regex/build\.ninja$" \

cmake/CCCLAddExecutable.cmake

@@ -11,33 +11,30 @@ function(cccl_add_executable target_name)
   set(oneValueArgs METATARGET_PATH)
   set(multiValueArgs SOURCES)
   cmake_parse_arguments(
-    _cccl
+    self
     "${options}"
     "${oneValueArgs}"
     "${multiValueArgs}"
     ${ARGN}
   )
+  cccl_parse_arguments_error_checks(
+    "cccl_add_executable"
+    ERROR_UNPARSED
+    REQUIRED_VALUES SOURCES
+    DEFAULT_VALUES METATARGET_PATH "${target_name}"
+  )
 
-  if (_cccl_UNPARSED_ARGUMENTS)
-    message(FATAL_ERROR "Unrecognized arguments: ${_cccl_UNPARSED_ARGUMENTS}")
-  endif()
-
-  if (NOT DEFINED _cccl_SOURCES)
-    message(FATAL_ERROR "cccl_add_executable requires SOURCES argument")
-  endif()
-
-  add_executable(${target_name} ${_cccl_SOURCES})
+  add_executable(${target_name} ${self_SOURCES})
   cccl_configure_target(${target_name})
 
-  if (_cccl_ADD_CTEST)
+  if (self_ADD_CTEST)
     add_test(NAME ${target_name} COMMAND "$<TARGET_FILE:${target_name}>")
   endif()
 
-  if (NOT _cccl_NO_METATARGETS)
-    set(metatarget_path ${target_name})
-    if (DEFINED _cccl_METATARGET_PATH)
-      set(metatarget_path ${_cccl_METATARGET_PATH})
-    endif()
-    cccl_ensure_metatargets(${target_name} METATARGET_PATH ${metatarget_path})
+  if (NOT self_NO_METATARGETS)
+    cccl_ensure_metatargets(
+      ${target_name}
+      METATARGET_PATH ${self_METATARGET_PATH}
+    )
   endif()
 endfunction()

cmake/CCCLAddSubdirHelper.cmake

@@ -12,21 +12,22 @@ function(cccl_add_subdir_helper project_name)
   )
   set(multiValueArgs)
   cmake_parse_arguments(
-    CCCL_SUBDIR
+    self
     "${options}"
     "${oneValueArgs}"
     "${multiValueArgs}"
     ${ARGN}
   )
+  cccl_parse_arguments_error_checks("cccl_add_subdir_helper" ERROR_UNPARSED)
 
-  if (DEFINED CCCL_SUBDIR_PACKAGE_FILEBASE)
-    set(package_filebase "${CCCL_SUBDIR_PACKAGE_FILEBASE}")
+  if (DEFINED self_PACKAGE_FILEBASE)
+    set(package_filebase "${self_PACKAGE_FILEBASE}")
   else()
     string(TOLOWER "${project_name}" package_filebase)
   endif()
 
-  if (DEFINED CCCL_SUBDIR_PACKAGE_PATH)
-    set(package_prefix "${CCCL_SUBDIR_PACKAGE_PATH}/${package_filebase}")
+  if (DEFINED self_PACKAGE_PATH)
+    set(package_prefix "${self_PACKAGE_PATH}/${package_filebase}")
   else()
     set(
       package_prefix
@@ -36,20 +37,20 @@ function(cccl_add_subdir_helper project_name)
 
   set(CMAKE_FIND_PACKAGE_NAME ${project_name})
   set(${CMAKE_FIND_PACKAGE_NAME}_FIND_COMPONENTS)
-  if (DEFINED CCCL_SUBDIR_REQUIRED_COMPONENTS)
+  if (DEFINED self_REQUIRED_COMPONENTS)
     list(
       APPEND ${CMAKE_FIND_PACKAGE_NAME}_FIND_COMPONENTS
-      ${CCCL_SUBDIR_REQUIRED_COMPONENTS}
+      ${self_REQUIRED_COMPONENTS}
     )
-    foreach (component IN LISTS CCCL_SUBDIR_REQUIRED_COMPONENTS)
+    foreach (component IN LISTS self_REQUIRED_COMPONENTS)
       set(${CMAKE_FIND_PACKAGE_NAME}_FIND_REQUIRED_${component} TRUE)
     endforeach()
   endif()
 
-  if (DEFINED CCCL_SUBDIR_OPTIONAL_COMPONENTS)
+  if (DEFINED self_OPTIONAL_COMPONENTS)
     list(
       APPEND ${CMAKE_FIND_PACKAGE_NAME}_FIND_COMPONENTS
-      ${CCCL_SUBDIR_OPTIONAL_COMPONENTS}
+      ${self_OPTIONAL_COMPONENTS}
     )
   endif()