Fix compilation issues with MPI

This commit is contained in:
Jakub Kurzak 2021-05-12 10:02:51 -04:00
parent d167094a14
commit 6db56b3981
2 changed files with 66 additions and 59 deletions

View File

@ -761,15 +761,19 @@ IF(QMC_CUDA OR ENABLE_CUDA)
INCLUDE_DIRECTORIES("$ENV{ROCM_PATH}/include")
ADD_DEFINITIONS(-D__HIP_PLATFORM_HCC__=)
# hipblas
LINK_DIRECTORIES("/opt/rocm/lib")
LINK_DIRECTORIES("$ENV{ROCM_PATH}/lib")
LINK_DIRECTORIES("/opt/rocm/hipblas/lib")
LINK_DIRECTORIES("$ENV{ROCM_PATH}/hipblas/lib")
INCLUDE_DIRECTORIES("/opt/rocm/hipblas/include")
INCLUDE_DIRECTORIES("$ENV{ROCM_PATH}/hipblas/include")
LINK_LIBRARIES(hipblas)
LINK_LIBRARIES(amdhip64 hipblas)
# architecture flags
SET(HIP_HIPCC_FLAGS "${HIP_HIPCC_FLAGS} -fPIC")
SET(HIP_HIPCC_FLAGS "${HIP_HIPCC_FLAGS} --amdgpu-target=gfx906,gfx908")
SET(HIP_HIPCC_FLAGS "${HIP_HIPCC_FLAGS} --gpu-max-threads-per-block=256")
# warning suppression
SET(HIP_HIPCC_FLAGS "${HIP_HIPCC_FLAGS} -Wno-vla")
SET(HIP_HIPCC_FLAGS "${HIP_HIPCC_FLAGS} -Wno-deprecated-declarations")
SET(HIP_HIPCC_FLAGS "${HIP_HIPCC_FLAGS} -Wno-unused-command-line-argument")
ENDIF(NOT QMC_CUDA2HIP)

View File

