Merge branch release-2018

[alexxy/gromacs.git] / cmake / gmxManageGPU.cmake

diff --git a/cmake/gmxManageGPU.cmake b/cmake/gmxManageGPU.cmake
index 9eb99cea9acef27eeae723da96578f973204efc4..5a315c40fe46cd23f6a046b9c1bc63df7a49add9 100644 (file)
--- a/cmake/gmxManageGPU.cmake
+++ b/cmake/gmxManageGPU.cmake
@@ -267,31 +267,6 @@ macro(gmx_gpu_setup)
         if(NOT GMX_OPENMP)
             message(WARNING "To use GPU acceleration efficiently, mdrun requires OpenMP multi-threading. Without OpenMP a single CPU core can be used with a GPU which is not optimal. Note that with MPI multiple processes can be forced to use a single GPU, but this is typically inefficient. You need to set both C and C++ compilers that support OpenMP (CC and CXX environment variables, respectively) when using GPUs.")
         endif()
-
-        if(NOT GMX_CLANG_CUDA)
-            gmx_check_if_changed(GMX_CHECK_NVCC CUDA_NVCC_EXECUTABLE CUDA_HOST_COMPILER CUDA_NVCC_FLAGS)
-
-            if(GMX_CHECK_NVCC OR NOT GMX_NVCC_WORKS)
-                message(STATUS "Check for working NVCC/C compiler combination")
-                execute_process(COMMAND ${CUDA_NVCC_EXECUTABLE} -ccbin ${CUDA_HOST_COMPILER} -c ${CUDA_NVCC_FLAGS} ${CMAKE_SOURCE_DIR}/cmake/TestCUDA.cu
-                                RESULT_VARIABLE _cuda_test_res
-                                OUTPUT_VARIABLE _cuda_test_out
-                                ERROR_VARIABLE  _cuda_test_err
-                                OUTPUT_STRIP_TRAILING_WHITESPACE)
-
-                if(${_cuda_test_res})
-                    message(STATUS "Check for working NVCC/C compiler combination - broken")
-                    if(${_cuda_test_err} MATCHES "nsupported")
-                        message(FATAL_ERROR "NVCC/C compiler combination does not seem to be supported. CUDA frequently does not support the latest versions of the host compiler, so you might want to try an earlier C/C++ compiler version and make sure your CUDA compiler and driver are as recent as possible.")
-                    else()
-                        message(FATAL_ERROR "CUDA compiler does not seem to be functional.")
-                    endif()
-                elseif(NOT GMX_CUDA_TEST_COMPILER_QUIETLY)
-                    message(STATUS "Check for working NVCC/C compiler combination - works")
-                    set(GMX_NVCC_WORKS TRUE CACHE INTERNAL "Nvcc can compile a trivial test program")
-                endif()
-            endif() # GMX_CHECK_NVCC
-        endif() #GMX_CLANG_CUDA
     endif() # GMX_GPU
 
     option(GMX_CUDA_NB_SINGLE_COMPILATION_UNIT "Whether to compile the CUDA non-bonded module using a single compilation unit." OFF)