Unverified Commit a856c620 authored by Atkins, Charles Vernon's avatar Atkins, Charles Vernon Committed by GitHub
Browse files

Merge pull request #3136 from chuckatkins/fix-cuda-detect 

CUDA: Fix configure failure when not in search path
parents d2039250 db3affa5

cmake/DetectOptions.cmake

+10 −5
Original line number Diff line number Diff line
@@ -166,12 +166,17 @@ endif() 
set(mpi_find_components C)



# Cuda

if(ADIOS2_USE_CUDA)

  include(CheckLanguage)

  check_language(CUDA)

  if(ADIOS2_USE_CUDA STREQUAL AUTO)

    find_package(CUDAToolkit QUIET)

elseif(ADIOS2_USE_CUDA)

  else()

    find_package(CUDAToolkit REQUIRED)

  endif()

if(CUDAToolkit_FOUND)

endif()

if(CMAKE_CUDA_COMPILER AND CUDAToolkit_FOUND)

  enable_language(CUDA)

  set(ADIOS2_HAVE_CUDA TRUE)

endif()

examples/cuda/CMakeLists.txt

+0 −2
Original line number Diff line number Diff line
@@ -3,8 +3,6 @@ 
# accompanying file Copyright.txt for details.

#------------------------------------------------------------------------------#



enable_language(CUDA)



add_executable(CudaBP5WriteRead_cuda cudaBP5WriteRead.cu)

target_link_libraries(CudaBP5WriteRead_cuda PUBLIC adios2::cxx11 CUDA::cudart)

set_target_properties(CudaBP5WriteRead_cuda PROPERTIES CUDA_SEPARABLE_COMPILATION ON)

source/adios2/CMakeLists.txt

+0 −2
Original line number Diff line number Diff line
@@ -108,8 +108,6 @@ set_property(TARGET adios2_core PROPERTY OUTPUT_NAME adios2${ADIOS2_LIBRARY_SUFF 


set(maybe_adios2_core_cuda)

if(ADIOS2_HAVE_CUDA)

  enable_language(CUDA)



  add_library(adios2_core_cuda helper/adiosCUDA.cu)

  set_target_properties(adios2_core_cuda PROPERTIES

    CUDA_SEPARABLE_COMPILATION ON

testing/adios2/engine/bp/CMakeLists.txt

+14 −16
Original line number Diff line number Diff line
@@ -165,7 +165,6 @@ gtest_add_tests_helper(StepsInSituLocalArray MPI_ALLOW BP Engine.BP. .FileStream 
)



if(ADIOS2_HAVE_CUDA)

    enable_language(CUDA)

  gtest_add_tests_helper(WriteReadCuda MPI_ALLOW BP Engine.BP. .BP4

    WORKING_DIRECTORY ${BP4_DIR} EXTRA_ARGS "BP4"

  )
@@ -180,7 +179,6 @@ if(ADIOS2_HAVE_CUDA) 
      WORKING_DIRECTORY ${BP5_DIR} EXTRA_ARGS "BP5"

    )

  endif()



  foreach(tgt ${Test.Engine.BP.WriteReadCuda-TARGETS})

    target_sources(${tgt} PRIVATE operations/CudaRoutines.cu)

    target_link_libraries(${tgt} CUDA::cudart)

testing/adios2/engine/bp/operations/CMakeLists.txt

+0 −2
Original line number Diff line number Diff line
@@ -36,8 +36,6 @@ if(ADIOS2_HAVE_ZFP) 
  endforeach()



  if(ADIOS2_HAVE_CUDA AND ADIOS2_HAVE_ZFP_CUDA)

    enable_language(CUDA)



    gtest_add_tests_helper(WriteReadZfpCuda MPI_ALLOW BP Engine.BP. .BP4

      WORKING_DIRECTORY ${BP4_DIR} EXTRA_ARGS "BP4"

      )