Squashed 'thirdParty/cupla/' changes from 0594a68a0d..f60a0ac72c

f60a0ac72c Merge pull request ComputationalRadiationPhysics#155 from ComputationalRadiationPhysics/dev 4c73dde10d Merge pull request ComputationalRadiationPhysics#152 from psychocoderHPC/topic-changeLogVersionIncreaseTo0.2.0 fc428aa8e9 update release date for 0.2.0 1e32118c80 Merge pull request ComputationalRadiationPhysics#154 from sbastrakov/topic-addInt3Float3 84008fb6ae Add float3 and int3 with make-functions 4d5eace02a Merge pull request ComputationalRadiationPhysics#153 from sbastrakov/topic-finalizeBlackScholes2 bc35f6a822 Add Black-Scholes example 4b1ab5722f Merge pull request ComputationalRadiationPhysics#146 from psychocoderHPC/topic-changeLogVersionIncreaseTo0.2.0 52ddba6b26 changelog and version increase to 0.2.0 aabb8d5339 Merge pull request ComputationalRadiationPhysics#145 from psychocoderHPC/fix-minimalCMakeRequirements 7795e58c0c Merge pull request ComputationalRadiationPhysics#147 from psychocoderHPC/topic-updateAuthorSection 974afe8451 Merge pull request ComputationalRadiationPhysics#150 from sbastrakov/doc-clarifyThreadUnsafety caf4fdda1e Extend the docs with thread unsafety 91d78da7eb Merge pull request ComputationalRadiationPhysics#149 from psychocoderHPC/topic-setTravisCmakeToMinimumRequiredVersion a3bc920dfa use CMake 3.11.4 for travis tests 9ccab281e9 update author section 6bc13a220c Merge pull request ComputationalRadiationPhysics#148 from psychocoderHPC/topic-cuplaLogo 406fb5b93a update minimal CMake requirements to 3.11.4 9c32408da3 add cupla logo cd6b9859d4 Merge pull request ComputationalRadiationPhysics#144 from psychocoderHPC/topic-hipPinnedMemory c9fb7dd047 pin memory allocated with `cuplaMallocHoast` 92f8c82474 Merge pull request ComputationalRadiationPhysics#143 from psychocoderHPC/topic-updateAlpakaTo0.4.0 27f0bca235 Merge commit '0f175188a374a0194145728f2083256e1eb14b13' into topic-updateAlpakaTo0.4.0 0f175188a3 Squashed 'alpaka/' changes from d5e59590f..ab0b8a460 1e4aea9747 Merge pull request ComputationalRadiationPhysics#142 from sbastrakov/fix-typeCastWarnings 8f453a4bf5 Fix warnings concerning type casting 08f80ef24b Merge pull request ComputationalRadiationPhysics#141 from sbastrakov/topic-extendAtomicComments b3d34b28ab Extend comments of atomic functions git-subtree-dir: thirdParty/cupla git-subtree-split: f60a0ac72cb175d4a8a67301882f7a6b1de4c3c3
sbastrakov · Feb 5, 2021 · b4fabce · b4fabce
1 parent a5da891
commit b4fabce
Show file tree

Hide file tree

