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"]

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,10 @@ workflows:
   #       args: '--preset libcudacxx --lit-tests "cuda/utility/basic_any.pass.cpp"' }
   #
   override:
+    - {jobs: ['test'], project: ['thrust', 'cub'], std: 20, cxx: ['gcc', 'clang', 'msvc'] }
+    # TODO add coverage for these:
+    - {jobs: ['test'], project: 'cub',    std: 20, cxx: ['gcc', 'clang', 'msvc'], cmake_options: "-DCUB_FORCE_RDC=ON" }
+    - {jobs: ['test'], project: 'thrust', std: 20, cxx: ['gcc', 'clang', 'msvc'], cmake_options: "-DTHRUST_FORCE_RDC=ON" }
 
   pull_request:
     # Old CTK: Oldest/newest supported host compilers:

cmake/CCCLAddExecutable.cmake

@@ -11,33 +11,34 @@ 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"
+    "self"
+    "${options}"
+    "${oneValueArgs}"
+    "${multiValueArgs}"
+    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

@@ -18,6 +18,14 @@ function(cccl_add_subdir_helper project_name)
     "${multiValueArgs}"
     ${ARGN}
   )
+  cccl_parse_arguments_error_checks(
+    "cccl_add_subdir_helper"
+    "CCCL_SUBDIR"
+    "${options}"
+    "${oneValueArgs}"
+    "${multiValueArgs}"
+    ERROR_UNPARSED
+  )
 
   if (DEFINED CCCL_SUBDIR_PACKAGE_FILEBASE)
     set(package_filebase "${CCCL_SUBDIR_PACKAGE_FILEBASE}")

cmake/CCCLConfigureTarget.cmake

@@ -13,6 +13,14 @@ function(cccl_configure_target target_name)
     "${multiValueArgs}"
     ${ARGN}
   )
+  cccl_parse_arguments_error_checks(
+    "cccl_configure_target"
+    "CCT"
+    "${options}"
+    "${oneValueArgs}"
+    "${multiValueArgs}"
+    ERROR_UNPARSED
+  )
 
   get_target_property(type ${target_name} TYPE)
 

cmake/CCCLEnsureMetaTargets.cmake

@@ -16,14 +16,15 @@ function(cccl_ensure_metatargets target_name)
     "${multiValueArgs}"
     ${ARGN}
   )
-
-  if (_cccl_UNPARSED_ARGUMENTS)
-    message(FATAL_ERROR "Unrecognized arguments: ${_cccl_UNPARSED_ARGUMENTS}")
-  endif()
-
-  if (NOT DEFINED _cccl_METATARGET_PATH)
-    set(_cccl_METATARGET_PATH ${target_name})
-  endif()
+  cccl_parse_arguments_error_checks(
+    "cccl_ensure_metatargets"
+    "_cccl"
+    "${options}"
+    "${oneValueArgs}"
+    "${multiValueArgs}"
+    ERROR_UNPARSED
+    DEFAULT_VALUES METATARGET_PATH "${target_name}"
+  )
 
   set(parent_path "")
   set(current_path "")

cmake/CCCLGenerateHeaderTests.cmake

@@ -9,6 +9,8 @@
 #                            [PER_HEADER_DEFINES
 #                               DEFINE <definition> <regex> [<regex> ...]
 #                              [DEFINE <definition> <regex> [<regex> ...]] ...]
+#                            [NO_METATARGETS]
+#                            [NO_LINK_CHECK]
 # )
 #
 # Options:
@@ -22,14 +24,15 @@
 # HEADERS: An explicit list of headers to include in the header tests.
 # PER_HEADER_DEFINES: A list of definitions to add to specific headers. Each definition is followed by one or more regexes that match the headers it should be applied to.
 # NO_METATARGETS: If specified, metatargets will not be created for the header test targets.
+# NO_LINK_CHECK: If specified, the link check target will not be created.
 #
 # Notes:
 # - The header globs are applied relative to <project_include_path>.
 # - If no HEADER_TEMPLATE is provided, a default template will be used.
 # - The HEADER_TEMPLATE will be configured for each header, with the following variables:
 #   - @header@: The path to the target header, relative to <project_include_path>.
 function(cccl_generate_header_tests target_name project_include_path)
