Merge pull request #519 from psychocoderHPC/topic-cmakeBackports3

backport cmake changes for bug fix release 0.3.1

Author: ax3l

.travis.yml

@@ -102,7 +102,7 @@ env:
 
         # clang++
         # Analysis builds
-        - ALPAKA_CI_DOCKER_BASE_IMAGE_NAME=ubuntu:14.04 CXX=clang++ CC=clang ALPAKA_CI_CLANG_VER=3.9.1 CMAKE_BUILD_TYPE=Debug   ALPAKA_CI_BOOST_BRANCH=boost-1.62.0 ALPAKA_CI_CMAKE_VER=3.9.6  ALPAKA_CI_SANITIZERS=      ALPAKA_CI_ANALYSIS=ON  ALPAKA_DEBUG=2 ALPAKA_ACC_GPU_CUDA_ENABLE=ON  ALPAKA_CUDA_VER=7.5 ALPAKA_CUDA_COMPILER=clang
+        - ALPAKA_CI_DOCKER_BASE_IMAGE_NAME=ubuntu:14.04 CXX=clang++ CC=clang ALPAKA_CI_CLANG_VER=4.0.0 CMAKE_BUILD_TYPE=Debug   ALPAKA_CI_BOOST_BRANCH=boost-1.66.0 ALPAKA_CI_CMAKE_VER=3.9.6  ALPAKA_CI_SANITIZERS=      ALPAKA_CI_ANALYSIS=ON  ALPAKA_DEBUG=2 ALPAKA_ACC_GPU_CUDA_ENABLE=ON  ALPAKA_CUDA_VER=8.0 ALPAKA_CUDA_COMPILER=clang
         - ALPAKA_CI_DOCKER_BASE_IMAGE_NAME=ubuntu:16.04 CXX=clang++ CC=clang ALPAKA_CI_CLANG_VER=3.7.1 CMAKE_BUILD_TYPE=Debug   ALPAKA_CI_BOOST_BRANCH=boost-1.65.1 ALPAKA_CI_CMAKE_VER=3.7.2  ALPAKA_CI_SANITIZERS=      ALPAKA_CI_ANALYSIS=ON  ALPAKA_DEBUG=2
 
         # Debug builds

alpakaConfig.cmake

@@ -49,7 +49,6 @@ UNSET(_ALPAKA_COMMON_FILE)
 UNSET(_ALPAKA_ADD_EXECUTABLE_FILE)
 UNSET(_ALPAKA_ADD_LIBRRAY_FILE)
 UNSET(_ALPAKA_FILES_HEADER)
-UNSET(_ALPAKA_FILES_SOURCE)
 UNSET(_ALPAKA_FILES_OTHER)
 UNSET(_ALPAKA_VERSION_DEFINE)
 UNSET(_ALPAKA_VER_MAJOR)
@@ -128,7 +127,7 @@ IF(${ALPAKA_DEBUG} GREATER 1)
     SET(Boost_DETAILED_FAILURE_MSG ON)
 ENDIF()
 IF(ALPAKA_ACC_CPU_B_SEQ_T_FIBERS_ENABLE)
-    FIND_PACKAGE(Boost ${_ALPAKA_BOOST_MIN_VER} QUIET COMPONENTS fiber context system thread chrono date_time)
+    FIND_PACKAGE(Boost ${_ALPAKA_BOOST_MIN_VER} QUIET COMPONENTS fiber context system thread atomic chrono date_time)
     IF(NOT Boost_FIBER_FOUND)
         MESSAGE(STATUS "Optional alpaka dependency Boost fiber could not be found! Fibers back-end disabled!")
         SET(ALPAKA_ACC_CPU_B_SEQ_T_FIBERS_ENABLE OFF CACHE BOOL "Enable the Fibers CPU back-end" FORCE)
@@ -207,8 +206,29 @@ IF(NOT Boost_FOUND)
     SET(_ALPAKA_FOUND FALSE)
 
 ELSE()
