Skip to content

Commit aa7cd18

Browse files
authored
Merge pull request #569 from psychocoderHPC/topic-backPortTo_0_3_2_v3
back-ports to 0.3.2
2 parents e56159a + 253a7f6 commit aa7cd18

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

alpakaConfig.cmake

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -381,12 +381,12 @@ IF(ALPAKA_ACC_GPU_CUDA_ENABLE)
381381
ELSE()
382382
IF("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
383383
IF(CUDA_VERSION VERSION_EQUAL 8.0)
384-
IF(CMAKE_CXX_COMPILER_VERSION GREATER_EQUAL 5.0)
385-
MESSAGE(FATAL_ERROR "NVCC 8.0 does not support GCC 6+ and fails compiling the std::tuple implementation in GCC 5+. Please use GCC 4.9!")
384+
IF(CMAKE_CXX_COMPILER_VERSION GREATER_EQUAL 5.4)
385+
MESSAGE(FATAL_ERROR "NVCC 8.0 does not support GCC 5.4+. Please use GCC 4.9 - 5.3!")
386386
ENDIF()
387387
ELSEIF((CUDA_VERSION VERSION_EQUAL 9.0) OR (CUDA_VERSION VERSION_EQUAL 9.1))
388388
IF(CMAKE_CXX_COMPILER_VERSION GREATER_EQUAL 6.0)
389-
MESSAGE(FATAL_ERROR "NVCC 9.0-9.1 do not support GCC 7+ and fail compiling the std::tuple implementation in GCC 6+. Please use GCC 4.9 or 5!")
389+
MESSAGE(FATAL_ERROR "NVCC 9.0 - 9.1 do not support GCC 7+ and fail compiling the std::tuple implementation in GCC 6+. Please use GCC 4.9 - 5.5!")
390390
ENDIF()
391391
ELSEIF(CUDA_VERSION VERSION_EQUAL 9.2)
392392
IF(CMAKE_CXX_COMPILER_VERSION GREATER_EQUAL 8.0)

include/alpaka/exec/ExecGpuCudaRt.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -517,7 +517,7 @@ namespace alpaka
517517
exec::cuda::detail::cudaKernel<TDim, TSize, TKernelFnObj, TArgs...><<<
518518
gridDim,
519519
blockDim,
520-
blockSharedMemDynSizeBytes,
520+
static_cast<std::size_t>(blockSharedMemDynSizeBytes),
521521
stream.m_spStreamImpl->m_CudaStream>>>(
522522
threadElemExtent,
523523
task.m_kernelFnObj,

0 commit comments

Comments
 (0)