Showing 22 changed files with 2,100 additions and 187 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,255 @@
+language: none
+sudo: false
+dist: trusty
+
+cache:
+  apt: true
+  directories:
+    - $HOME/.cache/spack
+    - $HOME/.cache/cmake-3.11.4
+  pip: true
+
+addons:
+  apt:
+    sources:
+      - ubuntu-toolchain-r-test
+    packages:
+      - g++-4.9
+      - gfortran-4.9  # spack OpenMPI dependency
+      - environment-modules
+      - openmpi-bin
+      - libopenmpi-dev
+      # clang 5.0.0 is pre-installed
+      # - clang-tidy-3.9
+
+env:
+  global:
+    - SPACK_ROOT: $HOME/.cache/spack
+    - PATH: $PATH:$HOME/.cache/spack/bin
+    - CXXFLAGS: "-std=c++11"
+
+install:
+  #############################################################################
+  # PMacc CPU-only dependencies                                               #
+  #############################################################################
+<<<<<<< HEAD
+  - SPACK_FOUND=$(which spack >/dev/null && { echo 0; } || { echo 1; })
+  - if [ $SPACK_FOUND -ne 0 ]; then
+      mkdir -p $SPACK_ROOT &&
+      git clone --depth 50 https://github.com/spack/spack.git $SPACK_ROOT &&
+      echo -e "config:""\n  build_jobs:"" 2" > $SPACK_ROOT/etc/spack/config.yaml &&
+      echo -e "packages:""\n  cmake:""\n    version:"" [3.11.4]""\n    paths:""\n      [email protected]:"" /home/travis/.cache/cmake-3.11.4""\n    buildable:"" False" > $SPACK_ROOT/etc/spack/packages.yaml;
+=======
+  - export PATH=$CMAKE_ROOT/bin:$PATH
+  - CMAKE_3_11_4_FOUND=$(cmake --version | grep " 3\.11\.4" >/dev/null && { echo 0; } || { echo 1; })
+  - if [ $CMAKE_3_11_4_FOUND -ne 0 ]; then
+      mkdir -p $CMAKE_ROOT &&
+      cd $CMAKE_ROOT &&
+      rm -rf $CMAKE_ROOT/* &&
+      travis_retry wget --no-check-certificate http://cmake.org/files/v3.11/cmake-3.11.4-Linux-x86_64.tar.gz &&
+      tar -xzf cmake-3.11.4-Linux-x86_64.tar.gz &&
+      mv cmake-3.11.4-Linux-x86_64/* . &&
+      rm -rf cmake-3.11.4-Linux-x86_64.tar.gz cmake-3.11.4-Linux-x86_64 &&
+      cd -;
+>>>>>>> Squashed 'thirdParty/cupla/' changes from 0594a68a0d..f60a0ac72c
+    fi
+  - spack compiler add
+  # required dependencies - CMake 3.11.4
+  - if [ "$TRAVIS_OS_NAME" == "linux" ]; then
+      if [ ! -f $HOME/.cache/cmake-3.11.4/bin/cmake ]; then
+        wget -O cmake.sh https://cmake.org/files/v3.11/cmake-3.11.4-Linux-x86_64.sh &&
+        sh cmake.sh --skip-license --exclude-subdir --prefix=$HOME/.cache/cmake-3.11.4 &&
+        rm cmake.sh;
+      fi;
+    elif [ "$TRAVIS_OS_NAME" == "osx" ]; then
+      if [ ! -d /Applications/CMake.app/Contents/ ]; then
+        curl -L -s -o cmake.dmg https://cmake.org/files/v3.11/cmake-3.11.4-Darwin-x86_64.dmg &&
+        yes | hdiutil mount cmake.dmg &&
+        sudo cp -R "/Volumes/cmake-3.11.4-Darwin-x86_64/CMake.app" /Applications &&
+        hdiutil detach /dev/disk1s1 &&
+        rm cmake.dmg;
+      fi;
+    fi
+  - travis_wait spack install
+      cmake
+      $COMPILERSPEC
+  # required dependencies - Boost 1.65.1
+  - travis_wait spack install
+      [email protected]~date_time~graph~iostreams~locale~log~random~thread~timer~wave
+      $COMPILERSPEC
+  - spack clean -a
+  - source /etc/profile &&
+    source $SPACK_ROOT/share/spack/setup-env.sh
+  - spack load cmake
+  - spack load boost $COMPILERSPEC
+
+<<<<<<< HEAD
+jobs:
+  fast_finish: true
+  include:
+    - stage: 'Target Branch'
+      install: skip
+      script:
+        #############################################################################
+        # Disallow PRs to `ComputationalRadiationPhysics/picongpu` branch `master`  #
+        # if not an other mainline branch such as `dev` or `release-...`            #
+        #############################################################################
+        - . test/correctBranchPR
+    - &style-python
+      stage: 'Style'
+      language: python
+      python: "2.7"
+      install: pip install -U flake8
+      script:
+        #############################################################################
+        # Test Python Files for PEP8 conformance                                    #
+        #############################################################################
+        - flake8 --exclude=thirdParty .
+    - <<: *style-python
+      python: "3.6"
+    - install: skip
+      language: cpp
+      script:
+        #############################################################################
+        # Conformance with Alpaka: Do not write __global__ CUDA kernels directly    #
+        #############################################################################
+        - test/hasCudaGlobalKeyword include/pmacc
+        - test/hasCudaGlobalKeyword share/pmacc/examples
+        - test/hasCudaGlobalKeyword include/picongpu
+        - test/hasCudaGlobalKeyword share/picongpu/examples
+
+        #############################################################################
+        # Disallow end-of-line (EOL) white spaces                                   #
+        #############################################################################
+        - test/hasEOLwhiteSpace
+
+        #############################################################################
+        # Disallow TABs, use white spaces                                           #
+        #############################################################################
+        - test/hasTabs
+
+        #############################################################################
+        # Disallow non-ASCII in source files and scripts                            #
+        #############################################################################
+        - test/hasNonASCII
+
+        #############################################################################
+        # Disallow spaces before pre-compiler macros                                #
+        #############################################################################
+        - test/hasSpaceBeforePrecompiler
+
+        #############################################################################
+        # Enforce angle brackets <...> for includes of external library files       #
+        #############################################################################
+        - test/hasExtLibIncludeBrackets include boost
+        - test/hasExtLibIncludeBrackets include alpaka
+        - test/hasExtLibIncludeBrackets include cupla
+        - test/hasExtLibIncludeBrackets include splash
+        - test/hasExtLibIncludeBrackets include mallocMC
+        - test/hasExtLibIncludeBrackets include/picongpu pmacc
+        - test/hasExtLibIncludeBrackets share/picongpu/examples pmacc
+        - test/hasExtLibIncludeBrackets share/picongpu/examples boost
+        - test/hasExtLibIncludeBrackets share/picongpu/examples alpaka
+        - test/hasExtLibIncludeBrackets share/picongpu/examples cupla
+        - test/hasExtLibIncludeBrackets share/picongpu/examples splash
+        - test/hasExtLibIncludeBrackets share/picongpu/examples mallocMC
+        - test/hasExtLibIncludeBrackets share/pmacc/examples pmacc
+    - &static-code-python
+      stage: 'Static Code Analysis'
+      language: python
+      python: "2.7"
+      install: pip install -U pyflakes
+      script:
+        #############################################################################
+        # Warnings, unused code, etc.                                               #
+        #############################################################################
+        - pyflakes .
+    - <<: *static-code-python
+      python: "3.6"
+    - &test-cpp-unit
+      stage: 'C++ Unit Tests'
+      language: cpp
+      env: [ COMPILERSPEC='%[email protected]' ]
+      before_install:
+        - export CXX=g++-4.9
+        - export CC=gcc-4.9
+        - export FC=gfortran-4.9
+      script:
+        - $CXX --version
+        - $CC --version
+        - $FC --version
+        #############################################################################
+        # PMacc CPU-only tests                                                      #
+        #############################################################################
+        - mkdir -p $HOME/build
+        - cd $HOME/build
+        - cmake $TRAVIS_BUILD_DIR/include/pmacc
+                -DALPAKA_ACC_CPU_B_OMP2_T_SEQ_ENABLE=ON
+        - make -j 2
+        # - make test  # reduce memory and RT costs first
+    - <<: *test-cpp-unit
+      env: [ COMPILERSPEC='%[email protected]' ]
+      before_install:
+        - export CXX=clang++
+        - export CC=clang
+        - export FC=gfortran-4.9
+=======
+script:
+  #############################################################################
+  # Example: Matrix Multiplication (adapted original)                         #
+  #############################################################################
+  - cd $HOME/matrixMul
+  - cmake $TRAVIS_BUILD_DIR/example/CUDASamples/matrixMul/ $CMAKE_FLAGS
+  - make
+  # can not run with CPU_B_SEQ_T_SEQ due to missing elements layer in original
+  #   SDK example
+  # CPU_B_SEQ_T_OMP2/THREADS: too many threads necessary (256)
+  # - ./matrixMul -wA=64 -wB=64 -hA=64 -hB=64
+  #############################################################################
+  # Example: Async API (adapted original)                                     #
+  #############################################################################
+  - cd $HOME/asyncAPI
+  - cmake $TRAVIS_BUILD_DIR/example/CUDASamples/asyncAPI/ $CMAKE_FLAGS
+  - make
+  # can not run with CPU_B_SEQ_T_SEQ due to missing elements layer in original
+  #   SDK example
+  # CPU_B_SEQ_T_OMP2/THREADS: too many threads necessary (512)
+  # - ./asyncAPI
+  #############################################################################
+  # Example: Async API (added elements layer)                                 #
+  #############################################################################
+  - cd $HOME/asyncAPI_tuned
+  - cmake $TRAVIS_BUILD_DIR/example/CUDASamples/asyncAPI_tuned/ $CMAKE_FLAGS
+  - make
+  - if [ $STRATEGY == "CPU_B_OMP2_T_SEQ" ] ||
+       [ $STRATEGY == "CPU_B_SEQ_T_SEQ" ]; then
+      ./asyncAPI_tuned;
+    fi
+  #############################################################################
+  # Example: vectorAdd (added elements layer)                                 #
+  #############################################################################
+  - cd $HOME/vectorAdd
+  - cmake $TRAVIS_BUILD_DIR/example/CUDASamples/vectorAdd/ $CMAKE_FLAGS
+  - make
+  - if [ $STRATEGY == "CPU_B_OMP2_T_SEQ" ] ||
+       [ $STRATEGY == "CPU_B_SEQ_T_SEQ" ]; then
+      ./vectorAdd 100000;
+    fi
+  #############################################################################
+  # Example: BlackScholes (adapted original)                                 #
+  #############################################################################
+  - cd $HOME/blackScholes
+  - cmake $TRAVIS_BUILD_DIR/example/CUDASamples/blackScholes/ $CMAKE_FLAGS
+  - make
+  - if [ $STRATEGY == "CPU_B_OMP2_T_SEQ" ] ||
+       [ $STRATEGY == "CPU_B_SEQ_T_SEQ" ]; then
+      ./blackScholes;
+    fi
+  #############################################################################
+  # Test: additional tests                                                    #
+  #############################################################################
+  - cd $HOME/test/config
+  - if [[ $CXX =~ "^g\+\+" ]] || [[ "$COMPILER" == "nvcc" ]] ; then
+      $TRAVIS_BUILD_DIR/test/system/config/test.sh $CXX;
+    fi
+>>>>>>> Squashed 'thirdParty/cupla/' changes from 0594a68a0d..f60a0ac72c
diff --git a/README.md b/README.md
@@ -235,4 +235,4 @@ way!
 ********************************************************************************
 
 ![image of an lwfa](docs/images/lwfa_iso.png "LWFA")
-![image of our strong scaling](docs/images/StrongScalingPIConGPU_log.png "Strong Scaling")
+![image of our strong scaling](docs/images/StrongScalingPIConGPU_log.png "Strong Scaling")