Squashed 'thirdParty/cupla/' changes from ed00837ef6..d6310a037e

d6310a037e Merge pull request ComputationalRadiationPhysics#165 from psychocoderHPC/topic-updateGithubLinks2 e7f9261bf7 update cupla github links f4dba001d4 Merge pull request ComputationalRadiationPhysics#162 from psychocoderHPC/topic-cuplaAccMathFunctions bbbc0b0266 `BlackScholes` use cupla math functions efa8d61037 on device math functions dbc0f649b2 Merge pull request ComputationalRadiationPhysics#160 from psychocoderHPC/topic-updateAlpakaTo0.5.0dev b31fc4ea33 Merge commit '13b737ba6cd38400636d6a6a52dee81b21a7412c' into topic-updateAlpakaTo0.5.0dev 13b737ba6c Squashed 'alpaka/' changes from ab0b8a460..c2d14d09e 09d5daf1ff update travis tests 582f8ca10e update CMake requirements 59fba492fa include changes needed to use alpaka 0.5.0 git-subtree-dir: thirdParty/cupla git-subtree-split: d6310a037e7207325e951a2ef5712268804a5b91
psychocoderHPC · Apr 6, 2020 · 1e47478 · 1e47478
1 parent 8689202
commit 1e47478
Show file tree

Hide file tree

Showing 347 changed files with 7,029 additions and 15,585 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -14,15 +14,15 @@ addons:
     sources:
       - ubuntu-toolchain-r-test
     packages:
-      - g++-4.9
+      - g++-5
       - clang-4.0
 
 env:
   global:
     - CUDA_ROOT: $HOME/.cache/cuda
     - CMAKE_ROOT: $HOME/.cache/cmake
     - BOOST_ROOT: $HOME/.cache/boost
-    - BOOST_MIN: 106000 # careful: hard coded below
+    - BOOST_MIN: 106501 # careful: hard coded below
     - CUPLA_ROOT: $TRAVIS_BUILD_DIR
     - OMP_NUM_THREADS: 4 # ignored in thread layer
   matrix:
@@ -44,9 +44,9 @@ before_install:
   - mkdir -p $HOME/test/config
   - export CMAKE_FLAGS="-DALPAKA_ACC_"$STRATEGY"_ENABLE=ON"
   - if [ "$COMPILER" == "gcc" ]; then
-        echo "Using g++-4.9 and sequential OpenMP2 threads ...";
-        export CXX=g++-4.9;
-        export CC=gcc-4.9;
+        echo "Using g++-5 and sequential OpenMP2 threads ...";
+        export CXX=g++-5;
+        export CC=gcc-5;
         unset CUDA_ROOT;
     elif [ "$COMPILER" == "clang" ]; then
         echo "Using clang++-4.0 & sequential threads ...";
@@ -55,8 +55,8 @@ before_install:
         unset CUDA_ROOT;
     elif [ "$COMPILER" == "nvcc" ]; then
         echo "Using CUDA 7.5 ...";
-        export CXX=g++-4.9;
-        export CC=gcc-4.9;
+        export CXX=g++-5;
+        export CC=gcc-5;
         export PATH=$CUDA_ROOT/bin:$PATH;
     fi
   - echo "$CMAKE_FLAGS"
@@ -69,15 +69,15 @@ install:
   # CMAKE                                                                     #
   #############################################################################
   - 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
