diff --git a/CMakeLists.txt b/CMakeLists.txt index e16ffc284..3312c08b2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -312,6 +312,13 @@ macro (files_hook) set(HDF5_FOUND OFF) unset(HAVE_HDF5) endif() + if(HAVE_ROCSPARSE AND HAVE_CUDA) + message(WARNING "WARNING! Using CUDA and HIP at the same time is not allowed. Please choose only one of them. Disabling both...\n") + set(CUDA_FOUND OFF) + set(rocsparse_FOUND OFF) + unset(HAVE_CUDA) + unset(HAVE_ROCSPARSE) + endif() # read the list of components from this file (in the project directory); # it should set various lists with the names of the files to include # include needs to be here to make reset HDF5_FOUND available in diff --git a/CMakeLists_files.cmake b/CMakeLists_files.cmake index 3202fe8ab..ffedbce48 100644 --- a/CMakeLists_files.cmake +++ b/CMakeLists_files.cmake @@ -151,11 +151,6 @@ if (Damaris_FOUND AND MPI_FOUND) list (APPEND MAIN_SOURCE_FILES opm/simulators/utils/initDamarisXmlFile.cpp) endif() if(CUDA_FOUND) - if(USE_BDA_BRIDGE) - list (APPEND MAIN_SOURCE_FILES opm/simulators/linalg/bda/cuda/cusparseSolverBackend.cu) - list (APPEND MAIN_SOURCE_FILES opm/simulators/linalg/bda/cuda/cuWellContributions.cu) - endif() - # CUISTL SOURCE list (APPEND MAIN_SOURCE_FILES opm/simulators/linalg/cuistl/detail/CuBlasHandle.cpp) list (APPEND MAIN_SOURCE_FILES opm/simulators/linalg/cuistl/detail/CuSparseHandle.cpp) @@ -222,6 +217,10 @@ if(USE_BDA_BRIDGE) list (APPEND MAIN_SOURCE_FILES opm/simulators/linalg/bda/rocsparseSolverBackend.cpp) list (APPEND MAIN_SOURCE_FILES opm/simulators/linalg/bda/rocsparseWellContributions.cpp) endif() + if(CUDA_FOUND) + list (APPEND MAIN_SOURCE_FILES opm/simulators/linalg/bda/cuda/cusparseSolverBackend.cu) + list (APPEND MAIN_SOURCE_FILES opm/simulators/linalg/bda/cuda/cuWellContributions.cu) + endif() if(amgcl_FOUND) list (APPEND MAIN_SOURCE_FILES opm/simulators/linalg/bda/amgclSolverBackend.cpp) if(CUDA_FOUND)