update to alpaka pre-0.4.0 version

include/pmacc/nvidia/atomic.hpp

@@ -160,8 +160,8 @@ T atomicAllInc(T *ptr)
 #ifdef __CUDA_ARCH__
     return atomicAllInc(alpaka::atomic::AtomicCudaBuiltIn(), ptr, ::alpaka::hierarchy::Grids());
 #else
-   // assume that we can use stl atomics if we are not on gpu
-    return atomicAllInc(alpaka::atomic::AtomicStlLock<16>(), ptr, ::alpaka::hierarchy::Grids());
+    // assume that we can use the standard library atomics if we are not on gpu
+    return atomicAllInc(alpaka::atomic::AtomicStdLibLock<16>(), ptr, ::alpaka::hierarchy::Grids());
 #endif
 }
 

thirdParty/alpaka/.gitignore

@@ -1,5 +1,6 @@
 /doc/doxygen/*
 !/doc/doxygen/Doxyfile
+!/doc/doxygen/alpaka_doxygen.png
 /doc/latex/*
 **/build
 

thirdParty/alpaka/.zenodo.json

@@ -0,0 +1,66 @@
+{
+  "title": "Alpaka: Abstraction Library for Parallel Kernel Acceleration",
+  "description": "The alpaka library is a header-only C++11 abstraction library for accelerator development. Its aim is to provide performance portability across accelerators through the abstraction (not hiding!) of the underlying levels of parallelism.",
+  "creators": [
+    {
+      "affiliation": "LogMeIn, Inc.",
+      "name": "Worpitz, Benjamin"
+    },
+    {
+      "affiliation": "Helmholtz-Zentrum Dresden-Rossendorf, TU Dresden",
+      "name": "Matthes, Alexander",
+      "orcid": "0000-0002-6702-2015"
+    },
+    {
+      "affiliation": "LogMeIn, Inc.",
+      "name": "Zenker, Erik",
+      "orcid": "0000-0001-9417-8712"
+    },
+    {
+      "affiliation": "Helmholtz-Zentrum Dresden-Rossendorf, TU Dresden",
+      "name": "Huebl, Axel",
+      "orcid": "0000-0003-1943-7141"
+    },
+    {
+      "affiliation": "Helmholtz-Zentrum Dresden-Rossendorf",
+      "name": "Widera, René",
+      "orcid": "0000-0003-1642-0459"
+    }
+  ],
+  "access_right": "open",
+  "keywords": [
+    "HPC",
+    "CUDA",
+    "OpenMP",
+    "C++",
+    "GPU",
+    "HIP",
+    "heterogeneous computing",
+    "performance portability"
+  ],
+  "license": "MPL-2.0",
+  "upload_type": "software",
+  "grants": [
+    {
+      "id": "654220"
+    }
+  ],
+  "related_identifiers": [
+    {
+      "identifier": "DOI:10.5281/zenodo.49768",
+      "relation": "isCitedBy"
+    },
+    {
+      "identifier": "DOI:10.1007/978-3-319-46079-6_21",
+      "relation": "cites"
+    },
+    {
+      "identifier": "DOI:10.1109/IPDPSW.2016.50",
+      "relation": "isCitedBy"
+    },
+    {
+      "identifier": "DOI:10.1007/978-3-319-67630-2_36",
+      "relation": "isCitedBy"
+    }
+  ]
+}

thirdParty/alpaka/CMakeLists.txt

@@ -1,30 +1,32 @@
 #
-# Copyright 2015-2017 Benjamin Worpitz
+# Copyright 2015-2019 Benjamin Worpitz
 #
 # This file is part of alpaka.
 #
-# alpaka is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# alpaka is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with alpaka.
-# If not, see <http://www.gnu.org/licenses/>.
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
 ################################################################################
 # Required CMake version
 
-cmake_minimum_required(VERSION 3.7.0)
+cmake_minimum_required(VERSION 3.11.0)
 
 project("alpakaAll")
 
+SET_PROPERTY(GLOBAL PROPERTY USE_FOLDERS ON)
+
+################################################################################
+# 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()
+
 ################################################################################
 # Options and Variants
 
@@ -34,7 +36,7 @@ include(CTest)
 # automatically defines: BUILD_TESTING, default is ON
 
 ################################################################################
-# Add subdirectories.
+# Add subdirectories
 
 if(alpaka_BUILD_EXAMPLES)
     add_subdirectory("example/")