-    LIST(APPEND _ALPAKA_INCLUDE_DIRECTORIES_PUBLIC ${Boost_INCLUDE_DIRS})
-    LIST(APPEND _ALPAKA_LINK_LIBRARIES_PUBLIC ${Boost_LIBRARIES})
+    IF(Boost_FIBER_FOUND)
+        # Boost fiber and default header-only libraries
+        IF(TARGET Boost::fiber)
+            LIST(APPEND _ALPAKA_LINK_LIBRARIES_PUBLIC
+                 Boost::boost
+                 Boost::fiber Boost::context Boost::system Boost::thread
+                 Boost::chrono Boost::date_time Boost::atomic
+            )
+        ELSE()
+            # fallback: Boost version is too new for CMake
+            LIST(APPEND _ALPAKA_INCLUDE_DIRECTORIES_PUBLIC ${Boost_INCLUDE_DIRS})
+            LIST(APPEND _ALPAKA_LINK_LIBRARIES_PUBLIC ${Boost_LIBRARIES})
+        ENDIF()
+    ELSE()
+        # header-only libraries
+        IF(TARGET Boost::boost)
+            LIST(APPEND _ALPAKA_LINK_LIBRARIES_PUBLIC Boost::boost)
+        ELSE()
+            # fallback: Boost version is too new for CMake
+            LIST(APPEND _ALPAKA_INCLUDE_DIRECTORIES_PUBLIC ${Boost_INCLUDE_DIRS})
+            LIST(APPEND _ALPAKA_LINK_LIBRARIES_PUBLIC ${Boost_LIBRARIES})
+        ENDIF()
+    ENDIF()
 ENDIF()
 
 #-------------------------------------------------------------------------------
@@ -491,15 +511,13 @@ IF(ALPAKA_CI)
 ENDIF()
 
 SET(_ALPAKA_INCLUDE_DIRECTORY "${_ALPAKA_ROOT_DIR}/include")
-LIST(APPEND _ALPAKA_INCLUDE_DIRECTORIES_PUBLIC "${_ALPAKA_INCLUDE_DIRECTORY}")
 SET(_ALPAKA_SUFFIXED_INCLUDE_DIR "${_ALPAKA_INCLUDE_DIRECTORY}/alpaka")
 
 SET(_ALPAKA_LINK_LIBRARY)
 LIST(APPEND _ALPAKA_LINK_LIBRARIES_PUBLIC "${_ALPAKA_LINK_LIBRARY}")
 
 # Add all the source and include files in all recursive subdirectories and group them accordingly.
 append_recursive_files_add_to_src_group("${_ALPAKA_SUFFIXED_INCLUDE_DIR}" "${_ALPAKA_SUFFIXED_INCLUDE_DIR}" "hpp" _ALPAKA_FILES_HEADER)
-append_recursive_files_add_to_src_group("${_ALPAKA_SUFFIXED_INCLUDE_DIR}" "${_ALPAKA_SUFFIXED_INCLUDE_DIR}" "cpp" _ALPAKA_FILES_SOURCE)
 
 append_recursive_files_add_to_src_group("${_ALPAKA_ROOT_DIR}/script" "${_ALPAKA_ROOT_DIR}" "sh" _ALPAKA_FILES_SCRIPT)
 SET_SOURCE_FILES_PROPERTIES(${_ALPAKA_FILES_SCRIPT} PROPERTIES HEADER_FILE_ONLY TRUE)
