Skip to content

Commit

Permalink
Import v22.0 changes SHA[63a5a12,2892c864c] (#430)
Browse files Browse the repository at this point in the history
  • Loading branch information
stgeke authored May 13, 2022
1 parent 7a55f45 commit 9ae8872
Show file tree
Hide file tree
Showing 625 changed files with 60,245 additions and 19,182 deletions.
179 changes: 179 additions & 0 deletions .clang-format
Original file line number Diff line number Diff line change
@@ -0,0 +1,179 @@
---
Language: Cpp
# BasedOnStyle: LLVM
AccessModifierOffset: -2
AlignAfterOpenBracket: Align
AlignArrayOfStructures: None
AlignConsecutiveMacros: None
AlignConsecutiveAssignments: None
AlignConsecutiveBitFields: None
AlignConsecutiveDeclarations: None
AlignEscapedNewlines: Right
AlignOperands: Align
AlignTrailingComments: true
AllowAllArgumentsOnNextLine: false
AllowAllConstructorInitializersOnNextLine: true
AllowAllParametersOfDeclarationOnNextLine: false
AllowShortEnumsOnASingleLine: true
AllowShortBlocksOnASingleLine: Never
AllowShortCaseLabelsOnASingleLine: false
AllowShortFunctionsOnASingleLine: All
AllowShortLambdasOnASingleLine: All
AllowShortIfStatementsOnASingleLine: Never
AllowShortLoopsOnASingleLine: false
AlwaysBreakAfterDefinitionReturnType: None
AlwaysBreakAfterReturnType: None
AlwaysBreakBeforeMultilineStrings: false
AlwaysBreakTemplateDeclarations: MultiLine
AttributeMacros:
- __capability
BinPackArguments: false
BinPackParameters: false
BraceWrapping:
AfterCaseLabel: false
AfterClass: false
AfterControlStatement: Never
AfterEnum: false
AfterFunction: false
AfterNamespace: false
AfterObjCDeclaration: false
AfterStruct: false
AfterUnion: false
AfterExternBlock: false
BeforeCatch: false
BeforeElse: false
BeforeLambdaBody: false
BeforeWhile: false
IndentBraces: false
SplitEmptyFunction: true
SplitEmptyRecord: true
SplitEmptyNamespace: true
BreakBeforeBinaryOperators: None
BreakBeforeConceptDeclarations: true
#BreakBeforeBraces: Attach
BreakBeforeBraces: Stroustrup
BreakBeforeInheritanceComma: false
BreakInheritanceList: BeforeColon
BreakBeforeTernaryOperators: true
BreakConstructorInitializersBeforeComma: false
BreakConstructorInitializers: BeforeColon
BreakAfterJavaFieldAnnotations: false
BreakStringLiterals: true
ColumnLimit: 110
CommentPragmas: '^ IWYU pragma:'
CompactNamespaces: false
ConstructorInitializerAllOnOneLineOrOnePerLine: false
ConstructorInitializerIndentWidth: 4
ContinuationIndentWidth: 4
Cpp11BracedListStyle: true
DeriveLineEnding: true
DerivePointerAlignment: false
DisableFormat: false
EmptyLineAfterAccessModifier: Never
EmptyLineBeforeAccessModifier: LogicalBlock
ExperimentalAutoDetectBinPacking: false
FixNamespaceComments: true
ForEachMacros:
- foreach
- Q_FOREACH
- BOOST_FOREACH
IfMacros:
- KJ_IF_MAYBE
IncludeBlocks: Preserve
IncludeCategories:
- Regex: '^"(llvm|llvm-c|clang|clang-c)/'
Priority: 2
SortPriority: 0
CaseSensitive: false
- Regex: '^(<|"(gtest|gmock|isl|json)/)'
Priority: 3
SortPriority: 0
CaseSensitive: false
- Regex: '.*'
Priority: 1
SortPriority: 0
CaseSensitive: false
IncludeIsMainRegex: '(Test)?$'
IncludeIsMainSourceRegex: ''
IndentAccessModifiers: false
IndentCaseLabels: false
IndentCaseBlocks: false
IndentGotoLabels: true
IndentPPDirectives: None
IndentExternBlock: AfterExternBlock
IndentRequires: false
IndentWidth: 2
IndentWrappedFunctionNames: false
InsertTrailingCommas: None
JavaScriptQuotes: Leave
JavaScriptWrapImports: true
KeepEmptyLinesAtTheStartOfBlocks: true
LambdaBodyIndentation: Signature
MacroBlockBegin: ''
MacroBlockEnd: ''
MaxEmptyLinesToKeep: 1
NamespaceIndentation: None
ObjCBinPackProtocolList: Auto
ObjCBlockIndentWidth: 2
ObjCBreakBeforeNestedBlockParam: true
ObjCSpaceAfterProperty: false
ObjCSpaceBeforeProtocolList: true
PenaltyBreakAssignment: 2
PenaltyBreakBeforeFirstCallParameter: 19
PenaltyBreakComment: 300
PenaltyBreakFirstLessLess: 120
PenaltyBreakString: 1000
PenaltyBreakTemplateDeclaration: 10
PenaltyExcessCharacter: 1000000
PenaltyReturnTypeOnItsOwnLine: 60
PenaltyIndentedWhitespace: 0
PointerAlignment: Right
PPIndentWidth: -1
ReferenceAlignment: Pointer
ReflowComments: true
ShortNamespaceLines: 1
SortIncludes: false
SortJavaStaticImport: Before
SortUsingDeclarations: true
SpaceAfterCStyleCast: false
SpaceAfterLogicalNot: false
SpaceAfterTemplateKeyword: true
SpaceBeforeAssignmentOperators: true
SpaceBeforeCaseColon: false
SpaceBeforeCpp11BracedList: false
SpaceBeforeCtorInitializerColon: true
SpaceBeforeInheritanceColon: true
SpaceBeforeParens: ControlStatements
SpaceAroundPointerQualifiers: Default
SpaceBeforeRangeBasedForLoopColon: true
SpaceInEmptyBlock: false
SpaceInEmptyParentheses: false
SpacesBeforeTrailingComments: 1
SpacesInAngles: Never
SpacesInConditionalStatement: false
SpacesInContainerLiterals: true
SpacesInCStyleCastParentheses: false
SpacesInLineCommentPrefix:
Minimum: 1
Maximum: -1
SpacesInParentheses: false
SpacesInSquareBrackets: false
SpaceBeforeSquareBrackets: false
BitFieldColonSpacing: Both
Standard: Latest
StatementAttributeLikeMacros:
- Q_EMIT
StatementMacros:
- Q_UNUSED
- QT_REQUIRE_VERSION
TabWidth: 8
UseCRLF: false
UseTab: Never
WhitespaceSensitiveMacros:
- STRINGIZE
- PP_STRINGIZE
- BOOST_PP_STRINGIZE
- NS_SWIFT_NAME
- CF_SWIFT_NAME
...

130 changes: 112 additions & 18 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,9 @@ on:
# allows us to run workflows manually
workflow_dispatch:

pull_request:
branches:
- next
push:
branches:
- next
- master

env:
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
Expand All @@ -20,6 +17,7 @@ env:
OCCA_CUDA_ENABLED: "0"
OCCA_HIP_ENABLED: "0"
OCCA_OPENCL_ENABLED: "0"
NEKRS_COMPILER_FLAGS: "-O2"
NEKRS_OCCA_MODE_DEFAULT: "SERIAL"
NEKRS_CI: "1"

Expand Down Expand Up @@ -81,35 +79,55 @@ jobs:
- name: 'ethier default'
working-directory: ${{ env.NEKRS_EXAMPLES }}/ethier
run: |
NEKRS_CACHE_DIR=${{ env.NEKRS_EXAMPLES }}/ethier/custom-cache-dir ${{ env.NEKRS_HOME }}/bin/nrsmpi ethier 1 1
NEKRS_CACHE_DIR=${{ env.NEKRS_EXAMPLES }}/ethier/custom-cache-dir ${{ env.NEKRS_HOME }}/bin/nrsmpi ethier 1 --cimode 1
- name: 'ethier subcycle'
working-directory: ${{ env.NEKRS_EXAMPLES }}/ethier
run: ${{ env.NEKRS_HOME }}/bin/nrsmpi ethier 2 2
run: ${{ env.NEKRS_HOME }}/bin/nrsmpi ethier 2 --cimode 2

- name: 'ethier velocity and pressure projection'
working-directory: ${{ env.NEKRS_EXAMPLES }}/ethier
run: ${{ env.NEKRS_HOME }}/bin/nrsmpi ethier 2 3
run: ${{ env.NEKRS_HOME }}/bin/nrsmpi ethier 2 --cimode 3

- name: 'ethier (block) velocity and pressure projection with subcycling'
working-directory: ${{ env.NEKRS_EXAMPLES }}/ethier
run: ${{ env.NEKRS_HOME }}/bin/nrsmpi ethier 2 4
run: ${{ env.NEKRS_HOME }}/bin/nrsmpi ethier 2 --cimode 4

- name: 'ethier default + moving mesh'
working-directory: ${{ env.NEKRS_EXAMPLES }}/ethier
run: ${{ env.NEKRS_HOME }}/bin/nrsmpi mv_ethier 2 5
run: ${{ env.NEKRS_HOME }}/bin/nrsmpi mv_ethier 2 --cimode 5

- name: 'ethier subcycle + moving mesh + subcycling'
working-directory: ${{ env.NEKRS_EXAMPLES }}/ethier
run: ${{ env.NEKRS_HOME }}/bin/nrsmpi mv_ethier 2 6
run: ${{ env.NEKRS_HOME }}/bin/nrsmpi mv_ethier 2 --cimode 6

- name: 'ethier gmres bug'
working-directory: ${{ env.NEKRS_EXAMPLES }}/ethier
run: ${{ env.NEKRS_HOME }}/bin/nrsmpi ethier 2 7
run: ${{ env.NEKRS_HOME }}/bin/nrsmpi ethier 2 --cimode 7

- name: 'ethier variable dt'
working-directory: ${{ env.NEKRS_EXAMPLES }}/ethier
run: ${{ env.NEKRS_HOME }}/bin/nrsmpi ethier 2 8
run: ${{ env.NEKRS_HOME }}/bin/nrsmpi ethier 2 --cimode 8

- name: 'ethier no dealiasing and subcycling'
working-directory: ${{ env.NEKRS_EXAMPLES }}/ethier
run: ${{ env.NEKRS_HOME }}/bin/nrsmpi ethier 2 --cimode 9

- name: 'ethier no dealiasing'
working-directory: ${{ env.NEKRS_EXAMPLES }}/ethier
run: ${{ env.NEKRS_HOME }}/bin/nrsmpi ethier 2 --cimode 10

- name: 'ethier Chebyshev+Jacobi'
working-directory: ${{ env.NEKRS_EXAMPLES }}/ethier
run: ${{ env.NEKRS_HOME }}/bin/nrsmpi ethier 2 --cimode 11

- name: 'ethier skip solving temperature'
working-directory: ${{ env.NEKRS_EXAMPLES }}/ethier
run: ${{ env.NEKRS_HOME }}/bin/nrsmpi ethier 2 --cimode 12

- name: 'ethier solve single scalar only'
working-directory: ${{ env.NEKRS_EXAMPLES }}/ethier
run: ${{ env.NEKRS_HOME }}/bin/nrsmpi ethierScalar 2 --cimode 13

lowMach:
needs: install
Expand All @@ -136,7 +154,7 @@ jobs:

- name: 'lowMach default'
working-directory: ${{ env.NEKRS_EXAMPLES }}/lowMach
run: ${{ env.NEKRS_HOME }}/bin/nrsmpi lowMach 2 1
run: ${{ env.NEKRS_HOME }}/bin/nrsmpi lowMach 2 --cimode 1


mv_cyl:
Expand Down Expand Up @@ -164,11 +182,53 @@ jobs:

- name: 'mv_cyl'
working-directory: ${{ env.NEKRS_EXAMPLES }}/mv_cyl
run: ${{ env.NEKRS_HOME }}/bin/nrsmpi mv_cyl 2 1
run: ${{ env.NEKRS_HOME }}/bin/nrsmpi mv_cyl 2 --cimode 1

- name: 'mv_cyl + subcycling'
working-directory: ${{ env.NEKRS_EXAMPLES }}/mv_cyl
run: ${{ env.NEKRS_HOME }}/bin/nrsmpi mv_cyl 2 2
run: ${{ env.NEKRS_HOME }}/bin/nrsmpi mv_cyl 2 --cimode 2

- name: 'mv_cyl + subcycling + elasticity solve'
working-directory: ${{ env.NEKRS_EXAMPLES }}/mv_cyl
run: ${{ env.NEKRS_HOME }}/bin/nrsmpi mv_cyl 2 --cimode 3

- name: 'mv_cyl + subcycling + elasticity solve (projection)'
working-directory: ${{ env.NEKRS_EXAMPLES }}/mv_cyl
run: ${{ env.NEKRS_HOME }}/bin/nrsmpi mv_cyl 2 --cimode 4

- name: 'mv_cyl + unaligned SYM'
working-directory: ${{ env.NEKRS_EXAMPLES }}/mv_cyl
run: ${{ env.NEKRS_HOME }}/bin/nrsmpi mv_cyl 2 --cimode 5

# TODO: resolve error in unaligned SYM + mesh solver
#- name: 'mv_cyl + unaligned SYM + mesh solver'
# working-directory: ${{ env.NEKRS_EXAMPLES }}/mv_cyl
# run: ${{ env.NEKRS_HOME }}/bin/nrsmpi mv_cyl 2 --cimode 6

- name: 'mv_cyl, derived bc'
working-directory: ${{ env.NEKRS_EXAMPLES }}/mv_cyl
run: ${{ env.NEKRS_HOME }}/bin/nrsmpi mv_cyl_derived_bc 2 --cimode 1

- name: 'mv_cyl + subcycling, derived bc'
working-directory: ${{ env.NEKRS_EXAMPLES }}/mv_cyl
run: ${{ env.NEKRS_HOME }}/bin/nrsmpi mv_cyl_derived_bc 2 --cimode 2

- name: 'mv_cyl + subcycling + elasticity solve, derived bc'
working-directory: ${{ env.NEKRS_EXAMPLES }}/mv_cyl
run: ${{ env.NEKRS_HOME }}/bin/nrsmpi mv_cyl_derived_bc 2 --cimode 3

- name: 'mv_cyl + subcycling + elasticity solve (projection), derived bc'
working-directory: ${{ env.NEKRS_EXAMPLES }}/mv_cyl
run: ${{ env.NEKRS_HOME }}/bin/nrsmpi mv_cyl_derived_bc 2 --cimode 4

- name: 'mv_cyl + unaligned SYM, derived bc'
working-directory: ${{ env.NEKRS_EXAMPLES }}/mv_cyl
run: ${{ env.NEKRS_HOME }}/bin/nrsmpi mv_cyl_derived_bc 2 --cimode 5

# TODO: resolve error in unaligned SYM + mesh solver
#- name: 'mv_cyl + unaligned SYM + mesh solver, derived bc'
# working-directory: ${{ env.NEKRS_EXAMPLES }}/mv_cyl
# run: ${{ env.NEKRS_HOME }}/bin/nrsmpi mv_cyl_derived_bc 2 --cimode 6


conj_ht:
Expand Down Expand Up @@ -196,7 +256,7 @@ jobs:

- name: 'conj_ht'
working-directory: ${{ env.NEKRS_EXAMPLES }}/conj_ht
run: ${{ env.NEKRS_HOME }}/bin/nrsmpi conj_ht 2 1
run: ${{ env.NEKRS_HOME }}/bin/nrsmpi conj_ht 2 --cimode 1


channelStress:
Expand All @@ -222,10 +282,44 @@ jobs:
- name: Set install dir permissions
run: chmod -R 755 ${{ env.NEKRS_INSTALL_DIR }}

- name: 'channelStress'
- name: 'channelStress (no rotation)'
working-directory: ${{ env.NEKRS_EXAMPLES }}/channel
run: ${{ env.NEKRS_HOME }}/bin/nrsmpi channel 2 --cimode 1

- name: 'channelStress (45 degree rotation)'
working-directory: ${{ env.NEKRS_EXAMPLES }}/channel
run: ${{ env.NEKRS_HOME }}/bin/nrsmpi channel 2 1
run: ${{ env.NEKRS_HOME }}/bin/nrsmpi channel 2 --cimode 2

tractionBoundary:
needs: install
runs-on: ubuntu-18.04
steps:

- uses: actions/checkout@v2
with:
clean: true

- name: APT dependencies
run: |
sudo apt -y update
sudo apt install -y mpich libmpich-dev
- name: Download install dir
uses: actions/download-artifact@v2
with:
name: install-dir
path: ${{ env.NEKRS_INSTALL_DIR }}

- name: Set install dir permissions
run: chmod -R 755 ${{ env.NEKRS_INSTALL_DIR }}

- name: 'traction channel (no rotation)'
working-directory: ${{ env.NEKRS_EXAMPLES }}/shlChannel
run: ${{ env.NEKRS_HOME }}/bin/nrsmpi channel 2 --cimode 1

- name: 'traction channel (45 degree rotation)'
working-directory: ${{ env.NEKRS_EXAMPLES }}/shlChannel
run: ${{ env.NEKRS_HOME }}/bin/nrsmpi channel 2 --cimode 2

kershaw:
runs-on: ubuntu-18.04
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ build/
CMakeFiles
*.tgz
.vscode/
.clang-format
*.swp
# From AMGX
plugin_config.cu
*.swp
.cache/
Loading

0 comments on commit 9ae8872

Please sign in to comment.