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.

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

Ver5.0 HIP Fixes #1219

Merged
merged 2 commits into from
Dec 27, 2024
+16 −16
Merged

Ver5.0 HIP Fixes #1219

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cafe3b0
update cmake path and config in HIP (mostly ROCm > 5.7)
Dec 9, 2024
e0553df
update HIP libs path (`hipfft`, `hiprand`, `hipcub`) for compatibilit…
Dec 9, 2024
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
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ if(CUDA)
elseif(HIP)
# ------------------------------------------------------------------------------HIP--
if (DEFINED ENV{ROCM_PATH})
include($ENV{ROCM_PATH}/hip/cmake/FindHIP.cmake)
include($ENV{ROCM_PATH}/lib/cmake/hip/FindHIP.cmake)
elseif(DEFINED ENV{HIP_PATH})
include($ENV{HIP_PATH}/cmake/FindHIP.cmake)
elseif(EXISTS "${CMAKE_SOURCE_DIR}/cmake/FindHIP.cmake")
Expand Down
2 changes: 1 addition & 1 deletion src/acc/hip/hip_fft.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include "src/acc/hip/hip_settings.h"
#include "src/acc/hip/hip_mem_utils.h"
#include <hip/hip_runtime.h>
#include <hipfft.h>
#include <hipfft/hipfft.h>

#ifdef DEBUG_HIP
#define HANDLE_HIPFFT_ERROR( err ) (HipfftHandleError( err, __FILE__, __LINE__ ))
Expand Down
4 changes: 2 additions & 2 deletions src/acc/hip/hip_kernels/helper.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
#define HIP_HELPER_KERNELS_H_

#include <hip/hip_runtime.h>
#include <hiprand.h>
#include <hiprand_kernel.h>
#include <hiprand/hiprand.h>
#include <hiprand/hiprand_kernel.h>
#include <vector>
#include <iostream>
#include <fstream>
Expand Down
4 changes: 2 additions & 2 deletions src/acc/hip/hip_kernels/helper.hip.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
#include "src/acc/hip/hip_kernels/helper.h"
#include "src/acc/hip/hip_settings.h"

#include <hiprand.h>
#include <hiprand_kernel.h>
#include <hiprand/hiprand.h>
#include <hiprand/hiprand_kernel.h>

/// Needed explicit template instantiations
template __global__ void hip_kernel_make_eulers_2D<true>(XFLOAT *,
Expand Down
2 changes: 1 addition & 1 deletion src/acc/hip/hip_mem_utils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

#ifdef _HIP_ENABLED
#include <hip/hip_runtime.h>
#include <hiprand.h>
#include <hiprand/hiprand.h>
#include "src/acc/hip/hip_settings.h"
#include "src/acc/hip/custom_allocator.h"
#endif
Expand Down
4 changes: 2 additions & 2 deletions src/acc/hip/hip_ml_optimiser.hip.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
#include <iostream>
#include "src/ml_optimiser.h"
#include <hip/hip_runtime.h>
#include <hiprand.h>
#include <hiprand_kernel.h>
#include <hiprand/hiprand.h>
#include <hiprand/hiprand_kernel.h>

#include "src/acc/acc_ptr.h"
#include "src/acc/acc_projector.h"
Expand Down
2 changes: 1 addition & 1 deletion src/acc/hip/hip_settings.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#include "src/macros.h"
#include "src/error.h"

#include <hiprand.h>
#include <hiprand/hiprand.h>

// Required compute capability
#define HIP_CC_MAJOR 5
Expand Down
8 changes: 4 additions & 4 deletions src/acc/hip/hip_utils_cub.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,14 @@ if (ptr.getAllocator() == NULL)
max_pair.deviceAlloc();
size_t temp_storage_size = 0;

DEBUG_HANDLE_ERROR(hipcub::DeviceReduce::ArgMax( NULL, temp_storage_size, ~ptr, ~max_pair, ptr.getSize()));
DEBUG_HANDLE_ERROR(hipcub::DeviceReduce::ArgMax( NULL, temp_storage_size, ~ptr, ~max_pair, static_cast<int>(ptr.getSize())));

if(temp_storage_size==0)
temp_storage_size=1;

HipCustomAllocator::Alloc* alloc = ptr.getAllocator()->alloc(temp_storage_size);

DEBUG_HANDLE_ERROR(hipcub::DeviceReduce::ArgMax( alloc->getPtr(), temp_storage_size, ~ptr, ~max_pair, ptr.getSize(), ptr.getStream()));
DEBUG_HANDLE_ERROR(hipcub::DeviceReduce::ArgMax( alloc->getPtr(), temp_storage_size, ~ptr, ~max_pair, static_cast<int>(ptr.getSize()), ptr.getStream()));

max_pair.cpToHost();
ptr.streamSync();
Expand Down Expand Up @@ -75,14 +75,14 @@ if (ptr.getAllocator() == NULL)
min_pair.deviceAlloc();
size_t temp_storage_size = 0;

DEBUG_HANDLE_ERROR(hipcub::DeviceReduce::ArgMin( NULL, temp_storage_size, ~ptr, ~min_pair, ptr.getSize()));
DEBUG_HANDLE_ERROR(hipcub::DeviceReduce::ArgMin( NULL, temp_storage_size, ~ptr, ~min_pair, static_cast<int>(ptr.getSize())));

if(temp_storage_size==0)
temp_storage_size=1;

HipCustomAllocator::Alloc* alloc = ptr.getAllocator()->alloc(temp_storage_size);

DEBUG_HANDLE_ERROR(hipcub::DeviceReduce::ArgMin( alloc->getPtr(), temp_storage_size, ~ptr, ~min_pair, ptr.getSize(), ptr.getStream()));
DEBUG_HANDLE_ERROR(hipcub::DeviceReduce::ArgMin( alloc->getPtr(), temp_storage_size, ~ptr, ~min_pair, static_cast<int>(ptr.getSize()), ptr.getStream()));

min_pair.cpToHost();
ptr.streamSync();
Expand Down
2 changes: 1 addition & 1 deletion src/apps/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ if (CUDA_FOUND)

elseif (HIP_FOUND)
file(GLOB REL_HIP_SRC "${CMAKE_SOURCE_DIR}/src/acc/hip/*.cpp" "${CMAKE_SOURCE_DIR}/src/acc/hip/hip_kernels/*.cpp" )
hip_add_library(relion_gpu_util ${REL_HIP_SRC})
add_library(relion_gpu_util ${REL_HIP_SRC})

if (${CMAKE_BUILD_TYPE_LOWER} STREQUAL "profiling")
find_library(ROCM_TRACER_LIB NAMES roctx64 PATHS ${HIP_ROOT_DIR}/lib ${HIP_ROOT_DIR}/../lib REQUIRED)
Expand Down
2 changes: 1 addition & 1 deletion src/projector.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#ifdef _CUDA_ENABLED
#include <cufft.h>
#elif _HIP_ENABLED
#include <hipfft.h>
#include <hipfft/hipfft.h>
#endif
#if defined _CUDA_ENABLED || defined _HIP_ENABLED
#include <sys/types.h>
Expand Down
Loading