Skip to content

Commit a8f2766

Browse files
authored
Merge pull request #30 from yoshoku/fix_autoloader_search_dirs
Add some directories to autoloader search path
2 parents 8a5588e + 46eb930 commit a8f2766

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

lib/numo/linalg/autoloader.rb

+4-2
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,15 @@ def libs
1919
# @return [String] name of loaded backend library (mkl/openblas/lapack)
2020
def load_library
2121
mkl_dirs = ['/opt/intel/lib', '/opt/intel/lib64', '/opt/intel/mkl/lib', '/opt/intel/mkl/lib64']
22-
openblas_dirs = ['/opt/openblas/lib', '/opt/openblas/lib64', '/usr/local/opt/openblas/lib']
22+
openblas_dirs = ['/opt/OpenBLAS/lib', '/opt/OpenBLAS/lib64', '/opt/openblas/lib', '/opt/openblas/lib64',
23+
'/usr/local/opt/openblas/lib']
2324
atlas_dirs = ['/opt/atlas/lib', '/opt/atlas/lib64',
2425
'/usr/lib/atlas', '/usr/lib64/atlas', '/usr/local/opt/atlas/lib']
2526
lapacke_dirs = ['/opt/lapack/lib', '/opt/lapack/lib64', '/opt/local/lib/lapack',
2627
'/usr/local/opt/lapack/lib']
2728
opt_dirs = ['/opt/local/lib', '/opt/local/lib64', '/opt/lib', '/opt/lib64']
28-
base_dirs = ['/usr/local/lib', '/usr/local/lib64', '/usr/lib', '/usr/lib64']
29+
base_dirs = ['/usr/local/lib', '/usr/local/lib64', '/usr/lib', '/usr/lib64',
30+
"/usr/lib/#{RbConfig::CONFIG['host_cpu']}-#{RbConfig::CONFIG['host_os']}"]
2931
base_dirs.unshift(*ENV['LD_LIBRARY_PATH'].split(':')) unless ENV['LD_LIBRARY_PATH'].nil?
3032

3133
mkl_libs = find_mkl_libs([*base_dirs, *opt_dirs, *mkl_dirs])

0 commit comments

Comments
 (0)