Squashed 'thirdParty/cupla/' changes from 73fb269..a96b293

a96b293 Merge pull request ComputationalRadiationPhysics#106 from fwyzard/cupla_accelerator_namespace
1af2b2b Merge pull request ComputationalRadiationPhysics#110 from tdd11235813/cmake-macro
663521c Changes function to macro 'CUPLA_ADD_EXECUTABLE'.
a440a7c Fix namespace definition if two accelerators are selected
64f02bb Move all accelerator-specific code to an inline namespece
bbef699 Merge pull request ComputationalRadiationPhysics#105 from fwyzard/tbb_IsThreadSeqAcc
b463a25 Mark the TBB backend as "thread sequential"
b45d4e9 Merge pull request ComputationalRadiationPhysics#102 from psychocoderHPC/topic-updateToLatestAlapkaDev
7e8b832 createTaskExec -> createTaskKernel
84b6dc1 update to latest alapka develop branch
037f7b2 Merge pull request ComputationalRadiationPhysics#100 from DerWaldschrat/dev
7add5ed fix -Wreorder in cuplaPitchedPtr (#4)
9fa745b Merge pull request ComputationalRadiationPhysics#99 from ax3l/topic-cmake312rootHints
041d454 Merge pull request ComputationalRadiationPhysics#98 from DerWaldschrat/dev-fix
ecc5839 CMake: Honor _ROOT Env Hints
24d159a Added conditional check for backends.
5822555 Add cudaEventBlockingSync to event creation
906cd41 Merge pull request ComputationalRadiationPhysics#97 from psychocoderHPC/topic-HIPBackend
bc67259 alpaka backend: HIP
87fe58d Merge pull request ComputationalRadiationPhysics#96 from psychocoderHPC/fix-kernelSharedMemCalc
68877b5 fix dynamic shared mem definition
9452a70 Merge pull request ComputationalRadiationPhysics#95 from psychocoderHPC/topic-updateDocs
8b26918 update docs
e822bfa Merge pull request ComputationalRadiationPhysics#89 from psychocoderHPC/topic-switchToAlpakaDevelop0.4.X
50cedbc alpaka renamings + cmake version incerase
5ecd227 update to alapka dev upcoming version 0.4.X
66a9240 Merge pull request ComputationalRadiationPhysics#94 from psychocoderHPC/topic-ciUpdateToCUDA8
3ba6104 CI: update CUDA from 7.5 to 8.0
5af56ce Merge pull request ComputationalRadiationPhysics#93 from psychocoderHPC/topic-updateCIToClang4
68a6555 Travis: CUDA Compiler Ignore
279bfd0 Travis: Xenial
9d583b7 CI: switch from clan 3.5 to 4.0
11eb874 Merge pull request ComputationalRadiationPhysics#92 from ax3l/topic-ciCMake3110
da617da Travis: CMake 3.11.0
da63524 Merge pull request ComputationalRadiationPhysics#91 from ComputationalRadiationPhysics/dev
66a2da7 Merge pull request ComputationalRadiationPhysics#88 from psychocoderHPC/topic-versionIncreaseTo0.1.1
e029584 version increase to 0.1.1
ffdb268 Merge pull request ComputationalRadiationPhysics#90 from psychocoderHPC/fix-tbbSelection
06030af fix TBB backend activation
aa8a921 Merge pull request ComputationalRadiationPhysics#84 from psychocoderHPC/topic-cuplaGetErrorString
55c99b7 add implementation for `cuplaGetErrorString`
c765052 Merge pull request ComputationalRadiationPhysics#86 from psychocoderHPC/topic-cuplaPeekAtLastError
49612bb Merge pull request ComputationalRadiationPhysics#87 from psychocoderHPC/topic-helpUpdatecuplaGetLastError
c763de4 Merge pull request ComputationalRadiationPhysics#85 from psychocoderHPC/topic-cuplaStreamQuerySupport
5d19923 update documentation of `cuplaGetLastError`
3806b8f implement `cuplaPeekAtLastError()`
2e79816 add `cuplaStreamQuery()`
7c73dc8 Merge pull request ComputationalRadiationPhysics#83 from psychocoderHPC/fix-cuplaGetLastError
b02299a fix `cuplaGetLastError`
1b7d7ea Merge pull request ComputationalRadiationPhysics#81 from tdd11235813/master
b0adfd9 Updates alpaka to 0.3.5.

git-subtree-dir: thirdParty/cupla
git-subtree-split: a96b293dcb14662a57901b55dfedaa1cd615adc9

Author: Third Party

.gitmodules

@@ -1,4 +1,4 @@
 [submodule "alpaka"]
 	path = alpaka
 	url = git://github.com/ComputationalRadiationPhysics/alpaka.git
-	branch = tags/0.3.1
+	branch = develop

.travis.yml

@@ -1,5 +1,6 @@
 language: cpp
 sudo: false
+dist: xenial
 
 cache:
   apt: true
@@ -12,10 +13,9 @@ addons:
   apt:
     sources:
       - ubuntu-toolchain-r-test
-      - llvm-toolchain-precise-3.5
     packages:
       - g++-4.9
-      - clang-3.5
+      - clang-4.0
 
 env:
   global:
@@ -46,9 +46,9 @@ before_install:
         export CC=gcc-4.9;
         unset CUDA_ROOT;
     elif [ "$COMPILER" == "clang" ]; then
-        echo "Using clang++-3.5 & sequential threads ...";
-        export CXX=clang++-3.5;
-        export CC=clang-3.5;
+        echo "Using clang++-4.0 & sequential threads ...";
+        export CXX=clang++-4.0;
+        export CC=clang-4.0;
         unset CUDA_ROOT;
     elif [ "$COMPILER" == "nvcc" ]; then
         echo "Using CUDA 7.5 ...";
@@ -66,15 +66,15 @@ install:
   # CMAKE                                                                     #
   #############################################################################
   - export PATH=$CMAKE_ROOT/bin:$PATH
-  - CMAKE_39_FOUND=$(cmake --version | grep " 3\.9\." >/dev/null && { echo 0; } || { echo 1; })
-  - if [ $CMAKE_39_FOUND -ne 0 ]; then
+  - CMAKE_311_FOUND=$(cmake --version | grep " 3\.11\." >/dev/null && { echo 0; } || { echo 1; })
+  - if [ $CMAKE_311_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.9/cmake-3.9.4-Linux-x86_64.tar.gz &&
-      tar -xzf cmake-3.9.4-Linux-x86_64.tar.gz &&
-      mv cmake-3.9.4-Linux-x86_64/* . &&
-      rm -rf cmake-3.9.4-Linux-x86_64.tar.gz cmake-3.9.4-Linux-x86_64 &&
+      travis_retry wget --no-check-certificate http://cmake.org/files/v3.11/cmake-3.11.0-Linux-x86_64.tar.gz &&
+      tar -xzf cmake-3.11.0-Linux-x86_64.tar.gz &&
+      mv cmake-3.11.0-Linux-x86_64/* . &&
+      rm -rf cmake-3.11.0-Linux-x86_64.tar.gz cmake-3.11.0-Linux-x86_64 &&
       cd -;
     fi
   - cmake --version
@@ -106,10 +106,10 @@ install:
   - if [ $NVCC_FOUND -ne 0 ] && [ $COMPILER == "nvcc" ]; then
       mkdir -p $CUDA_ROOT &&
       cd $CUDA_ROOT &&
-      travis_retry wget http://developer.download.nvidia.com/compute/cuda/7.5/Prod/local_installers/cuda_7.5.18_linux.run &&
-      chmod u+x *.run &&
-      ./cuda_7.5.18_linux.run --silent --verbose --toolkit --toolkitpath=$CUDA_ROOT &&
-      rm -rf cuda_7.5.18_linux.run $CUDA_ROOT/{samples,jre,doc,share} &&
+      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} &&
       cd -;
     fi
 

CHANGELOG.md

@@ -1,6 +1,16 @@
 Changelog
 =========
 
+0.1.1 "Colonel Worf"
+--------------------
+**Date:** 2019-01-23
+
+- update Alpaka submodule to 0.3.5 #81
+- add `cuplaGetErrorString` #84
+- add `cuplaStreamQuerry` #85
+- add `cuplaPeekAtLastError` #86
+- fix TBB backend activation #90
+
 0.1.0 "Worf"
 ------------
 **Date:** 2018-06-10

INSTALL.md

@@ -4,13 +4,14 @@ cupla Install Guide
 Requirements
 ------------
 
-- **cmake**  3.7.0 or higher
+- **cmake**  3.11.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
   - `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`

README.md

@@ -36,7 +36,7 @@ For more information see [LICENSE.md](LICENSE.md).
 Dependencies
 ------------
 
-- **cmake 3.7.0**
+- **cmake 3.11.0**
 - **alpaka** 
   - is loaded as `git submodule` within **cupla** (see [INSTALL.md](INSTALL.md))
   - for more information please read [README.md](https://github.com/ComputationalRadiationPhysics/alpaka/blob/master/README.md)

alpaka

@@ -22,7 +22,7 @@
 cmake_minimum_required(VERSION 3.3.0)
 
 
-function(CUPLA_ADD_EXECUTABLE BinaryName)
+macro(CUPLA_ADD_EXECUTABLE BinaryName)
 
     include_directories(${cupla_INCLUDE_DIRS})
     add_definitions(${cupla_DEFINITIONS})
@@ -32,4 +32,4 @@ function(CUPLA_ADD_EXECUTABLE BinaryName)
         ${ARGN}
         ${cupla_SOURCE_FILES}
     )
-endfunction()
+endmacro()

cmake/addExecutable.cmake

@@ -22,7 +22,18 @@
 # Required cmake version.
 ################################################################################
 
-CMAKE_MINIMUM_REQUIRED(VERSION 3.7.0)
+cmake_minimum_required(VERSION 3.11.0)
+
+################################################################################
+# CMake policies
+#
+# Search in <PackageName>_ROOT:
+#   https://cmake.org/cmake/help/v3.12/policy/CMP0074.html
+################################################################################
+
+if(POLICY CMP0074)
+    cmake_policy(SET CMP0074 NEW)
+endif()
 
 ################################################################################
 # cupla
@@ -96,6 +107,7 @@ OPTION(ALPAKA_ACC_CPU_B_OMP2_T_SEQ_ENABLE "Enable the OpenMP 2.0 CPU grid block
 OPTION(ALPAKA_ACC_CPU_B_SEQ_T_OMP2_ENABLE "Enable the OpenMP 2.0 CPU block thread accelerator" OFF)
 OPTION(ALPAKA_ACC_CPU_BT_OMP4_ENABLE "Enable the OpenMP 4.0 CPU block and block thread accelerator" OFF)
 OPTION(ALPAKA_ACC_GPU_CUDA_ENABLE "Enable the CUDA GPU accelerator" OFF)
+OPTION(ALPAKA_ACC_GPU_HIP_ENABLE "Enable the HIP back-end (all other back-ends must be disabled)" OFF)
 
 
 set(cupla_ALPAKA_PROVIDER "intern" CACHE STRING "Select which alpaka is used")
@@ -260,7 +272,7 @@ endif()
 # Find cupla version.
 ################################################################################
 # FIXME: Add a version.hpp
-set(_cupla_VERSION "0.1.0")
+set(_cupla_VERSION "0.1.1")
 
 ################################################################################
 # Set return values.

cuplaConfig.cmake

@@ -37,6 +37,17 @@ SET(_SOURCE_DIR "src/")
 
 PROJECT("asyncAPI")
 
+################################################################################
+# CMake policies
+#
+# Search in <PackageName>_ROOT:
+#   https://cmake.org/cmake/help/v3.12/policy/CMP0074.html#
+################################################################################
+
+if(POLICY CMP0074)
+    cmake_policy(SET CMP0074 NEW)
+endif()
+
 ################################################################################
 # Find cupla
 ################################################################################

example/CUDASamples/asyncAPI/CMakeLists.txt

@@ -37,6 +37,17 @@ SET(_SOURCE_DIR "src/")
 
 PROJECT("asyncAPI_tuned")
 
+################################################################################
+# CMake policies
+#
+# Search in <PackageName>_ROOT:
+#   https://cmake.org/cmake/help/v3.12/policy/CMP0074.html#
+################################################################################
+
+if(POLICY CMP0074)
+    cmake_policy(SET CMP0074 NEW)
+endif()
+
 ################################################################################
 # Find cupla
 ################################################################################