Skip to content

Commit

Permalink
Test nvcc 10.2 + clang 8.0
Browse files Browse the repository at this point in the history
  • Loading branch information
BenjaminW3 committed Nov 28, 2019
1 parent ce1dc4e commit f9c0b21
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 2 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,8 @@ matrix:
env: ALPAKA_CI_DOCKER_BASE_IMAGE_NAME=ubuntu:16.04 CXX=clang++ CC=clang ALPAKA_CI_CLANG_VER=6.0.1 CMAKE_BUILD_TYPE=Release ALPAKA_CI_STDLIB=libc++ ALPAKA_CI_BOOST_BRANCH=boost-1.69.0 ALPAKA_CI_CMAKE_VER=3.11.4 ALPAKA_ACC_GPU_CUDA_ENABLE=ON ALPAKA_CUDA_VERSION=10.2 ALPAKA_CUDA_COMPILER=nvcc ALPAKA_CUDA_ARCH="70" ALPAKA_ACC_GPU_CUDA_ONLY_MODE=ON
- name: nvcc-10.2 + clang-7 Debug
env: ALPAKA_CI_DOCKER_BASE_IMAGE_NAME=ubuntu:16.04 CXX=clang++ CC=clang ALPAKA_CI_CLANG_VER=7.0.1 CMAKE_BUILD_TYPE=Debug ALPAKA_CI_STDLIB=libstdc++ ALPAKA_CI_BOOST_BRANCH=boost-1.70.0 ALPAKA_CI_CMAKE_VER=3.12.4 ALPAKA_ACC_GPU_CUDA_ENABLE=ON ALPAKA_CUDA_VERSION=10.2 ALPAKA_CUDA_COMPILER=nvcc ALPAKA_CUDA_ARCH="75"
- name: nvcc-10.2 + clang-8 Release
env: ALPAKA_CI_DOCKER_BASE_IMAGE_NAME=ubuntu:16.04 CXX=clang++ CC=clang ALPAKA_CI_CLANG_VER=8.0.0 CMAKE_BUILD_TYPE=Release ALPAKA_CI_STDLIB=libstdc++ ALPAKA_CI_BOOST_BRANCH=boost-1.70.0 ALPAKA_CI_CMAKE_VER=3.12.4 ALPAKA_ACC_GPU_CUDA_ENABLE=ON ALPAKA_CUDA_VERSION=10.2 ALPAKA_CUDA_COMPILER=nvcc ALPAKA_CUDA_ARCH="75"
# nvcc + MSVC
- name: nvcc-10.2 + MSVC-2017 Debug ALPAKA_ACC_GPU_CUDA_ONLY_MODE
os: windows
Expand Down
2 changes: 1 addition & 1 deletion alpakaConfig.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -581,7 +581,7 @@ IF(ALPAKA_ACC_GPU_CUDA_ENABLE)
ENDIF()
ELSEIF(CUDA_VERSION VERSION_EQUAL 10.2)
IF(CMAKE_CXX_COMPILER_VERSION GREATER_EQUAL 8.0)
MESSAGE(FATAL_ERROR "NVCC 10.2 does not support clang 9+ and fails compiling with clang 8. Please use clang 4, 5, 6 or 7!")
#MESSAGE(FATAL_ERROR "NVCC 10.2 does not support clang 9+ and fails compiling with clang 8. Please use clang 4, 5, 6 or 7!")
ENDIF()
ENDIF()
ENDIF()
Expand Down

0 comments on commit f9c0b21

Please sign in to comment.