Skip to content

Commit

Permalink
Prefer librocalution_hip over librocalution (#691)
Browse files Browse the repository at this point in the history
* Prefer librocalution_hip over librocalution

* Do not load rocALUTION since it is not used

---------

Co-authored-by: Anton Smirnov <[email protected]>
  • Loading branch information
vchuravy and pxl-th authored Nov 7, 2024
1 parent d77cee6 commit e26bb96
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 9 deletions.
3 changes: 1 addition & 2 deletions src/AMDGPU.jl
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
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
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

0 comments on commit e26bb96

Please sign in to comment.