Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rename __HIP_PLATFORM_HCC__ to __HIP_PLATFORM_AMD__ #374

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cmake/Dependencies.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ if(USE_ROCM)
if(HAVE_HIP)
include(cmake/Hipify.cmake)
list(APPEND HIP_CXX_FLAGS -fPIC)
list(APPEND HIP_CXX_FLAGS -D__HIP_PLATFORM_HCC__=1)
list(APPEND HIP_CXX_FLAGS -D__HIP_PLATFORM_AMD__=1)
list(APPEND HIP_CXX_FLAGS -DCUDA_HAS_FP16=1)
list(APPEND HIP_CXX_FLAGS -D__HIP_NO_HALF_OPERATORS__=1)
list(APPEND HIP_CXX_FLAGS -D__HIP_NO_HALF_CONVERSIONS__=1)
Expand All @@ -165,7 +165,7 @@ if(USE_ROCM)
# This is needed for library added by hip_add_library (same for hip_add_executable)
hip_include_directories(${GLOO_HIP_INCLUDE})

set(gloo_hip_DEPENDENCY_LIBS ${GLOO_HIP_HCC_LIBRARIES})
set(gloo_hip_DEPENDENCY_LIBS ${GLOO_HIP_LIBRARIES})

else()
message(WARNING "Not compiling with HIP support. Suppress this warning with -DUSE_ROCM=OFF.")
Expand Down
2 changes: 1 addition & 1 deletion cmake/Hip.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ IF(HIP_FOUND)

set(CMAKE_HCC_FLAGS_DEBUG ${CMAKE_CXX_FLAGS_DEBUG})
set(CMAKE_HCC_FLAGS_RELEASE ${CMAKE_CXX_FLAGS_RELEASE})
FIND_LIBRARY(GLOO_HIP_HCC_LIBRARIES ${hip_library_name} HINTS ${ROCM_PATH}/lib)
FIND_LIBRARY(GLOO_HIP_LIBRARIES ${hip_library_name} HINTS ${ROCM_PATH}/lib)

ENDIF()

Expand Down
2 changes: 1 addition & 1 deletion gloo/cuda.cu
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ CudaStream::CudaStream(int deviceId, cudaStream_t stream)

// Create new stream if it wasn't specified
if (stream_ == kStreamNotSet) {
#ifndef __HIP_PLATFORM_HCC__
#ifndef __HIP_PLATFORM_AMD__
int loPri, hiPri;
CUDA_CHECK(cudaDeviceGetStreamPriorityRange(&loPri, &hiPri));
CUDA_CHECK(cudaStreamCreateWithPriority(
Expand Down