Hendrik/xgboost
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix memoryType

Browse Source
This commit is contained in:
Hui Liu 2024-01-11 14:10:30 -08:00
parent 2d7ffbdf3d
commit c42c7d99f1
3 changed files with 33 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmake/Utils.cmake
View File

@ -214,12 +214,12 @@ function(xgboost_link_rccl target)
endif() endif()
if(BUILD_STATIC_LIB) if(BUILD_STATIC_LIB)
target_include_directories(${target} PUBLIC ${RCCL_INCLUDE_DIR}) target_include_directories(${target} PUBLIC ${RCCL_INCLUDE_DIR}/rccl)
target_compile_definitions(${target} PUBLIC ${xgboost_rccl_flags}) target_compile_definitions(${target} PUBLIC ${xgboost_rccl_flags})
target_link_directories(${target} PUBLIC ${HIP_LIB_INSTALL_DIR}) target_link_directories(${target} PUBLIC ${HIP_LIB_INSTALL_DIR})
target_link_libraries(${target} PUBLIC ${RCCL_LIBRARY}) target_link_libraries(${target} PUBLIC ${RCCL_LIBRARY})
else() else()
target_include_directories(${target} PRIVATE ${RCCL_INCLUDE_DIR}) target_include_directories(${target} PRIVATE ${RCCL_INCLUDE_DIR}/rccl)
target_compile_definitions(${target} PRIVATE ${xgboost_rccl_flags}) target_compile_definitions(${target} PRIVATE ${xgboost_rccl_flags})
target_link_directories(${target} PUBLIC ${HIP_LIB_INSTALL_DIR}) target_link_directories(${target} PUBLIC ${HIP_LIB_INSTALL_DIR})
if(NOT USE_DLOPEN_RCCL) if(NOT USE_DLOPEN_RCCL)

2
rocgputreeshap

@ -1 +1 @@
Subproject commit 6ceffde024f8752954550ebcca98caa24b5d158d Subproject commit 2fea6734e83cf147c1bbe580ac4713cd50abcad5

32
src/data/array_interface.cu
View File

@ -20,7 +20,6 @@ void ArrayInterfaceHandler::SyncCudaStream(std::int64_t stream) {
* case where 0 might be given should either use None, 1, or 2 instead for * case where 0 might be given should either use None, 1, or 2 instead for
* clarity. * clarity.
*/ */
/* ignored for HIP */
#if !defined(XGBOOST_USE_HIP) #if !defined(XGBOOST_USE_HIP)
LOG(FATAL) << "Invalid stream ID in array interface: " << stream; LOG(FATAL) << "Invalid stream ID in array interface: " << stream;
#endif #endif
@ -42,7 +41,7 @@ bool ArrayInterfaceHandler::IsCudaPtr(void const* ptr) {
return false; return false;
} }
#if defined(XGBOOST_USE_CUDA) || defined(XGBOOST_USE_HIP) #if defined(XGBOOST_USE_CUDA)
cudaPointerAttributes attr; cudaPointerAttributes attr;
auto err = cudaPointerGetAttributes(&attr, ptr); auto err = cudaPointerGetAttributes(&attr, ptr);
// reset error // reset error
@ -64,6 +63,35 @@ bool ArrayInterfaceHandler::IsCudaPtr(void const* ptr) {
// other errors, `cudaErrorNoDevice`, `cudaErrorInsufficientDriver` etc. // other errors, `cudaErrorNoDevice`, `cudaErrorInsufficientDriver` etc.
return false; return false;
} }
#elif defined(XGBOOST_USE_HIP)
hipPointerAttribute_t attr;
auto err = hipPointerGetAttributes(&attr, ptr);
// reset error
CHECK_EQ(err, hipGetLastError());
if (err == hipErrorInvalidValue) {
return false;
} else if (err == hipSuccess) {
#if HIP_VERSION_MAJOR < 6
switch (attr.memoryType) {
case hipMemoryTypeUnified:
case hipMemoryTypeHost:
return false;
default:
return true;
}
#else
switch (attr.type) {
case hipMemoryTypeUnified:
case hipMemoryTypeHost:
return false;
default:
return true;
}
#endif
return true;
} else {
return false;
}
#endif #endif
} }
} // namespace xgboost } // namespace xgboost