@ -39,64 +39,67 @@
#define cublasZgetriBatched hipblasZgetriBatched
#define cublasZgetriBatched hipblasZgetriBatched
#define cuComplex hipComplex
#define cudaAddressModeClamp hipAddressModeClamp
#define cudaArray hipArray
#define cudaBindTextureToArray hipBindTextureToArray
#define cudaChannelFormatDesc hipChannelFormatDesc
#define cudaChannelFormatKindFloat hipChannelFormatKindFloat
#define cudaCreateChannelDesc hipCreateChannelDesc
#define cudaDeviceProp hipDeviceProp_t
#define cudaDeviceReset hipDeviceReset
#define cudaDeviceSynchronize hipDeviceSynchronize
#define cudaError_t hipError_t
#define cudaEvent_t hipEvent_t
#define cudaEventCreate hipEventCreate
#define cudaEventCreateWithFlags hipEventCreateWithFlags
#define cudaEventDestroy hipEventDestroy
#define cudaEventDisableTiming hipEventDisableTiming
#define cudaEventElapsedTime hipEventElapsedTime
#define cudaEventRecord hipEventRecord
#define cudaEventSynchronize hipEventSynchronize
#define cudaFilterModeLinear hipFilterModeLinear
#define cudaFree hipFree
#define cudaFreeHost hipHostFree
#define cudaGetDevice hipGetDevice
#define cudaGetDeviceCount hipGetDeviceCount
#define cudaGetDeviceProperties hipGetDeviceProperties
#define cudaGetErrorString hipGetErrorString
#define cudaGetLastError hipGetLastError
#define cudaHostAlloc hipHostMalloc
#define cudaHostAllocMapped hipHostMallocMapped
#define cudaIpcMemHandle_t hipIpcMemHandle_t
#define cudaMalloc hipMalloc
#define cudaMallocArray hipMallocArray
#define cudaMallocManaged hipMallocManaged
#define cudaMemAdvise hipMemAdvise
#define cudaMemAdviseSetAccessedBy hipMemAdviseSetAccessedBy
#define cudaMemAdviseSetReadMostly hipMemAdviseSetReadMostly
#define cudaMemAttachGlobal hipMemAttachGlobal
#define cudaMemcpy hipMemcpy
#define cudaMemcpyAsync hipMemcpyAsync
#define cudaMemcpyDeviceToDevice hipMemcpyDeviceToDevice
#define cudaMemcpyDeviceToHost hipMemcpyDeviceToHost
#define cudaMemcpyHostToDevice hipMemcpyHostToDevice
#define cudaMemcpyHostToHost hipMemcpyHostToHost
#define cudaMemcpyToArrayAsync hipMemcpyToArray
#define cudaMemcpyToSymbol hipMemcpyToSymbol
#define cudaMemcpyToSymbolAsync hipMemcpyToSymbolAsync
#define cudaMemPrefetchAsync hipMemPrefetchAsync
#define cudaReadModeElementType hipReadModeElementType
#define cudaSetDevice hipSetDevice
#define cudaStream_t hipStream_t
#define cudaStreamCreate hipStreamCreate
#define cudaStreamDestroy hipStreamDestroy
#define cudaStreamSynchronize hipStreamSynchronize
#define cudaStreamWaitEvent hipStreamWaitEvent
#define cudaSuccess hipSuccess
#define cuDoubleComplex hipDoubleComplex
#define make_cuComplex make_hipComplex
#define make_cuDoubleComplex make_hipDoubleComplex
#define cuComplex hipComplex
#define cudaAddressModeClamp hipAddressModeClamp
#define cudaArray hipArray
#define cudaBindTextureToArray hipBindTextureToArray
#define cudaChannelFormatDesc hipChannelFormatDesc
#define cudaChannelFormatKindFloat hipChannelFormatKindFloat
#define cudaCreateChannelDesc hipCreateChannelDesc
#define cudaDeviceProp hipDeviceProp_t
#define cudaDeviceReset hipDeviceReset
#define cudaDeviceSynchronize hipDeviceSynchronize
#define cudaError_t hipError_t
#define cudaEvent_t hipEvent_t
#define cudaEventCreate hipEventCreate
#define cudaEventCreateWithFlags hipEventCreateWithFlags
#define cudaEventDestroy hipEventDestroy
#define cudaEventDisableTiming hipEventDisableTiming
#define cudaEventElapsedTime hipEventElapsedTime
#define cudaEventRecord hipEventRecord
#define cudaEventSynchronize hipEventSynchronize
#define cudaFilterModeLinear hipFilterModeLinear
#define cudaFree hipFree
#define cudaFreeHost hipHostFree
#define cudaGetDevice hipGetDevice
#define cudaGetDeviceCount hipGetDeviceCount
#define cudaGetDeviceProperties hipGetDeviceProperties
#define cudaGetErrorString hipGetErrorString
#define cudaGetLastError hipGetLastError
#define cudaHostAlloc hipHostMalloc
#define cudaHostAllocMapped hipHostMallocMapped
#define cudaIpcGetMemHandle hipIpcGetMemHandle
#define cudaIpcMemHandle_t hipIpcMemHandle_t
#define cudaIpcMemLazyEnablePeerAccess hipIpcMemLazyEnablePeerAccess
#define cudaIpcOpenMemHandle hipIpcOpenMemHandle
#define cudaMalloc hipMalloc
#define cudaMallocArray hipMallocArray
#define cudaMallocManaged hipMallocManaged
#define cudaMemAdvise hipMemAdvise
#define cudaMemAdviseSetAccessedBy hipMemAdviseSetAccessedBy
#define cudaMemAdviseSetReadMostly hipMemAdviseSetReadMostly
#define cudaMemAttachGlobal hipMemAttachGlobal
#define cudaMemcpy hipMemcpy
#define cudaMemcpyAsync hipMemcpyAsync
#define cudaMemcpyDeviceToDevice hipMemcpyDeviceToDevice
#define cudaMemcpyDeviceToHost hipMemcpyDeviceToHost
#define cudaMemcpyHostToDevice hipMemcpyHostToDevice
#define cudaMemcpyHostToHost hipMemcpyHostToHost
#define cudaMemcpyToArrayAsync hipMemcpyToArray
#define cudaMemcpyToSymbol hipMemcpyToSymbol
#define cudaMemcpyToSymbolAsync hipMemcpyToSymbolAsync
#define cudaMemPrefetchAsync hipMemPrefetchAsync
#define cudaReadModeElementType hipReadModeElementType
#define cudaSetDevice hipSetDevice
#define cudaStream_t hipStream_t
#define cudaStreamCreate hipStreamCreate
#define cudaStreamDestroy hipStreamDestroy
#define cudaStreamSynchronize hipStreamSynchronize
#define cudaStreamWaitEvent hipStreamWaitEvent
#define cudaSuccess hipSuccess
#define cuDoubleComplex hipDoubleComplex
#define make_cuComplex make_hipComplex
#define make_cuDoubleComplex make_hipDoubleComplex
#define cudaDeviceSetLimit(limit, falue) ;