Skip to content

Commit cd0e4e2

Browse files
committed
fix autoloader for Ubuntu 20.04
1 parent 38521bb commit cd0e4e2

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

lib/numo/linalg/autoloader.rb

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ def load_library
2626
lapacke_dirs = ['/opt/lapack/lib', '/opt/lapack/lib64', '/opt/local/lib/lapack',
2727
'/usr/local/opt/lapack/lib']
2828
opt_dirs = ['/opt/local/lib', '/opt/local/lib64', '/opt/lib', '/opt/lib64']
29-
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', '/usr/lib/x86_64-linux-gnu']
3030
base_dirs.concat(Dir["/usr/lib/#{RbConfig::CONFIG['host_cpu']}-*"])
3131
base_dirs.unshift(*ENV['LD_LIBRARY_PATH'].split(':')) unless ENV['LD_LIBRARY_PATH'].nil?
3232

@@ -71,8 +71,8 @@ def detect_library_extension
7171
def find_libs(lib_names, lib_dirs)
7272
lib_ext = detect_library_extension
7373
lib_arr = lib_names.map do |l|
74-
[l.to_sym, lib_dirs.map { |d| "#{d}/lib#{l}.#{lib_ext}" }
75-
.keep_if { |f| File.exist?(f) }.first]
74+
[l.to_sym, lib_dirs.map { |d| Dir.glob("#{d}/lib#{l}{,64}.#{lib_ext}{,.[0-9]}").last }
75+
.compact.first]
7676
end
7777
Hash[*lib_arr.flatten]
7878
end

0 commit comments

Comments
 (0)