@@ -517,9 +535,13 @@ SET_SOURCE_FILES_PROPERTIES(${_ALPAKA_FILES_OTHER} PROPERTIES HEADER_FILE_ONLY T
 #-------------------------------------------------------------------------------
 # Target.
 IF(NOT TARGET "alpaka")
-    ADD_LIBRARY(
-        "alpaka"
-        ${_ALPAKA_FILES_HEADER} ${_ALPAKA_FILES_SOURCE} ${_ALPAKA_FILES_SCRIPT} ${_ALPAKA_FILES_CMAKE} ${_ALPAKA_FILES_DOC} ${_ALPAKA_FILES_OTHER})
+    ADD_LIBRARY("alpaka" INTERFACE)
+
+    # HACK: Workaround for the limitation that files added to INTERFACE targets (target_sources) can not be marked as PUBLIC or PRIVATE but only as INTERFACE.
+    # Therefore those files will be added to projects "linking" to the INTERFACE library, but are not added to the project itself within an IDE.
+    add_custom_target("alpakaIde"
+        SOURCES ${_ALPAKA_FILES_HEADER} ${_ALPAKA_FILES_SCRIPT} ${_ALPAKA_FILES_CMAKE} ${_ALPAKA_FILES_DOC} ${_ALPAKA_FILES_OTHER}
+    )
 
     # Compile options.
     IF(${ALPAKA_DEBUG} GREATER 1)
@@ -532,7 +554,7 @@ IF(NOT TARGET "alpaka")
     IF(${_ALPAKA_COMPILE_OPTIONS_PUBLIC_LENGTH} GREATER 0)
         TARGET_COMPILE_OPTIONS(
             "alpaka"
-            PUBLIC ${_ALPAKA_COMPILE_OPTIONS_PUBLIC})
+            INTERFACE ${_ALPAKA_COMPILE_OPTIONS_PUBLIC})
     ENDIF()
 
     # Compile definitions.
@@ -546,7 +568,7 @@ IF(NOT TARGET "alpaka")
     IF(${_ALPAKA_COMPILE_DEFINITIONS_PUBLIC_LENGTH} GREATER 0)
         TARGET_COMPILE_DEFINITIONS(
             "alpaka"
-            PUBLIC ${_ALPAKA_COMPILE_DEFINITIONS_PUBLIC})
+            INTERFACE ${_ALPAKA_COMPILE_DEFINITIONS_PUBLIC})
     ENDIF()
 
     # Include directories.
@@ -560,8 +582,14 @@ IF(NOT TARGET "alpaka")
     IF(${_ALPAKA_INCLUDE_DIRECTORIES_PUBLIC_LENGTH} GREATER 0)
         TARGET_INCLUDE_DIRECTORIES(
             "alpaka"
-            PUBLIC ${_ALPAKA_INCLUDE_DIRECTORIES_PUBLIC})
+            SYSTEM
+            INTERFACE ${_ALPAKA_INCLUDE_DIRECTORIES_PUBLIC})
     ENDIF()
+    # the alpaka library itself
+    TARGET_INCLUDE_DIRECTORIES(
+        "alpaka"
+        INTERFACE ${_ALPAKA_INCLUDE_DIRECTORY}
+    )
 
     # Link libraries.
     # There are no PUBLIC_LINK_FLAGS in CMAKE:
@@ -576,7 +604,7 @@ IF(NOT TARGET "alpaka")
     IF(${_ALPAKA_LINK_LIBRARIES_PUBLIC_LENGTH} GREATER 0)
         TARGET_LINK_LIBRARIES(
             "alpaka"
-            PUBLIC ${_ALPAKA_LINK_LIBRARIES_PUBLIC} ${_ALPAKA_LINK_FLAGS_PUBLIC})
+            INTERFACE ${_ALPAKA_LINK_LIBRARIES_PUBLIC} ${_ALPAKA_LINK_FLAGS_PUBLIC})
     ENDIF()
 ENDIF()
 
@@ -604,6 +632,7 @@ list_add_prefix("-D" alpaka_DEFINITIONS)
 LIST(APPEND alpaka_DEFINITIONS ${_ALPAKA_COMPILE_OPTIONS_PUBLIC})
 SET(alpaka_INCLUDE_DIR ${_ALPAKA_INCLUDE_DIRECTORY})
 SET(alpaka_INCLUDE_DIRS ${_ALPAKA_INCLUDE_DIRECTORIES_PUBLIC})
