Skip to content

Commit

Permalink
Updating Clang Version to 11.0.0 (#1688)
Browse files Browse the repository at this point in the history
Follow up PR to: rapidsai/cudf#6695. Performing the same changes but for `rapidsai/cugraph`

Depends on: rapidsai/integration#304

Authors:
  - Conor Hoekstra (https://github.com/codereport)

Approvers:
  - Dillon Cullinan (https://github.com/dillon-cullinan)
  - Chuck Hastings (https://github.com/ChuckHastings)

URL: #1688
  • Loading branch information
codereport authored Jul 7, 2021
1 parent 1778d43 commit e2ac467
Show file tree
Hide file tree
Showing 118 changed files with 2,697 additions and 2,488 deletions.
4 changes: 2 additions & 2 deletions conda/environments/cugraph_dev_cuda11.0.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ dependencies:
- ucx-proc=*=gpu
- scipy
- networkx>=2.5.1
- clang=8.0.1
- clang-tools=8.0.1
- clang=11.0.0
- clang-tools=11.0.0
- cmake>=3.20.1
- python>=3.6,<3.9
- notebook>=0.5.0
Expand Down
4 changes: 2 additions & 2 deletions conda/environments/cugraph_dev_cuda11.1.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ dependencies:
- ucx-proc=*=gpu
- scipy
- networkx>=2.5.1
- clang=8.0.1
- clang-tools=8.0.1
- clang=11.0.0
- clang-tools=11.0.0
- cmake>=3.20.1
- python>=3.6,<3.9
- notebook>=0.5.0
Expand Down
4 changes: 2 additions & 2 deletions conda/environments/cugraph_dev_cuda11.2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ dependencies:
- ucx-proc=*=gpu
- scipy
- networkx>=2.5.1
- clang=8.0.1
- clang-tools=8.0.1
- clang=11.0.0
- clang-tools=11.0.0
- cmake>=3.20.1
- python>=3.6,<3.9
- notebook>=0.5.0
Expand Down
20 changes: 14 additions & 6 deletions cpp/.clang-format
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,22 @@ Language: Cpp
AccessModifierOffset: -1
AlignAfterOpenBracket: Align
AlignConsecutiveAssignments: true
AlignConsecutiveBitFields: true
AlignConsecutiveDeclarations: false
AlignConsecutiveMacros: true
AlignEscapedNewlines: Left
AlignOperands: true
AlignTrailingComments: true
AllowAllArgumentsOnNextLine: true
AllowAllConstructorInitializersOnNextLine: true
AllowAllParametersOfDeclarationOnNextLine: true
AllowShortBlocksOnASingleLine: true
AllowShortCaseLabelsOnASingleLine: true
AllowShortEnumsOnASingleLine: true
AllowShortFunctionsOnASingleLine: All
AllowShortIfStatementsOnASingleLine: true
AllowShortLoopsOnASingleLine: true
AllowShortLambdasOnASingleLine: true
AllowShortLoopsOnASingleLine: false
# This is deprecated
AlwaysBreakAfterDefinitionReturnType: None
AlwaysBreakAfterReturnType: None
Expand All @@ -40,14 +46,14 @@ BraceWrapping:
SplitEmptyFunction: false
SplitEmptyRecord: false
SplitEmptyNamespace: false
BreakAfterJavaFieldAnnotations: false
BreakBeforeBinaryOperators: None
BreakBeforeBraces: WebKit
BreakBeforeInheritanceComma: false
BreakInheritanceList: BeforeColon
BreakBeforeTernaryOperators: true
BreakConstructorInitializersBeforeComma: false
BreakConstructorInitializers: BeforeColon
BreakAfterJavaFieldAnnotations: false
BreakInheritanceList: BeforeColon
BreakStringLiterals: true
ColumnLimit: 100
CommentPragmas: '^ IWYU pragma:'
Expand All @@ -57,7 +63,7 @@ ConstructorInitializerAllOnOneLineOrOnePerLine: true
ConstructorInitializerIndentWidth: 2
ContinuationIndentWidth: 2
Cpp11BracedListStyle: true
DerivePointerAlignment: true
DerivePointerAlignment: false
DisableFormat: false
ExperimentalAutoDetectBinPacking: false
FixNamespaceComments: true
Expand Down Expand Up @@ -139,18 +145,20 @@ SpaceBeforeCtorInitializerColon: true
SpaceBeforeInheritanceColon: true
SpaceBeforeParens: ControlStatements
SpaceBeforeRangeBasedForLoopColon: true
SpaceBeforeSquareBrackets: false
SpaceInEmptyBlock: false
SpaceInEmptyParentheses: false
SpacesBeforeTrailingComments: 2
SpacesInAngles: false
SpacesInConditionalStatement: false
SpacesInContainerLiterals: true
SpacesInCStyleCastParentheses: false
SpacesInParentheses: false
SpacesInSquareBrackets: false
Standard: Cpp11
Standard: c++17
StatementMacros:
- Q_UNUSED
- QT_REQUIRE_VERSION
# Be consistent with indent-width, even for people who use tab for indentation!
TabWidth: 2
UseTab: Never

Loading

0 comments on commit e2ac467

Please sign in to comment.