From f9c0b21b970595471f5c4084178d1a4e31195cd8 Mon Sep 17 00:00:00 2001 From: Benjamin Worpitz Date: Thu, 28 Nov 2019 15:29:35 +0100 Subject: [PATCH] Test nvcc 10.2 + clang 8.0 --- .travis.yml | 2 ++ alpakaConfig.cmake | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 0c806628780..29735f482fb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 diff --git a/alpakaConfig.cmake b/alpakaConfig.cmake index 1ee6d740016..850f10b7581 100644 --- a/alpakaConfig.cmake +++ b/alpakaConfig.cmake @@ -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()