Skip to content

Commit

Permalink
Squashed 'thirdParty/cupla/' changes from ed00837ef6..0614c10404
Browse files Browse the repository at this point in the history
0614c10404 Merge commit '69ac376e59bca4aed3556f94a6c844195ee39307' into spec-cupla-alpaka0.5.0dev
69ac376e59 Squashed 'alpaka/' changes from c2d14d09ea..cb87c59bb4
dbc0f649b2 Merge pull request ComputationalRadiationPhysics#160 from psychocoderHPC/topic-updateAlpakaTo0.5.0dev
13b737ba6c Squashed 'alpaka/' changes from ab0b8a460..c2d14d09e
b31fc4ea33 Merge commit '13b737ba6cd38400636d6a6a52dee81b21a7412c' into topic-updateAlpakaTo0.5.0dev
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: 0614c10404b057d7e777bf17a2078981bc87b43b
  • Loading branch information
Third Party authored and psychocoderHPC committed Apr 1, 2020
1 parent 8689202 commit 78b7c44
Show file tree
Hide file tree
Showing 333 changed files with 6,453 additions and 15,616 deletions.
40 changes: 20 additions & 20 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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 ...";
Expand All @@ -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"
Expand All @@ -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
Expand All @@ -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
#############################################################################
Expand All @@ -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