+  - CMAKE_3_15_0_FOUND=$(cmake --version | grep " 3\.15\.0" >/dev/null && { echo 0; } || { echo 1; })
+  - if [ $CMAKE_3_15_0_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 &&
+      travis_retry wget --no-check-certificate http://cmake.org/files/v3.15/cmake-3.15.0-Linux-x86_64.tar.gz &&
+      tar -xzf cmake-3.15.0-Linux-x86_64.tar.gz &&
+      mv cmake-3.15.0-Linux-x86_64/* . &&
+      rm -rf cmake-3.15.0-Linux-x86_64.tar.gz cmake-3.15.0-Linux-x86_64 &&
       cd -;
     fi
   - cmake --version
@@ -93,13 +93,13 @@ install:
   - if [ $BOOST_FOUND -ne 0 ]; then
       mkdir -p $ BOOST_ROOT &&
       cd $BOOST_ROOT &&
-      travis_retry wget --no-check-certificate -O boost.tar.bz2 http://sourceforge.net/projects/boost/files/boost/1.62.0/boost_1_62_0.tar.bz2/download &&
+      travis_retry wget --no-check-certificate -O boost.tar.bz2 http://sourceforge.net/projects/boost/files/boost/1.65.1/boost_1_65_1.tar.bz2/download &&
       tar -xjf boost.tar.bz2 &&
-      cd boost_1_62_0 &&
+      cd boost_1_65_1 &&
       ./bootstrap.sh --with-libraries=atomic,chrono,context,date_time,system,thread --prefix=$BOOST_ROOT &&
       ./b2 -j2 &&
       ./b2 install &&
-      rm -rf boost.tar.bz2 boost_1_62_0 &&
+      rm -rf boost.tar.bz2 boost_1_65_1 &&
       cd $HOME;
     fi
   #############################################################################
@@ -109,10 +109,10 @@ install:
   - if [ $NVCC_FOUND -ne 0 ] && [ $COMPILER == "nvcc" ]; then
       mkdir -p $CUDA_ROOT &&
       cd $CUDA_ROOT &&
-      travis_retry wget https://developer.nvidia.com/compute/cuda/8.0/prod/local_installers/cuda_8.0.44_linux-run &&
-      chmod u+x ./cuda_8.0.44_linux-run &&
-      ./cuda_8.0.44_linux-run --override --silent --verbose --toolkit --toolkitpath=$CUDA_ROOT &&
-      rm -rf cuda_8.0.44_linux-run $CUDA_ROOT/{samples,jre,doc,share} &&
+      travis_retry wget https://developer.nvidia.com/compute/cuda/9.0/Prod/local_installers/cuda_9.0.176_384.81_linux-run &&
+      chmod u+x *-run &&
+      ./cuda_9.0.176_384.81_linux-run --override --silent --verbose --toolkit --toolkitpath=$CUDA_ROOT &&
+      rm -rf ./cuda_9.0.176_384.81_linux-run $CUDA_ROOT/{samples,jre,doc,share} &&
       cd -;
     fi
 

diff --git a/INSTALL.md b/INSTALL.md
@@ -4,17 +4,17 @@ cupla Install Guide
 Requirements
 ------------
 
-- **cmake**  3.11.4 or higher
+- **cmake**  3.15.0 or higher
   - *Debian/Ubuntu:* `sudo apt-get install cmake file cmake-curses-gui`
   - *Arch Linux:* `sudo pacman --sync cmake`
 
 - **cupla**
-  - https://github.com/ComputationalRadiationPhysics/cupla
+  - https://github.com/alpaka-group/cupla
   - `export CUPLA_ROOT=<cupla_SRC_CODE_DIR>`
   - `export CMAKE_PREFIX_PATH=$CUPLA_ROOT:$CMAKE_PREFIX_PATH`
   - example:
     - `mkdir -p $HOME/src`
-    - `git clone git://github.com/ComputationalRadiationPhysics/cupla.git $HOME/src/cupla`
+    - `git clone git://github.com/alpaka-group/cupla.git $HOME/src/cupla`
     - `cd $HOME/src/cupla`
     - `export CUPLA_ROOT=$HOME/src/cupla`
   - use a different alpaka installation:
@@ -48,7 +48,7 @@ How to update alpaka as git subtree?
 # git author is generic to not mess up contribution statistics
 GIT_AUTHOR_NAME="Third Party" GIT_AUTHOR_EMAIL="crp-git@hzdr.de" \
  git subtree pull --prefix alpaka \
- https://github.com/ComputationalRadiationPhysics/alpaka.git develop --squash
+ https://github.com/alpaka-group/alpaka.git develop --squash
 ```
 
 **How to commit local changes to alpaka upstream?**

diff --git a/README.md b/README.md
@@ -1,14 +1,14 @@
 **cupla** - C++ User interface for the Platform independent Library Alpaka
 ==========================================================================
 
-[![Build Status dev](https://img.shields.io/travis/ComputationalRadiationPhysics/cupla/dev.svg?label=dev)](https://travis-ci.org/ComputationalRadiationPhysics/cupla/branches)
+[![Build Status dev](https://img.shields.io/travis/alpaka-group/cupla/dev.svg?label=dev)](https://travis-ci.org/alpaka-group/cupla/branches)
 
 ![cupla Release](doc/logo/cupla_logo_320x210.png)
 
 **cupla** [[qχɑpˈlɑʔ]](https://en.wiktionary.org/wiki/Qapla%27) is a simple user
 interface for the platform independent parallel kernel
 acceleration library
-[**alpaka**](https://github.com/ComputationalRadiationPhysics/alpaka).
+[**alpaka**](https://github.com/alpaka-group/alpaka).
 It follows a similar concept as the
 [NVIDIA® CUDA® API](https://developer.nvidia.com/cuda-zone) by
 providing a software layer to manage accelerator devices.
@@ -38,8 +38,8 @@ For more information see [LICENSE.md](LICENSE.md).
 Dependencies
 ------------
 
-- **cmake 3.11.4**
-- **[alpaka 0.4.0](https://github.com/ComputationalRadiationPhysics/alpaka/)**
+- **cmake 3.15.0**
+- **[alpaka 0.5.0](https://github.com/alpaka-group/alpaka/)**
   - alpaka is loaded as `git subtree` within **cupla**, see [INSTALL.md](INSTALL.md)
 
 Usage

diff --git a/alpaka/.github/workflows/ci.yml b/alpaka/.github/workflows/ci.yml
@@ -0,0 +1,136 @@
+name: Continuous Integration
+
+on: [push, pull_request]
+
+env:
+  ALPAKA_CI: GITHUB
+  TBB_ROOT: tbb
+  BOOST_ROOT: boost
+  ALPAKA_CI_BOOST_LIB_DIR: boost_libs
+  ALPAKA_CI_CLANG_DIR: llvm
+  ALPAKA_CI_CMAKE_DIR: CMake
+  ALPAKA_CI_CUDA_DIR: CUDA
+  ALPAKA_CI_HIP_ROOT_DIR: hip
+  ALPAKA_CI_SANITIZERS:
+  ALPAKA_CI_ANALYSIS: OFF
+  ALPAKA_ACC_GPU_CUDA_ENABLE: OFF
+  ALPAKA_ACC_GPU_HIP_ENABLE: OFF
+
+jobs:
+  ### Analysis builds
+  windows_cl-2019_debug_analysis:
+    name: Windows cl-2019 Debug Analysis
+    runs-on: windows-2019
+    steps:
+    - uses: actions/checkout@v1
+    - name: build + test
+      shell: bash
+      run: cd ${GITHUB_WORKSPACE} && ./script/ci.sh
+      env: {TRAVIS_OS_NAME: windows, CXX: cl.exe, CC: cl.exe, ALPAKA_CI_CL_VER: 2019, CMAKE_BUILD_TYPE: Debug,   ALPAKA_CI_BOOST_BRANCH: boost-1.72.0, ALPAKA_CI_CMAKE_VER: 3.16.4, ALPAKA_CI_ANALYSIS: ON, ALPAKA_DEBUG: 2}
+
+  ### Windows
+  windows_cl-2017_release:
+    name: Windows cl-2017 Release
+    runs-on: windows-2016
+    steps:
+    - uses: actions/checkout@v1
+    - name: build + test
+      shell: bash
+      run: cd ${GITHUB_WORKSPACE} && ./script/ci.sh
+      env: {TRAVIS_OS_NAME: windows, CXX: cl.exe, CC: cl.exe, ALPAKA_CI_CL_VER: 2017, CMAKE_BUILD_TYPE: Release, ALPAKA_CI_BOOST_BRANCH: boost-1.71.0, ALPAKA_CI_CMAKE_VER: 3.16.4, OMP_NUM_THREADS: 4, ALPAKA_ACC_CPU_B_OMP2_T_SEQ_ENABLE: OFF, ALPAKA_ACC_CPU_B_SEQ_T_OMP2_ENABLE: OFF, ALPAKA_ACC_CPU_B_TBB_T_SEQ_ENABLE: OFF}
+
+  windows_cl-2017_debug:
+    name: Windows cl-2017 Debug
+    runs-on: windows-2016
+    steps:
+    - uses: actions/checkout@v1
+    - name: build + test
+      shell: bash
+      run: cd ${GITHUB_WORKSPACE} && ./script/ci.sh
+      env: {TRAVIS_OS_NAME: windows, CXX: cl.exe, CC: cl.exe, ALPAKA_CI_CL_VER: 2017, CMAKE_BUILD_TYPE: Debug,   ALPAKA_CI_BOOST_BRANCH: boost-1.65.1, ALPAKA_CI_CMAKE_VER: 3.16.4, OMP_NUM_THREADS: 3, ALPAKA_ACC_CPU_B_OMP2_T_SEQ_ENABLE: OFF, ALPAKA_ACC_CPU_B_SEQ_T_OMP2_ENABLE: OFF, ALPAKA_ACC_CPU_B_TBB_T_SEQ_ENABLE: OFF,  ALPAKA_CXX_STANDARD: 17}
+
+  windows_cl-2019_release:
+    name: Windows cl-2019 Release
+    runs-on: windows-2019
+    steps:
+    - uses: actions/checkout@v1
+    - name: build + test
+      shell: bash
+      run: cd ${GITHUB_WORKSPACE} && ./script/ci.sh
+      env: {TRAVIS_OS_NAME: windows, CXX: cl.exe, CC: cl.exe, ALPAKA_CI_CL_VER: 2019, CMAKE_BUILD_TYPE: Release, ALPAKA_CI_BOOST_BRANCH: boost-1.70.0, ALPAKA_CI_CMAKE_VER: 3.16.4, OMP_NUM_THREADS: 1, ALPAKA_ACC_CPU_B_OMP2_T_SEQ_ENABLE: OFF, ALPAKA_ACC_CPU_B_SEQ_T_OMP2_ENABLE: OFF, ALPAKA_ACC_CPU_B_TBB_T_SEQ_ENABLE: OFF}
+
+  windows_cl-2019_debug:
+    name: Windows cl-2019 Debug
+    runs-on: windows-2019
+    steps:
+    - uses: actions/checkout@v1
+    - name: build + test
+      shell: bash
+      run: cd ${GITHUB_WORKSPACE} && ./script/ci.sh
+      env: {TRAVIS_OS_NAME: windows, CXX: cl.exe, CC: cl.exe, ALPAKA_CI_CL_VER: 2019, CMAKE_BUILD_TYPE: Debug,   ALPAKA_CI_BOOST_BRANCH: boost-1.72.0, ALPAKA_CI_CMAKE_VER: 3.16.4, OMP_NUM_THREADS: 4, ALPAKA_ACC_CPU_B_OMP2_T_SEQ_ENABLE: OFF, ALPAKA_ACC_CPU_B_SEQ_T_OMP2_ENABLE: OFF, ALPAKA_ACC_CPU_B_TBB_T_SEQ_ENABLE: OFF}
+
+  ## CUDA 10.0
+  # nvcc + MSVC
+  windows_nvcc-10_0_cl-2017_release_cuda-only_separable-compilation:
+    name: Windows nvcc-10.0 + cl-2017 Release ALPAKA_ACC_GPU_CUDA_ONLY_MODE ALPAKA_CUDA_NVCC_SEPARABLE_COMPILATION
+    runs-on: windows-2016
+    steps:
+    - uses: actions/checkout@v1
+    - name: build + test
+      shell: bash
+      run: cd ${GITHUB_WORKSPACE} && ./script/ci.sh
+      env: {TRAVIS_OS_NAME: windows, CXX: cl.exe, CC: cl.exe, ALPAKA_CI_CL_VER: 2017, CMAKE_BUILD_TYPE: Release, ALPAKA_CI_BOOST_BRANCH: boost-1.67.0, ALPAKA_CI_CMAKE_VER: 3.16.4,                   ALPAKA_ACC_GPU_CUDA_ENABLE: ON, ALPAKA_CUDA_VERSION: "10.0", ALPAKA_CUDA_ARCH: "30;75", ALPAKA_ACC_GPU_CUDA_ONLY_MODE: ON, ALPAKA_CUDA_NVCC_SEPARABLE_COMPILATION: ON}
+
+  windows_nvcc-10_0_cl-2017_debug:
+    name: Windows nvcc-10.0 + cl-2017 Debug (Only some CPU backends enabled due to compile time)
+    runs-on: windows-2016
+    steps:
+    - uses: actions/checkout@v1
+    - name: build + test
+      shell: bash
+      run: cd ${GITHUB_WORKSPACE} && ./script/ci.sh
+      env: {TRAVIS_OS_NAME: windows, CXX: cl.exe, CC: cl.exe, ALPAKA_CI_CL_VER: 2017, CMAKE_BUILD_TYPE: Debug,   ALPAKA_CI_BOOST_BRANCH: boost-1.66.0, ALPAKA_CI_CMAKE_VER: 3.16.4,                   ALPAKA_ACC_GPU_CUDA_ENABLE: ON, ALPAKA_CUDA_VERSION: "10.0", ALPAKA_ACC_CPU_B_SEQ_T_THREADS_ENABLE: OFF, ALPAKA_ACC_CPU_B_SEQ_T_FIBERS_ENABLE: OFF, ALPAKA_ACC_CPU_B_SEQ_T_OMP2_ENABLE: OFF, ALPAKA_ACC_CPU_BT_OMP4_ENABLE: OFF, ALPAKA_ACC_CPU_B_TBB_T_SEQ_ENABLE: OFF}
+
+  ## CUDA 10.1
+  # nvcc + MSVC
+  windows_nvcc-10_1_cl-2017_debug_cuda-only:
+    name: Windows nvcc-10.1 + cl-2017 Debug ALPAKA_ACC_GPU_CUDA_ONLY_MODE
+    runs-on: windows-2016
+    steps:
+    - uses: actions/checkout@v1
+    - name: build + test
+      shell: bash
+      run: cd ${GITHUB_WORKSPACE} && ./script/ci.sh
+      env: {TRAVIS_OS_NAME: windows, CXX: cl.exe, CC: cl.exe, ALPAKA_CI_CL_VER: 2017, CMAKE_BUILD_TYPE: Debug,   ALPAKA_CI_BOOST_BRANCH: boost-1.67.0, ALPAKA_CI_CMAKE_VER: 3.16.4,                   ALPAKA_ACC_GPU_CUDA_ENABLE: ON, ALPAKA_CUDA_VERSION: "10.1", ALPAKA_CUDA_ARCH: "30;75", ALPAKA_ACC_GPU_CUDA_ONLY_MODE: ON}
+
+  windows_nvcc-10_1_cl-2017_release:
+    name: Windows nvcc-10.1 + cl-2017 Release (Only some CPU backends enabled due to compile time)
+    runs-on: windows-2016
+    steps:
+    - uses: actions/checkout@v1
+    - name: build + test
+      shell: bash
+      run: cd ${GITHUB_WORKSPACE} && ./script/ci.sh
+      env: {TRAVIS_OS_NAME: windows, CXX: cl.exe, CC: cl.exe, ALPAKA_CI_CL_VER: 2017, CMAKE_BUILD_TYPE: Release, ALPAKA_CI_BOOST_BRANCH: boost-1.65.1, ALPAKA_CI_CMAKE_VER: 3.16.4,                   ALPAKA_ACC_GPU_CUDA_ENABLE: ON, ALPAKA_CUDA_VERSION: "10.1", ALPAKA_ACC_CPU_B_SEQ_T_THREADS_ENABLE: OFF, ALPAKA_ACC_CPU_B_SEQ_T_FIBERS_ENABLE: OFF, ALPAKA_ACC_CPU_B_SEQ_T_OMP2_ENABLE: OFF, ALPAKA_ACC_CPU_BT_OMP4_ENABLE: OFF, ALPAKA_ACC_CPU_B_TBB_T_SEQ_ENABLE: OFF}
+
+  ## CUDA 10.2
+  # nvcc + MSVC
+  windows_nvcc-10_2_cl-2017_debug_cuda-only:
+    name: Windows nvcc-10.2 + cl-2017 Debug ALPAKA_ACC_GPU_CUDA_ONLY_MODE
+    runs-on: windows-2016
+    steps:
+    - uses: actions/checkout@v1
+    - name: build + test
+      shell: bash
+      run: cd ${GITHUB_WORKSPACE} && ./script/ci.sh
+      env: {TRAVIS_OS_NAME: windows, CXX: cl.exe, CC: cl.exe, ALPAKA_CI_CL_VER: 2017, CMAKE_BUILD_TYPE: Debug,   ALPAKA_CI_BOOST_BRANCH: boost-1.67.0, ALPAKA_CI_CMAKE_VER: 3.16.4,                   ALPAKA_ACC_GPU_CUDA_ENABLE: ON, ALPAKA_CUDA_VERSION: "10.2", ALPAKA_CUDA_ARCH: "30;75", ALPAKA_ACC_GPU_CUDA_ONLY_MODE: ON}
+
+  windows_nvcc-10_2_cl-2017_release:
+    name: Windows nvcc-10.2 + cl-2017 Release (Only some CPU backends enabled due to compile time)
+    runs-on: windows-2016
+    steps:
+    - uses: actions/checkout@v1
+    - name: build + test
+      shell: bash
+      run: cd ${GITHUB_WORKSPACE} && ./script/ci.sh
+      env: {TRAVIS_OS_NAME: windows, CXX: cl.exe, CC: cl.exe, ALPAKA_CI_CL_VER: 2017, CMAKE_BUILD_TYPE: Release, ALPAKA_CI_BOOST_BRANCH: boost-1.65.1, ALPAKA_CI_CMAKE_VER: 3.16.4,                   ALPAKA_ACC_GPU_CUDA_ENABLE: ON, ALPAKA_CUDA_VERSION: "10.2", ALPAKA_ACC_CPU_B_SEQ_T_THREADS_ENABLE: OFF, ALPAKA_ACC_CPU_B_SEQ_T_FIBERS_ENABLE: OFF, ALPAKA_ACC_CPU_B_SEQ_T_OMP2_ENABLE: OFF, ALPAKA_ACC_CPU_BT_OMP4_ENABLE: OFF, ALPAKA_ACC_CPU_B_TBB_T_SEQ_ENABLE: OFF}
diff --git a/alpaka/.github/workflows/gh-pages.yml b/alpaka/.github/workflows/gh-pages.yml
@@ -0,0 +1,25 @@
+name: Publish documentation to gh-pages
+
+on:
+  push:
+    branches:
+      - develop
+
+jobs:
+  gh-pages:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v1
+    - name: Install doxygen
+      run: |
+          cd ${GITHUB_WORKSPACE}
+          ./script/install_doxygen.sh
+    - name: Run doxygen
+      run: |
+          cd ${GITHUB_WORKSPACE}
+          ./script/run_doxygen.sh ${{ github.repository }} ${{ secrets.github_token }}
+    - name: Publish documentation
+      run: |
+          cd ${GITHUB_WORKSPACE}
+          ./script/push_doc.sh
diff --git a/alpaka/.gitignore b/alpaka/.gitignore
@@ -19,3 +19,11 @@
 
 # VIM project files
 .vimrc
+
+# IDE & tmp build
+.idea/
+cmake-build-*/
+.kdev?/
+*.kdev?
+spack-build*
+build/