+LIST(APPEND alpaka_INCLUDE_DIRS ${_ALPAKA_INCLUDE_DIRECTORY})
 SET(alpaka_LIBRARY ${_ALPAKA_LINK_LIBRARY})
 SET(alpaka_LIBRARIES ${_ALPAKA_LINK_FLAGS_PUBLIC})
 LIST(APPEND alpaka_LIBRARIES ${_ALPAKA_LINK_LIBRARIES_PUBLIC})
@@ -646,7 +675,6 @@ IF(NOT _ALPAKA_FOUND)
     UNSET(_ALPAKA_ADD_EXECUTABLE_FILE)
     UNSET(_ALPAKA_ADD_LIBRARY_FILE)
     UNSET(_ALPAKA_FILES_HEADER)
-    UNSET(_ALPAKA_FILES_SOURCE)
     UNSET(_ALPAKA_FILES_OTHER)
     UNSET(_ALPAKA_BOOST_MIN_VER)
     UNSET(_ALPAKA_VERSION_DEFINE)
@@ -669,7 +697,6 @@ ELSE()
         _ALPAKA_ADD_EXECUTABLE_FILE
         _ALPAKA_ADD_LIBRARY_FILE
         _ALPAKA_FILES_HEADER
-        _ALPAKA_FILES_SOURCE
         _ALPAKA_FILES_OTHER
         _ALPAKA_BOOST_MIN_VER
         _ALPAKA_VERSION_DEFINE

include/alpaka/core/Dummy.cpp

@@ -33,6 +33,7 @@
 
 #include <alpaka/vec/Vec.hpp>
 #include <alpaka/core/Cuda.hpp>
+#include <alpaka/core/Positioning.hpp>
 
 //#include <boost/core/ignore_unused.hpp>
 

include/alpaka/idx/bt/IdxBtCudaBuiltIn.hpp

@@ -33,6 +33,7 @@
 
 #include <alpaka/vec/Vec.hpp>
 #include <alpaka/core/Cuda.hpp>
+#include <alpaka/core/Positioning.hpp>
 
 //#include <boost/core/ignore_unused.hpp>
 

include/alpaka/idx/gb/IdxGbCudaBuiltIn.hpp

@@ -41,6 +41,9 @@
 #include <stdexcept>
 #include <memory>
 #include <functional>
