Merge pull request #2 from ComputationalRadiationPhysics/dev

Dev

.clang-format

@@ -0,0 +1,126 @@
+---
+# General options
+Language: Cpp
+Standard: c++17
+DisableFormat: false
+
+AccessModifierOffset: -4
+AlignAfterOpenBracket: AlwaysBreak
+AlignConsecutiveAssignments: false
+AlignConsecutiveDeclarations: false
+AlignConsecutiveMacros: false
+AlignEscapedNewlines: Right
+AlignOperands: false
+AlignTrailingComments: false
+AllowAllArgumentsOnNextLine: false
+AllowAllConstructorInitializersOnNextLine: false
+AllowAllParametersOfDeclarationOnNextLine: false
+AllowShortBlocksOnASingleLine: Never
+AllowShortCaseLabelsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: None
+AllowShortIfStatementsOnASingleLine: Never
+AllowShortLambdasOnASingleLine: All
+AllowShortLoopsOnASingleLine: false
+AlwaysBreakAfterReturnType: None
+AlwaysBreakBeforeMultilineStrings: false
+AlwaysBreakTemplateDeclarations: Yes
+BinPackArguments: false
+BinPackParameters: false
+BreakBeforeBinaryOperators: All
+BreakBeforeBraces: Allman
+BreakBeforeTernaryOperators: true
+BreakConstructorInitializers: BeforeComma
+BreakInheritanceList: BeforeComma
+BreakStringLiterals: true
+ColumnLimit: 119
+CommentPragmas:  '^ COMMENT pragma:'
+CompactNamespaces: false
+ConstructorInitializerAllOnOneLineOrOnePerLine: true
+ConstructorInitializerIndentWidth: 4
+ContinuationIndentWidth: 4
+Cpp11BracedListStyle: true
+DeriveLineEnding: true
+DerivePointerAlignment: false
+ExperimentalAutoDetectBinPacking: false
+FixNamespaceComments: true
+IncludeBlocks: Regroup
+IncludeIsMainRegex: '(Test)?$'
+IncludeIsMainSourceRegex: ''
+IndentCaseLabels: false
+IndentGotoLabels: true
+IndentPPDirectives: AfterHash
+IndentWidth: 4
+IndentWrappedFunctionNames: false
+KeepEmptyLinesAtTheStartOfBlocks: false
+MacroBlockBegin: ''
+MacroBlockEnd:   ''
+MaxEmptyLinesToKeep: 2
+NamespaceIndentation: All
+PenaltyBreakAssignment: 2
+PenaltyBreakBeforeFirstCallParameter: 19
+PenaltyBreakComment: 300
+PenaltyBreakFirstLessLess: 120
+PenaltyBreakString: 1000
+PenaltyBreakTemplateDeclaration: 10
+PenaltyExcessCharacter: 1000000
+PenaltyReturnTypeOnItsOwnLine: 1000
+PointerAlignment: Left
+ReflowComments: true
+SortIncludes: false
+SortUsingDeclarations: true
+SpaceAfterCStyleCast: true
+SpaceAfterLogicalNot: false
+SpaceAfterTemplateKeyword: false
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeCpp11BracedList: false
+SpaceBeforeCtorInitializerColon: true
+SpaceBeforeInheritanceColon: true
+SpaceBeforeParens: Never
+SpaceBeforeRangeBasedForLoopColon: true
+SpaceInEmptyBlock: false
+SpaceInEmptyParentheses: false
+SpacesBeforeTrailingComments: 1
+SpacesInAngles:  false
+SpacesInConditionalStatement: false
+SpacesInContainerLiterals: false
+SpacesInCStyleCastParentheses: false
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+SpaceBeforeSquareBrackets: false
+TabWidth: 4
+UseCRLF: false
+UseTab: Never
+
+# Project specific options
+IncludeCategories:
+  # Local headers (in "") above all else
+  - Regex: '"([A-Za-z0-9.\/-_])+"'
+    Priority: 1
+    # <pmacc/foo.hpp>
+  - Regex: '<pmacc/([A-Za-z0-9.\/-_])+>'
+    Priority: 2
+    # <cupla/foo.hpp>
+  - Regex: '<cupla/([A-Za-z0-9.\/-_])+>'
+    Priority: 3
+  # <alpaka/foo.hpp>
+  - Regex: '<alpaka/([A-Za-z0-9.\/-_])+>'
+    Priority: 4
+  # <boost/foo.hpp>
+  - Regex: '<boost/([A-Za-z0-9.\/-_])+>'
+    Priority: 5
+  # C++ standard library headers are the last group to be included
+  - Regex: '<([A-Za-z0-9\/-_])+>'
+    Priority: 6
+  # Includes that made it this far are third-party headers and will be placed
+  # below alpaka's includes
+  - Regex: '<([A-Za-z0-9.\/-_])+>'
+    Priority: 7
+
+# Future options - not supported in clang-format 11
+# AlignConsecutiveBitFields: false
+# AllowShortEnumsOnASingleLine: false
+# BitFieldColonSpacing: Both
+# IndentCaseBlocks: true
+# IndentExternBlock: AfterExternBlock
+# OperandAlignmentStyle: Align
+...