Expand Down
2 changes: 1 addition & 1 deletion INSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ 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`

Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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/ComputationalRadiationPhysics/alpaka/)**
- alpaka is loaded as `git subtree` within **cupla**, see [INSTALL.md](INSTALL.md)

Usage
Expand Down
143 changes: 143 additions & 0 deletions alpaka/.github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,143 @@
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:
ci:
name: ${{ matrix.name }}
runs-on: ${{ matrix.os }}
env: ${{ matrix.env }}

strategy:
fail-fast: false
matrix:
name: [
windows_cl-2019_debug_analysis,
macos_xcode-11.3_debug_analysis,
macos_xcode-11_debug,
macos_xcode-11_release,
macos_xcode-11.1_debug,
macos_xcode-11.1_release,
macos_xcode-11.2_debug,
macos_xcode-11.2_release,
macos_xcode-11.3_debug,
macos_xcode-11.3_release,
macos_xcode-11.4_debug,
macos_xcode-11.4_release,
windows_cl-2017_release,
windows_cl-2017_debug,
windows_cl-2019_release,
windows_cl-2019_debug,
windows_nvcc-10.0_cl-2017_release_cuda-only_separable-compilation,
windows_nvcc-10.0_cl-2017_debug,
windows_nvcc-10.1_cl-2017_debug_cuda-only,
windows_nvcc-10.1_cl-2017_release,
windows_nvcc-10.2_cl-2017_debug_cuda-only,
windows_nvcc-10.2_cl-2017_release,
]

include:
### Analysis builds
- name: windows_cl-2019_debug_analysis
os: windows-2019
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.5, ALPAKA_CI_ANALYSIS: ON, ALPAKA_DEBUG: 2}
- name: macos_xcode-11.3_debug_analysis
os: macos-10.15
env: {TRAVIS_OS_NAME: osx, CXX: clang++, CC: clang, ALPAKA_CI_XCODE_VER: 11.3.1, CMAKE_BUILD_TYPE: Debug, ALPAKA_CI_BOOST_BRANCH: boost-1.65.1, ALPAKA_CI_ANALYSIS: ON, ALPAKA_DEBUG: 2, ALPAKA_ACC_CPU_B_SEQ_T_FIBERS_ENABLE: OFF}

### macOS
- name: macos_xcode-11_debug
os: macos-10.15
env: {TRAVIS_OS_NAME: osx, CXX: clang++, CC: clang, ALPAKA_CI_XCODE_VER: 11, CMAKE_BUILD_TYPE: Debug, ALPAKA_CI_BOOST_BRANCH: boost-1.67.0, ALPAKA_ACC_CPU_B_SEQ_T_FIBERS_ENABLE: OFF, ALPAKA_CXX_STANDARD: 17}
- name: macos_xcode-11_release
os: macos-10.15
env: {TRAVIS_OS_NAME: osx, CXX: clang++, CC: clang, ALPAKA_CI_XCODE_VER: 11, CMAKE_BUILD_TYPE: Release, ALPAKA_CI_BOOST_BRANCH: boost-1.66.0, ALPAKA_ACC_CPU_B_SEQ_T_FIBERS_ENABLE: OFF}
- name: macos_xcode-11.1_debug
os: macos-10.15
env: {TRAVIS_OS_NAME: osx, CXX: clang++, CC: clang, ALPAKA_CI_XCODE_VER: 11.1, CMAKE_BUILD_TYPE: Debug, ALPAKA_CI_BOOST_BRANCH: boost-1.65.1, ALPAKA_ACC_CPU_B_SEQ_T_FIBERS_ENABLE: OFF}
- name: macos_xcode-11.1_release
os: macos-10.15
env: {TRAVIS_OS_NAME: osx, CXX: clang++, CC: clang, ALPAKA_CI_XCODE_VER: 11.1, CMAKE_BUILD_TYPE: Release, ALPAKA_CI_BOOST_BRANCH: boost-1.67.0, ALPAKA_ACC_CPU_B_SEQ_T_FIBERS_ENABLE: OFF, ALPAKA_CXX_STANDARD: 17}
- name: macos_xcode-11.2_debug
os: macos-10.15
env: {TRAVIS_OS_NAME: osx, CXX: clang++, CC: clang, ALPAKA_CI_XCODE_VER: 11.2.1, CMAKE_BUILD_TYPE: Debug, ALPAKA_CI_BOOST_BRANCH: boost-1.66.0, ALPAKA_ACC_CPU_B_SEQ_T_FIBERS_ENABLE: OFF, ALPAKA_CXX_STANDARD: 17}
- name: macos_xcode-11.2_release
os: macos-10.15
env: {TRAVIS_OS_NAME: osx, CXX: clang++, CC: clang, ALPAKA_CI_XCODE_VER: 11.2.1, CMAKE_BUILD_TYPE: Release, ALPAKA_CI_BOOST_BRANCH: boost-1.65.1, ALPAKA_ACC_CPU_B_SEQ_T_FIBERS_ENABLE: OFF}
- name: macos_xcode-11.3_debug
os: macos-10.15
env: {TRAVIS_OS_NAME: osx, CXX: clang++, CC: clang, ALPAKA_CI_XCODE_VER: 11.3.1, CMAKE_BUILD_TYPE: Debug, ALPAKA_CI_BOOST_BRANCH: boost-1.67.0, ALPAKA_ACC_CPU_B_SEQ_T_FIBERS_ENABLE: OFF, ALPAKA_CXX_STANDARD: 17}
- name: macos_xcode-11.3_release
os: macos-10.15
env: {TRAVIS_OS_NAME: osx, CXX: clang++, CC: clang, ALPAKA_CI_XCODE_VER: 11.3.1, CMAKE_BUILD_TYPE: Release, ALPAKA_CI_BOOST_BRANCH: boost-1.66.0, ALPAKA_ACC_CPU_B_SEQ_T_FIBERS_ENABLE: OFF}
- name: macos_xcode-11.4_debug
os: macos-10.15
env: {TRAVIS_OS_NAME: osx, CXX: clang++, CC: clang, ALPAKA_CI_XCODE_VER: 11.4, CMAKE_BUILD_TYPE: Debug, ALPAKA_CI_BOOST_BRANCH: boost-1.65.1, ALPAKA_ACC_CPU_B_SEQ_T_FIBERS_ENABLE: OFF}
- name: macos_xcode-11.4_release
os: macos-10.15
env: {TRAVIS_OS_NAME: osx, CXX: clang++, CC: clang, ALPAKA_CI_XCODE_VER: 11.4, CMAKE_BUILD_TYPE: Release, ALPAKA_CI_BOOST_BRANCH: boost-1.67.0, ALPAKA_ACC_CPU_B_SEQ_T_FIBERS_ENABLE: OFF, ALPAKA_CXX_STANDARD: 17}

### Windows
- name: windows_cl-2017_release
os: windows-2016
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.5, 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}
- name: windows_cl-2017_debug
os: windows-2016
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.5, 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}
- name: windows_cl-2019_release
os: windows-2019
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.5, 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}
- name: windows_cl-2019_debug
os: windows-2019
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.5, 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
- name: windows_nvcc-10.0_cl-2017_release_cuda-only_separable-compilation
os: windows-2016
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.5, 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}
- name: windows_nvcc-10.0_cl-2017_debug
os: windows-2016
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.5, ALPAKA_ACC_GPU_CUDA_ENABLE: ON, ALPAKA_CUDA_VERSION: "10.0", 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
- name: windows_nvcc-10.1_cl-2017_debug_cuda-only
os: windows-2016
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.5, ALPAKA_ACC_GPU_CUDA_ENABLE: ON, ALPAKA_CUDA_VERSION: "10.1", ALPAKA_CUDA_ARCH: "30;75", ALPAKA_ACC_GPU_CUDA_ONLY_MODE: ON}
- name: windows_nvcc-10.1_cl-2017_release
os: windows-2016
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.5, ALPAKA_ACC_GPU_CUDA_ENABLE: ON, ALPAKA_CUDA_VERSION: "10.1", 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
- name: windows_nvcc-10.2_cl-2017_debug_cuda-only
os: windows-2016
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.5, ALPAKA_ACC_GPU_CUDA_ENABLE: ON, ALPAKA_CUDA_VERSION: "10.2", ALPAKA_CUDA_ARCH: "30;75", ALPAKA_ACC_GPU_CUDA_ONLY_MODE: ON}
- name: windows_nvcc-10.2_cl-2017_release
os: windows-2016
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.5, ALPAKA_ACC_GPU_CUDA_ENABLE: ON, ALPAKA_CUDA_VERSION: "10.2", 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}

steps:
- uses: actions/checkout@v1
- name: build + test
if: runner.os == 'Windows'
shell: bash
run: cd ${GITHUB_WORKSPACE} && ./script/ci.sh
- name: build + test
if: runner.os == 'Linux' || runner.os == 'macOS'
run: cd ${GITHUB_WORKSPACE} && ./script/ci.sh
25 changes: 25 additions & 0 deletions alpaka/.github/workflows/gh-pages.yml
Original file line number Diff line number Diff line change
@@ -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
8 changes: 8 additions & 0 deletions alpaka/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,11 @@

# VIM project files
.vimrc

# IDE & tmp build
.idea/
cmake-build-*/
.kdev?/
*.kdev?
spack-build*
build/
Loading

0 comments on commit 78b7c44

Please sign in to comment.