+#include <mutex>
+#include <condition_variable>
+#include <thread>
 
 namespace alpaka
 {

include/alpaka/stream/StreamCudaRtAsync.hpp

@@ -41,6 +41,8 @@
 #include <stdexcept>
 #include <memory>
 #include <functional>
+#include <mutex>
+#include <condition_variable>
 
 namespace alpaka
 {

include/alpaka/stream/StreamCudaRtSync.hpp

@@ -26,6 +26,36 @@
 # e: exit as soon as one command returns a non-zero exit code.
 set -eo pipefail
 
+#-------------------------------------------------------------------------------
+
+# create a cmake variable definition if an environment variable exists
+#
+# This function can not handle environment variables with spaces in its content.
+#
+# @param $1 environment variable name
+# @param $2 cmake variable name (optional)
+#           if not defined than cmake variable name is equal to environment name
+# 
+# @result if $2 exists cmake variable definition else nothing is returned
+#
+# @code{.bash}
+# FOO=ON
+# echo "$(env2cmake FOO)" # returns "-DFOO=ON"
+# echo "$(env2cmake FOO CMAKE_FOO_DEF)" # returns "-DCMAKE_FOO_DEF=ON"
+# echo "$(env2cmake BAR)" # returns nothing
+# @endcode
+function env2cmake()
+{
+    if [ $# -ne 2 ] ; then
+        cmakeName=$1
+    else
+        cmakeName=$2
+    fi
+    if [ -v "$1" ] ; then
+        echo -n "-D$cmakeName=${!1}"
+    fi
+}
+
 #-------------------------------------------------------------------------------
 # Build and execute all tests.
 oldPath=${PWD}
@@ -38,7 +68,7 @@ cmake -G "Unix Makefiles" \
     -DALPAKA_ACC_CPU_B_SEQ_T_SEQ_ENABLE="${ALPAKA_ACC_CPU_B_SEQ_T_SEQ_ENABLE}" -DALPAKA_ACC_CPU_B_SEQ_T_THREADS_ENABLE="${ALPAKA_ACC_CPU_B_SEQ_T_THREADS_ENABLE}" -DALPAKA_ACC_CPU_B_SEQ_T_FIBERS_ENABLE="${ALPAKA_ACC_CPU_B_SEQ_T_FIBERS_ENABLE}" \
     -DALPAKA_ACC_CPU_B_TBB_T_SEQ_ENABLE="${ALPAKA_ACC_CPU_B_TBB_T_SEQ_ENABLE}"\
     -DALPAKA_ACC_CPU_B_OMP2_T_SEQ_ENABLE="${ALPAKA_ACC_CPU_B_OMP2_T_SEQ_ENABLE}" -DALPAKA_ACC_CPU_B_SEQ_T_OMP2_ENABLE="${ALPAKA_ACC_CPU_B_SEQ_T_OMP2_ENABLE}" -DALPAKA_ACC_CPU_BT_OMP4_ENABLE="${ALPAKA_ACC_CPU_BT_OMP4_ENABLE}" \
-    -DALPAKA_ACC_GPU_CUDA_ENABLE="${ALPAKA_ACC_GPU_CUDA_ENABLE}" -DALPAKA_CUDA_VERSION="${ALPAKA_CUDA_VER}" -DALPAKA_CUDA_COMPILER="${ALPAKA_CUDA_COMPILER}" -DALPAKA_ACC_GPU_CUDA_ONLY_MODE="${ALPAKA_ACC_GPU_CUDA_ONLY_MODE}" -DALPAKA_CUDA_ARCH="${ALPAKA_CUDA_ARCH}"\
+    "$(env2cmake ALPAKA_ACC_GPU_CUDA_ENABLE)" "$(env2cmake ALPAKA_CUDA_VER ALPAKA_CUDA_VERSION)" "$(env2cmake ALPAKA_ACC_GPU_CUDA_ONLY_MODE)" "$(env2cmake ALPAKA_CUDA_ARCH)" "$(env2cmake ALPAKA_CUDA_COMPILER)" \
     -DALPAKA_DEBUG="${ALPAKA_DEBUG}" -DALPAKA_CI=ON \
     "../../"
 make VERBOSE=1

script/travis/compileExec.sh

@@ -74,5 +74,5 @@ ${CXX} -v
 
 source ./script/travis/prepare_sanitizers.sh
 if [ "${ALPAKA_CI_ANALYSIS}" == "ON" ] ;then ./script/travis/run_analysis.sh ;fi
-if [ "${ALPAKA_CI_ANALYSIS}" == "ON" -a "${ALPAKA_ACC_GPU_CUDA_ENABLE}" == "OFF" ] ;then ./script/travis/run_headerCheck.sh ;fi
+if [ "${ALPAKA_CI_ANALYSIS}" == "ON" ] ;then ./script/travis/run_headerCheck.sh ;fi
 if [ "${ALPAKA_CI_ANALYSIS}" == "OFF" ] ;then ./script/travis/run_tests.sh ;fi

script/travis/run.sh

@@ -81,7 +81,7 @@ ENDFOREACH()
 SET(_SOURCE_DIR "src/")
 
 append_recursive_files_add_to_src_group("${_GENERATED_SOURCE_DIR}" "${_GENERATED_SOURCE_DIR}" "cpp" "_FILES_SOURCE")
-append_recursive_files_add_to_src_group("${_SOURCE_DIR}" "${_SOURCE_DIR}" "cpp" "_FILES_SOURCE")
+LIST(APPEND _FILES_SOURCE "src/main.cpp")
 
 # Always add all files to the target executable build call to add them to the build project.
 ALPAKA_ADD_EXECUTABLE(