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

Jump to bottom

Prefer librocalution_hip over librocalution #691

Merged
merged 2 commits into from
Nov 7, 2024
Merged

Prefer librocalution_hip over librocalution #691

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
ee6c456
Prefer librocalution_hip over librocalution
vchuravy Nov 6, 2024
2c28f2c
Do not load rocALUTION since it is not used
pxl-th Nov 7, 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
3 changes: 1 addition & 2 deletions src/AMDGPU.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,8 +213,7 @@ function __init__()
end

hiplibs = (
("rocBLAS", :rocblas), ("rocSPARSE", :rocsparse),
("rocSOLVER", :rocsolver), ("rocALUTION", :rocalution),
("rocBLAS", :rocblas), ("rocSPARSE", :rocsparse), ("rocSOLVER", :rocsolver),
("rocRAND", :rocrand), ("rocFFT", :rocfft), ("MIOpen", :MIOpen))
for (name, symbol) in hiplibs
functional(symbol) || @warn "$name is unavailable, functionality will be disabled."
Expand Down
3 changes: 1 addition & 2 deletions src/discovery/discovery.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ function get_device_libs(from_artifact::Bool; rocm_path::String)
end

export lld_artifact, lld_path, libhsaruntime, libdevice_libs, libhip
export librocblas, librocsparse, librocsolver, librocalution
export librocblas, librocsparse, librocsolver
export librocrand, librocfft, libMIOpen_path
export julia_exeflags

Expand Down Expand Up @@ -106,7 +106,6 @@ function __init__()
global librocblas = get_library(lib_prefix * "rocblas"; rocm_path)
global librocsparse = get_library(lib_prefix * "rocsparse"; rocm_path)
global librocsolver = get_library(lib_prefix * "rocsolver"; rocm_path)
global librocalution = get_library(lib_prefix * "rocalution"; rocm_path)
global librocrand = get_library(lib_prefix * "rocrand"; rocm_path)
global librocfft = get_library(lib_prefix * "rocfft"; rocm_path)
global libMIOpen_path = get_library(lib_prefix * "MIOpen"; rocm_path)
Expand Down
6 changes: 1 addition & 5 deletions src/utils.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ function versioninfo()
_status(functional(:hip)) "HIP" _ver(:hip, HIP.runtime_version) _libpath(libhip);
_status(functional(:rocblas)) "rocBLAS" _ver(:rocblas, rocBLAS.version) _libpath(librocblas);
_status(functional(:rocsolver)) "rocSOLVER" _ver(:rocsolver, rocSOLVER.version) _libpath(librocsolver);
_status(functional(:rocalution)) "rocALUTION" "-" _libpath(librocalution);
_status(functional(:rocsparse)) "rocSPARSE" "-" _libpath(librocsparse);
_status(functional(:rocrand)) "rocRAND" _ver(:rocrand, rocRAND.version) _libpath(librocrand);
_status(functional(:rocfft)) "rocFFT" _ver(:rocfft, rocFFT.version) _libpath(librocfft);
Expand Down Expand Up @@ -62,7 +61,6 @@ function correctly. Available `component` values are:
- `:device_libs` - Queries ROCm device libraries availability
- `:rocblas` - Queries rocBLAS library availability
- `:rocsolver` - Queries rocSOLVER library availability
- `:rocalution` - Queries rocALUTION library availability
- `:rocsparse` - Queries rocSPARSE library availability
- `:rocrand` - Queries rocRAND library availability
- `:rocfft` - Queries rocFFT library availability
Expand All @@ -82,8 +80,6 @@ function functional(component::Symbol)
return !isempty(librocblas)
elseif component == :rocsolver
return !isempty(librocsolver)
elseif component == :rocalution
return !isempty(librocalution)
elseif component == :rocsparse
return !isempty(librocsparse)
elseif component == :rocrand
Expand All @@ -95,7 +91,7 @@ function functional(component::Symbol)
elseif component == :all
for component in (
:hip, :lld, :device_libs, :rocblas, :rocsolver,
:rocalution, :rocsparse, :rocrand, :rocfft, :MIOpen,
:rocsparse, :rocrand, :rocfft, :MIOpen,
)
functional(component) || return false
end
Expand Down