Skip to content

Commit b360207

Browse files
committed
Clang format
1 parent cef8407 commit b360207

File tree

32 files changed

+529
-572
lines changed

32 files changed

+529
-572
lines changed

.clang-format

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ BraceWrapping:
3131
AfterExternBlock: false
3232
BeforeCatch: true
3333
BeforeElse: true
34-
BeforeLambdaBody: true
34+
BeforeLambdaBody: true
3535
IndentBraces: false
3636
SplitEmptyFunction: false
3737
SplitEmptyRecord: false
@@ -40,12 +40,13 @@ BraceWrapping:
4040
# Pointer alignment
4141
DerivePointerAlignment: false
4242
PointerAlignment: Left
43+
44+
# Single line config
4345
AllowShortIfStatementsOnASingleLine : true
4446
AllowShortFunctionsOnASingleLine : true
4547
AllowShortLoopsOnASingleLine : false
4648
AllowAllArgumentsOnNextLine : true
4749
AllowAllParametersOfDeclarationOnNextLine : false
48-
AlignTrailingComments : true
4950
BinPackArguments : true
5051
BinPackParameters : false
5152
ConstructorInitializerAllOnOneLineOrOnePerLine : true

cmake/RAJAMacros.cmake

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ endmacro(raja_add_benchmark)
209209
## raja_add_code_checks()
210210
##
211211
## Adds code checks for all source files recursively in the RAJA repository.
212-
##
212+
##
213213
## This creates the following parent build targets:
214214
## check - Runs a non file changing style check and CppCheck
215215
## style - In-place code formatting
@@ -233,7 +233,7 @@ macro(raja_add_code_checks)
233233
if ("${PROJECT_SOURCE_DIR}" STREQUAL "${CMAKE_SOURCE_DIR}")
234234
# Create file globbing expressions that only include directories that contain source
235235
# TODO(bowen) Add examples, exercises and benchmark to the list below
236-
set(_base_dirs "RAJA" "examples" "exercises" "benchmark" "include" "src" "test")
236+
set(_base_dirs "RAJA" "benchmark" "include" "src" "test")
237237
set(_ext_expressions "*.cpp" "*.hpp" "*.inl"
238238
"*.cxx" "*.hxx" "*.cc" "*.c" "*.h" "*.hh")
239239

@@ -248,15 +248,6 @@ macro(raja_add_code_checks)
248248
set(_sources)
249249
file(GLOB_RECURSE _sources ${_glob_expressions})
250250

251-
# Filter out exclusions
252-
#set(_exclude_expressions
253-
# "${PROJECT_SOURCE_DIR}/axom/sidre/examples/lulesh2/*"
254-
# "${PROJECT_SOURCE_DIR}/axom/slam/examples/lulesh2.0.3/*"
255-
# "${PROJECT_SOURCE_DIR}/axom/slam/examples/tinyHydro/*")
256-
#foreach(_exp ${_exclude_expressions})
257-
# list(FILTER _sources EXCLUDE REGEX ${_exp})
258-
#endforeach()
259-
#
260251
blt_add_code_checks(PREFIX RAJA
261252
SOURCES ${_sources}
262253
CLANGFORMAT_CFG_FILE ${PROJECT_SOURCE_DIR}/.clang-format
@@ -265,7 +256,7 @@ macro(raja_add_code_checks)
265256
# Set FOLDER property for code check targets
266257
foreach(_suffix clangformat_check clangformat_style clang_tidy_check clang_tidy_style)
267258
set(_tgt ${arg_PREFIX}_${_suffix})
268-
if(TARGET ${_tgt})
259+
if(TARGET ${_tgt})
269260
set_target_properties(${_tgt} PROPERTIES FOLDER "RAJA/code_checks")
270261
endif()
271262
endforeach()

include/RAJA/pattern/launch/launch_core.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#include "camp/tuple.hpp"
3030

3131
// Odd dependecy with atomics is breaking CI builds
32-
//#include "RAJA/util/View.hpp"
32+
// #include "RAJA/util/View.hpp"
3333

3434
#if defined(RAJA_GPU_DEVICE_COMPILE_PASS_ACTIVE) && !defined(RAJA_ENABLE_SYCL)
3535
#define RAJA_TEAM_SHARED __shared__

0 commit comments

Comments
 (0)