.gitlab-ci.yml

@@ -1,6 +1,6 @@
 
 stages:
-  - rebase
+  - validate
   - generate
   - compile
 
@@ -17,11 +17,35 @@ stages:
     paths:
       - compile.yml
 
-# test to rebase the PR to the destination branch
-test-rebase-to-mainline:
-  stage: rebase
+# pull request validation:
+#   - check PR destination
+#   - check python code style: flake8, pyflake
+#   - rebase the PR to the destination branch
+#   - check C++ code style
+pull-request-validation:
+  stage: validate
+  image: ubuntu:focal
   script:
+    - apt update
+    - apt install -y -q git curl wget python3 python3-pip
+    # Test if pull request can be merged into the destination branch
+    - $CI_PROJECT_DIR/test/correctBranchPR
     - source $CI_PROJECT_DIR/share/ci/git_merge.sh
+    - pip3 install -U flake8 pyflakes
+    # Test Python Files for PEP8 conformance
+    - flake8 --exclude=thirdParty .
+    # Warnings, unused code, etc.
+    - pyflakes .
+    # install clang-format-11
+    - apt install -y -q gnupg2
+    - wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add -
+    - echo "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-11 main" | tee -a /etc/apt/sources.list
+    - apt update
+    - apt install -y clang-format-11
+    # Check C++ code style
+    - source $CI_PROJECT_DIR/share/ci/check_cpp_code_style.sh
+  tags:
+    - x86_64
 
 # generate reduced test matrix
 # required variables (space separated lists):

INSTALL.rst

@@ -31,10 +31,11 @@ Mandatory
 
 gcc
 """
-- 5.5 - 7 (if you want to build for Nvidia GPUs, supported compilers depend on your current `CUDA version <https://gist.github.com/ax3l/9489132>`_)
+- 5.5 - 10.0 (if you want to build for Nvidia GPUs, supported compilers depend on your current `CUDA version <https://gist.github.com/ax3l/9489132>`_)
 
   - CUDA 9.2 - 10.0: Use gcc 5.5 - 7
   - CUDA 10.1/10.2: Use gcc 5.5 - 8
+  - CUDA 11.x: Used gcc 5.5 - 10.0
 - *note:* be sure to build all libraries/dependencies with the *same* gcc version; GCC 5 or newer is recommended
 - *Debian/Ubuntu:*
 

README.md

@@ -1,8 +1,8 @@
 PIConGPU - Particle-in-Cell Simulations for the Exascale Era
 ============================================================
 
-[![Code Status master](https://img.shields.io/travis/ComputationalRadiationPhysics/picongpu/master.svg?label=master)](https://travis-ci.org/ComputationalRadiationPhysics/picongpu/branches)
-[![Code Status dev](https://img.shields.io/travis/ComputationalRadiationPhysics/picongpu/dev.svg?label=dev)](https://travis-ci.org/ComputationalRadiationPhysics/picongpu/branches)
+[![Code Status master](https://gitlab.com/hzdr/crp/picongpu/badges/master/pipeline.svg?key_text=master)](https://gitlab.com/hzdr/crp/picongpu/pipelines/master/latest)
+[![Code Status dev](https://gitlab.com/hzdr/crp/picongpu/badges/dev/pipeline.svg?key_text=dev)](https://gitlab.com/hzdr/crp/picongpu/pipelines/dev/latest)
 [![Documentation Status](https://readthedocs.org/projects/picongpu/badge/?version=latest)](http://picongpu.readthedocs.io)
 [![Doxygen](https://img.shields.io/badge/API-Doxygen-blue.svg)](http://computationalradiationphysics.github.io/picongpu)
 [![GitHub commits since last release](https://img.shields.io/github/commits-since/ComputationalRadiationPhysics/picongpu/latest/dev.svg)](https://github.com/ComputationalRadiationPhysics/picongpu/compare/master...dev)
@@ -38,7 +38,7 @@ Its features for the electro-magnetic PIC algorithm include:
   [*Esirkepov*](http://dx.doi.org/10.1016/S0010-4655%2800%2900228-9)
   and *ZigZag*
 - macro-particle form factors ranging from NGP (0th order), CIC (1st),
-  TSC (2nd), PSQ (3rd) to P4S (4th)
+  TSC (2nd), PQS (3rd) to PCS (4th)
 
 and the electro-magnetic PIC algorithm is further self-consistently coupled to:
 - classical radiation reaction

bin/pic-compile

@@ -131,7 +131,7 @@ do
             $picongpu_prefix/buildsystem/CompileSuite/compileSet.sh \
                 "$example_name" "$testFlagNr" "$globalCMakeOptions" \
                 "$tmpRun_path" "$buildDir" "$examples_path" \
-                "$quiet_run" | tee $buildDir"/compile.log" || exit $?
+                "$quiet_run"  &> $buildDir"/compile.log"
         fi
 
         testFlagNr=$(( testFlagNr + 1 ))