-  set(options NO_METATARGETS)
+  set(options NO_METATARGETS NO_LINK_CHECK)
   set(oneValueArgs LANGUAGE HEADER_TEMPLATE)
   set(multiValueArgs GLOBS EXCLUDES HEADERS PER_HEADER_DEFINES)
   cmake_parse_arguments(
@@ -39,19 +42,16 @@ function(cccl_generate_header_tests target_name project_include_path)
     "${multiValueArgs}"
     ${ARGN}
   )
-
-  if (CGHT_UNPARSED_ARGUMENTS)
-    message(FATAL_ERROR "Unrecognized arguments: ${CGHT_UNPARSED_ARGUMENTS}")
-  endif()
-
-  # Setup defaults
-  if (NOT DEFINED CGHT_LANGUAGE)
-    set(CGHT_LANGUAGE CUDA)
-  endif()
-
-  if (NOT DEFINED CGHT_HEADER_TEMPLATE)
-    set(CGHT_HEADER_TEMPLATE "${CCCL_SOURCE_DIR}/cmake/header_test.cu.in")
-  endif()
+  cccl_parse_arguments_error_checks(
+    "cccl_generate_header_tests"
+    "CGHT"
+    "${options}"
+    "${oneValueArgs}"
+    "${multiValueArgs}"
+    DEFAULT_VALUES #
+      LANGUAGE "CUDA"
+      HEADER_TEMPLATE "${CCCL_SOURCE_DIR}/cmake/header_test.cu.in"
+  )
 
   # Derived vars:
   if (${CGHT_LANGUAGE} STREQUAL "C")
@@ -162,20 +162,22 @@ function(cccl_generate_header_tests target_name project_include_path)
     cccl_ensure_metatargets(${target_name})
   endif()
 
-  # Check that all functions in headers are either template functions or inline:
-  set(link_target ${target_name}.link_check)
-  cccl_add_executable(
-    ${link_target}
-    SOURCES "${CCCL_SOURCE_DIR}/cmake/link_check_main.cpp"
-    NO_METATARGETS
-  )
-  # Linking both ${target_name} and $<TARGET_OBJECTS:${target_name}> forces CMake to
-  # link the same objects twice. The compiler will complain about duplicate symbols if
-  # any functions are missing inline markup.
-  target_link_libraries(
-    ${link_target}
-    PRIVATE #
-      ${target_name}
-      $<TARGET_OBJECTS:${target_name}>
-  )
+  if (NOT CGHT_NO_LINK_CHECK)
+    # Check that all functions in headers are either template functions or inline:
+    set(link_target ${target_name}.link_check)
+    cccl_add_executable(
+      ${link_target}
+      SOURCES "${CCCL_SOURCE_DIR}/cmake/link_check_main.${extension}"
+      NO_METATARGETS
+    )
+    # Linking both ${target_name} and $<TARGET_OBJECTS:${target_name}> forces CMake to
+    # link the same objects twice. The compiler will complain about duplicate symbols if
+    # any functions are missing inline markup.
+    target_link_libraries(
+      ${link_target}
+      PRIVATE #
+        ${target_name}
+        $<TARGET_OBJECTS:${target_name}>
+    )
+  endif()
 endfunction()

cmake/CCCLInstallRules.cmake

@@ -1,3 +1,5 @@
+include(${CMAKE_CURRENT_LIST_DIR}/CCCLParseArguments.cmake)
+
 # Bring in CMAKE_INSTALL_* vars
 include(GNUInstallDirs)
 
@@ -41,6 +43,14 @@ function(cccl_generate_install_rules project_name enable_rules_by_default)
     "${multiValueArgs}"
     ${ARGN}
   )
+  cccl_parse_arguments_error_checks(
+    "cccl_generate_install_rules"
+    "CGIR"
+    "${options}"
+    "${oneValueArgs}"
+    "${multiValueArgs}"
+    ERROR_UNPARSED
+  )
 
   string(TOLOWER ${project_name} project_name_lower)
   set(project_source_dir "${CCCL_SOURCE_DIR}/${project_name_lower}")