Skip to content

Commit

Permalink
Merge branch 'develop' into kelvin_script_update
Browse files Browse the repository at this point in the history
  • Loading branch information
fmcneill49 authored Dec 20, 2024
2 parents b6c4e21 + f280748 commit e553ee6
Show file tree
Hide file tree
Showing 109 changed files with 11,638 additions and 12,481 deletions.
1 change: 1 addition & 0 deletions .clang-format
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@
Language: Cpp
BasedOnStyle: Google
ColumnLimit: 120
BreakAfterAttributes: Never
99 changes: 55 additions & 44 deletions .clang-tidy
Original file line number Diff line number Diff line change
@@ -1,57 +1,63 @@
---
InheritParentConfig: true
Checks: >
*,
-*static-assert*,
-*avoid-c-arrays,
-cert-dcl03-c,
-abseil-*,
-android-*,
-altera-*,
-bugprone-easily-swappable-parameters,
-bugprone-exception-escape,
-bugprone-implicit-widening-of-multiplication-result,
-bugprone-narrowing-conversions,
-llvmlibc-*,
-cert-err33-c,
-cert-err34-c,
-cert-err58-cpp,
-clang-analyzer-deadcode.DeadStores,
-cppcoreguidelines-avoid-magic-numbers,
-cppcoreguidelines-avoid-non-const-global-variables,
-cppcoreguidelines-macro-usage,
-cppcoreguidelines-no-malloc,
-cppcoreguidelines-owning-memory,
-cppcoreguidelines-pro-bounds-array-to-pointer-decay,
-cppcoreguidelines-pro-bounds-constant-array-index,
-cppcoreguidelines-pro-bounds-pointer-arithmetic,
-cppcoreguidelines-pro-type-cstyle-cast,
-cppcoreguidelines-pro-type-vararg,
-fuchsia-*,
-google-objc*,
-google-readability-todo,
-google-runtime-int,
-hicpp-vararg,
-hicpp-no-array-decay,
-hicpp-no-malloc,
-hicpp-signed-bitwise,
-misc-use-anonymous-namespace,
-misc-no-recursion,
-misc-non-private-member-variables-in-classes,
-readability-identifier-length,
-readability-function-cognitive-complexity,
-readability-magic-numbers,
WarningsAsErrors: ''
Checks: [
'*',
-*static-assert*,
-*avoid-c-arrays,
-cert-dcl03-c,
-abseil-*,
-android-*,
-altera-*,
-bugprone-casting-through-void,
-bugprone-easily-swappable-parameters,
-bugprone-exception-escape,
-bugprone-implicit-widening-of-multiplication-result,
-bugprone-multi-level-implicit-pointer-conversion,
-bugprone-narrowing-conversions,
-boost-use-ranges,
-llvmlibc-*,
-cert-dcl50-cpp,
-cert-err33-c,
-cert-err34-c,
-cert-err58-cpp,
-clang-analyzer-deadcode.DeadStores,
-cppcoreguidelines-avoid-magic-numbers,
-cppcoreguidelines-avoid-non-const-global-variables,
-cppcoreguidelines-macro-usage,
-cppcoreguidelines-no-malloc,
-cppcoreguidelines-owning-memory,
-cppcoreguidelines-pro-bounds-array-to-pointer-decay,
-cppcoreguidelines-pro-bounds-constant-array-index,
-cppcoreguidelines-pro-bounds-pointer-arithmetic,
-cppcoreguidelines-pro-type-cstyle-cast,
-cppcoreguidelines-pro-type-vararg,
-fuchsia-*,
-google-objc*,
-google-readability-todo,
-hicpp-vararg,
-hicpp-no-array-decay,
-hicpp-no-malloc,
-hicpp-signed-bitwise,
-misc-no-recursion,
-misc-non-private-member-variables-in-classes,
-modernize-use-ranges, # things like sort and for_each don't support parallel execution policies
-modernize-use-std-print, # replace printout macro with a function when we want to autofix to use std::format gcc >=13
-performance-enum-size,
-readability-identifier-length,
-readability-function-cognitive-complexity,
-readability-magic-numbers,
]
WarningsAsErrors: '*'
FormatStyle: file
ExtraArgs: [-std=c++20]
ExtraArgs: [-std=c++23]
CheckOptions:
- key: modernize-deprecated-headers.CheckHeaderFile
value: 'true'
- key: cppcoreguidelines-init-variables.IncludeStyle
value: google
- key: cppcoreguidelines-init-variables.MathHeader
value: <cmath>
- key: modernize-use-std-print.PrintfLikeFunctions # replace printout macro with a function when we want to autofix to use std::format gcc >=13
- key: modernize-use-std-print.PrintfLikeFunctions
value: printf; absl::PrintF; printout
- key: modernize-use-std-print.FprintfLikeFunctions
value: fprintf; absl::FPrintF
Expand All @@ -65,3 +71,8 @@ CheckOptions:
value: 'true'
- key: readability-identifier-naming.NamespaceCase
value: lower_case
- key: bugprone-reserved-identifier.AllowedIdentifiers
value: '__host__;__device__'
- key: misc-include-cleaner.IgnoreHeaders # std::ranges::upper_bound is triggering warning to include a private libc++ header __algorithm/ranges_upper_bound.h
# value: '.*(ranges).*'
value: '.*(__algorithm).*'
31 changes: 29 additions & 2 deletions .clangd
Original file line number Diff line number Diff line change
@@ -1,5 +1,32 @@
CompileFlags:
# to make the compilation database, pip install compiledb, then run:
# compiledb -n --full-path make TESTMODE=ON
# make clean && compiledb -n --full-path make TESTMODE=ON
# or brew install bear, then:
# make clean && bear -- make TESTMODE=ON
CompilationDatabase: compile_commands.json
Add: [-DMPI_ON=true, -std=c++20]
Add: [-xc++, -std=c++23, -DTESTMODE=true]

Diagnostics:
ClangTidy:
FastCheckFilter: None
UnusedIncludes: Strict
MissingIncludes: Strict
Includes:
# std::ranges::upper_bound is triggering warning to include a private libc++ header __algorithm/ranges_upper_bound.h
# IgnoreHeader: '.*(ranges).*'
IgnoreHeader: 'signal.h|(_).*(.h)|.*(__algorithm).*'
AnalyzeAngledIncludes: true

Completion:
AllScopes: true
#ArgumentListsPolicy: None # added to LLVM 20?

InlayHints:
BlockEnd: true
Designators: true
Enabled: true
ParameterNames: true
DeducedTypes: false

Hover:
ShowAKA: Yes
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,5 @@ Makefile text eol=lf
*.jpg binary
*.gz binary
*.xz binary
*.zst binary
*.zstd binary
Loading

0 comments on commit e553ee6

Please sign in to comment.