Skip to content

[ROCm] Updates to remove HIP deprecated symbols #355

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.

Sign up for GitHub

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

Closed
wants to merge 1 commit into from
Closed

[ROCm] Updates to remove HIP deprecated symbols #355

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions cmake/Dependencies.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,13 +155,13 @@ if(USE_ROCM)
list(APPEND HIP_CXX_FLAGS -Wno-duplicate-decl-specifier)
list(APPEND HIP_CXX_FLAGS -DUSE_MIOPEN)

set(HIP_HCC_FLAGS ${HIP_CXX_FLAGS})
set(HIP_CLANG_FLAGS ${HIP_CXX_FLAGS})
# Ask hcc to generate device code during compilation so we can use
# host linker to link.
list(APPEND HIP_HCC_FLAGS -fno-gpu-rdc)
list(APPEND HIP_HCC_FLAGS -Wno-defaulted-function-deleted)
list(APPEND HIP_CLANG_FLAGS -fno-gpu-rdc)
list(APPEND HIP_CLANG_FLAGS -Wno-defaulted-function-deleted)
foreach(gloo_rocm_arch ${GLOO_ROCM_ARCH})
list(APPEND HIP_HCC_FLAGS --amdgpu-target=${gloo_rocm_arch})
list(APPEND HIP_CLANG_FLAGS --amdgpu-target=${gloo_rocm_arch})
endforeach()

set(GLOO_HIP_INCLUDE ${hip_INCLUDE_DIRS} $<BUILD_INTERFACE:${HIPIFY_OUTPUT_ROOT_DIR}> $<INSTALL_INTERFACE:include> ${GLOO_HIP_INCLUDE})
Expand Down
10 changes: 5 additions & 5 deletions cmake/Modules/Findrccl.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ else()
endif()

find_path(RCCL_INCLUDE_DIR
NAMES rccl.h
NAMES rccl/rccl.h
HINTS
${RCCL_INCLUDE_DIR}
${RCCL_ROOT_DIR}/include)
Expand All @@ -33,17 +33,17 @@ else()
set(RCCL_LIBNAME "rccl")
endif()

find_library(RCCL_LIBRARY
find_library(RCCL_LIB_PATH
NAMES ${RCCL_LIBNAME}
HINTS
${RCCL_LIB_DIR}
${RCCL_ROOT_DIR}/lib)

include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(RCCL DEFAULT_MSG RCCL_INCLUDE_DIR RCCL_LIBRARY)
find_package_handle_standard_args(RCCL DEFAULT_MSG RCCL_INCLUDE_DIR RCCL_LIB_PATH)

if (RCCL_FOUND)
set(RCCL_HEADER_FILE "${RCCL_INCLUDE_DIR}/rccl.h")
set(RCCL_HEADER_FILE "${RCCL_INCLUDE_DIR}/rccl/rccl.h")
message(STATUS "Determining RCCL version from the header file: ${RCCL_HEADER_FILE}")
file (STRINGS ${RCCL_HEADER_FILE} RCCL_MAJOR_VERSION_DEFINED
REGEX "^[ \t]*#define[ \t]+RCCL_MAJOR[ \t]+[0-9]+.*$" LIMIT_COUNT 1)
Expand All @@ -53,7 +53,7 @@ if (RCCL_FOUND)
message(STATUS "RCCL_MAJOR_VERSION: ${RCCL_MAJOR_VERSION}")
endif()
set(RCCL_INCLUDE_DIRS ${RCCL_INCLUDE_DIR})
set(RCCL_LIBRARIES ${RCCL_LIBRARY})
set(RCCL_LIBRARIES ${RCCL_LIB_PATH})
message(STATUS "Found RCCL (include: ${RCCL_INCLUDE_DIRS}, library: ${RCCL_LIBRARIES})")
mark_as_advanced(RCCL_ROOT_DIR RCCL_INCLUDE_DIRS RCCL_LIBRARIES)
endif()
2 changes: 1 addition & 1 deletion tools/amd_build/pyHIPIFY/cuda_to_hip_mappings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7784,7 +7784,7 @@
("cudnn", ("miopen", API_GLOO)),
("namespace cuda", ("namespace hip", API_GLOO)),
("gloo/cuda.h", ("gloo/hip.h", API_GLOO)),
("<nccl.h>", ("<rccl.h>", API_GLOO)),
("<nccl.h>", ("<rccl/rccl.h>", API_GLOO)),
("GLOO_USE_NCCL", ("GLOO_USE_RCCL", API_GLOO)),
]
)
Expand Down