From 292862f0a2b4f56eaf5bc6ff3e3178cd26919f05 Mon Sep 17 00:00:00 2001 From: john bowen Date: Thu, 8 Jan 2026 14:42:15 -0800 Subject: [PATCH 1/3] Add argument to RAJA add code checks macro --- CMakeLists.txt | 9 ++++++++- cmake/RAJAMacros.cmake | 5 ++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9438c31cdd..f7d76352dc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -121,7 +121,7 @@ include(cmake/SetupCompilers.cmake) include (cmake/RAJAMacros.cmake) # Configure `style` target for enforcing code style -raja_add_code_checks() +raja_add_code_checks(DIRS "RAJA" "include" "src") set (raja_sources src/AlignedRangeIndexSetBuilders.cpp @@ -312,6 +312,13 @@ if (RAJA_ENABLE_HIP AND NOT RAJA_ENABLE_EXTERNAL_ROCPRIM) $) endif() +if (RAJA_ENABLE_JIT) + target_include_directories(RAJA + PUBLIC + "${PROTEUS_INSTALL_DIR}/include" + ) +endif() + install(DIRECTORY include/ DESTINATION include FILES_MATCHING PATTERN *.hpp) if (RAJA_ENABLE_CUDA AND NOT RAJA_ENABLE_EXTERNAL_CUB) install(DIRECTORY tpl/cub/cub/ DESTINATION include/cub FILES_MATCHING PATTERN *.cuh) diff --git a/cmake/RAJAMacros.cmake b/cmake/RAJAMacros.cmake index 848f5779e4..6178708781 100644 --- a/cmake/RAJAMacros.cmake +++ b/cmake/RAJAMacros.cmake @@ -222,7 +222,7 @@ macro(raja_add_code_checks) set(options) set(singleValueArgs) - set(multiValueArgs) + set(multiValueArgs DIRS) # Parse the arguments to the macro cmake_parse_arguments(arg @@ -233,13 +233,12 @@ macro(raja_add_code_checks) if ("${PROJECT_SOURCE_DIR}" STREQUAL "${CMAKE_SOURCE_DIR}") # Create file globbing expressions that only include directories that contain source # TODO(bowen) Add examples, exercises, test, and benchmark to the list below - set(_base_dirs "RAJA" "include" "src") set(_ext_expressions "*.cpp" "*.hpp" "*.inl" "*.cxx" "*.hxx" "*.cc" "*.c" "*.h" "*.hh") set(_glob_expressions) foreach(_exp ${_ext_expressions}) - foreach(_base_dir ${_base_dirs}) + foreach(_base_dir ${arg_DIRS}) list(APPEND _glob_expressions "${PROJECT_SOURCE_DIR}/${_base_dir}/${_exp}") endforeach() endforeach() From 8fb04f0151cc5c69932ef3773c6aba77d03e4180 Mon Sep 17 00:00:00 2001 From: john bowen Date: Thu, 8 Jan 2026 15:01:03 -0800 Subject: [PATCH 2/3] Move todo --- CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index f7d76352dc..8842c67900 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -121,6 +121,7 @@ include(cmake/SetupCompilers.cmake) include (cmake/RAJAMacros.cmake) # Configure `style` target for enforcing code style +# TODO(bowen) Add examples, exercises, test, and benchmark to the list below raja_add_code_checks(DIRS "RAJA" "include" "src") set (raja_sources From 719e67a64949d14f76cae1974902b2b3bb0c6d41 Mon Sep 17 00:00:00 2001 From: john bowen Date: Thu, 8 Jan 2026 15:04:15 -0800 Subject: [PATCH 3/3] Unstaged changes --- CMakeLists.txt | 7 ------- cmake/RAJAMacros.cmake | 1 - 2 files changed, 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8842c67900..bf64ec04c9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -313,13 +313,6 @@ if (RAJA_ENABLE_HIP AND NOT RAJA_ENABLE_EXTERNAL_ROCPRIM) $) endif() -if (RAJA_ENABLE_JIT) - target_include_directories(RAJA - PUBLIC - "${PROTEUS_INSTALL_DIR}/include" - ) -endif() - install(DIRECTORY include/ DESTINATION include FILES_MATCHING PATTERN *.hpp) if (RAJA_ENABLE_CUDA AND NOT RAJA_ENABLE_EXTERNAL_CUB) install(DIRECTORY tpl/cub/cub/ DESTINATION include/cub FILES_MATCHING PATTERN *.cuh) diff --git a/cmake/RAJAMacros.cmake b/cmake/RAJAMacros.cmake index 6178708781..96b02fa63e 100644 --- a/cmake/RAJAMacros.cmake +++ b/cmake/RAJAMacros.cmake @@ -232,7 +232,6 @@ macro(raja_add_code_checks) # another project if ("${PROJECT_SOURCE_DIR}" STREQUAL "${CMAKE_SOURCE_DIR}") # Create file globbing expressions that only include directories that contain source - # TODO(bowen) Add examples, exercises, test, and benchmark to the list below set(_ext_expressions "*.cpp" "*.hpp" "*.inl" "*.cxx" "*.hxx" "*.cc" "*.c" "*.h" "*.hh")