numo-linalg 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f1a7f32e07db68cc87340dc3245d9205026bd33c4ebc18b1cbef28f605f1a1d6
-  data.tar.gz: 1cb21ea35b2dacb1fb02d44317fb3684d9827635e4191aa7ecffd069edd214b1
+  metadata.gz: 8315eaaebc86b1e549f1dd1132ba0e25e895c10f6a68b7b461c734bb3fd7612e
+  data.tar.gz: ead727d78cff037a15476917751d0373e08abe1cce5cb14931ea8a82628ab8a1
 SHA512:
-  metadata.gz: c6125b1b665a2fbd87ecda093e1afea1ef85ca057e62921d95fa424dbe7e30d41d26c5c4caca57719d4c284ec33e179508b13d12c4de5e535c65c186eedc42eb
-  data.tar.gz: 1d7b3ac0fa98d70bb772674b4491d4d0285ef3303668a59299075c7a1595ff1796df745b73c30f34e295260d0b79df0aaf395b2742a912a292c1a618d92f116b
+  metadata.gz: a228a21cc9e6cc3b44f7c11b66b1dcea76dbdc22e51b09e35ca62118a721dea4d4a6dcc729a0603f0aec64411d2c9c72d63ff922a2bb57ea0d93b5363bdab50b
+  data.tar.gz: d9651310d52d9f1c1e41caad01bb8f706fe1a631557eaed076cd355702a1ef1ea55e88fe9b2e29ba95476f55569410c5cc737230b67e0843b623844e61f3ece8

data/README.md

@@ -1,7 +1,7 @@
 # Numo::Linalg : Linear Algebra library with BLAS/LAPACK binding to Numo::NArray
 
 [![Binder](http://mybinder.org/badge.svg)](http://mybinder.org/repo/ruby-numo/numo-linalg)
-[![Build Status](https://travis-ci.org/ruby-numo/numo-linalg.svg?branch=master)](https://travis-ci.org/ruby-numo/numo-linalg)
+[![Build Status](https://github.com/ruby-numo/numo-linalg/workflows/build/badge.svg)](https://github.com/ruby-numo/numo-linalg/actions)
 
 [GitHub](https://github.com/ruby-numo/numo-linalg) |
 [RubyGems](https://rubygems.org/gems/numo-linalg)
@@ -11,7 +11,7 @@ Under development!
 ## Introduction
 
 This is a binding of BLAS/LAPACK for Numo::NArray using dynamic linking loader.
-This desgin allows you to change backend libraries without re-compiling.
+This design allows you to change backend libraries without re-compiling.
 
 ### [Numo::Linalg API](http://ruby-numo.github.io/numo-linalg/yard/Numo/Linalg.html)
 

data/Rakefile

@@ -16,3 +16,20 @@ end
 task :cleandoc do
   sh "rm -r yard .yardoc"
 end
+
+require 'rake/extensiontask'
+Rake::ExtensionTask.new 'numo/linalg/blas'
+Rake::ExtensionTask.new 'numo/linalg/lapack'
+
+CLOBBER.include('lib/numo/linalg/site_conf.rb')
+task :compile do
+  site_conf = Dir['./tmp/**/numo/linalg/blas/**/lib/site_conf.rb'].first
+  cp site_conf, 'lib/numo/linalg'
+end
+
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.rspec_opts = '--color --format documentation --require spec_helper'
+end
+
+task :default => [:clobber, :compile, :spec]

data/ext/numo/linalg/blas/depend.erb

@@ -1,5 +1,5 @@
-COGEN=ruby gen/cogen.rb -l
-GENDEPS=gen/*.rb tmpl/*.c
+COGEN=<%= "ruby #{__dir__}/gen/cogen.rb -l" %>
+GENDEPS=<%= "#{__dir__}/gen/*.rb #{__dir__}/tmpl/*.c" %>
 
 <%
 srcs = %w[s d c z].map{|c| [c, "blas_#{c}.c"]}

data/ext/numo/linalg/blas/extconf.rb

@@ -36,5 +36,5 @@ elsif have_header("windows.h")
 end
 
 create_site_conf
-create_depend
+create_depend(__dir__)
 create_makefile('numo/linalg/blas')

data/ext/numo/linalg/lapack/depend.erb

@@ -1,5 +1,5 @@
-COGEN=ruby gen/cogen.rb -l
-GENDEPS=gen/*.rb tmpl/*.c
+COGEN=<%= "ruby #{__dir__}/gen/cogen.rb -l" %>
+GENDEPS=<%= "#{__dir__}/gen/*.rb #{__dir__}/tmpl/*.c" %>
 
 <%
 srcs = %w[s d c z].map{|c| [c, "lapack_#{c}.c"]}

data/ext/numo/linalg/lapack/extconf.rb

@@ -36,5 +36,5 @@ elsif have_header("windows.h")
   exit(1) unless have_func("LoadLibrary")
 end
 
-create_depend
+create_depend(__dir__)
 create_makefile('numo/linalg/lapack')

data/ext/numo/linalg/mkmf_linalg.rb

@@ -69,12 +69,12 @@ def find_libnarray_a
   end
 end
 
-def create_depend
+def create_depend(base_dir)
   require 'erb'
   message "creating depend\n"
-  dep_path = File.join(Dir.pwd, "depend")
+  dep_path = "#{base_dir}/depend"
   File.open(dep_path, "w") do |dep|
-    dep_erb_path = File.join(Dir.pwd, "depend.erb")
+    dep_erb_path = "#{base_dir}/depend.erb"
     File.open(dep_erb_path, "r") do |dep_erb|
       erb = ERB.new(dep_erb.read)
       erb.filename = dep_erb_path

data/lib/numo/linalg/autoloader.rb

@@ -26,10 +26,16 @@ module Numo
         lapacke_dirs = ['/opt/lapack/lib', '/opt/lapack/lib64', '/opt/local/lib/lapack',
                         '/usr/local/opt/lapack/lib']
         opt_dirs =  ['/opt/local/lib', '/opt/local/lib64', '/opt/lib', '/opt/lib64']
-        base_dirs = ['/usr/local/lib', '/usr/local/lib64', '/usr/lib', '/usr/lib64',
-                     "/usr/lib/#{RbConfig::CONFIG['host_cpu']}-#{RbConfig::CONFIG['host_os']}"]
+        base_dirs = ['/usr/local/lib', '/usr/local/lib64', '/usr/lib', '/usr/lib64']
+        base_dirs.concat(Dir["/usr/lib/#{RbConfig::CONFIG['host_cpu']}-*"])
         base_dirs.unshift(*ENV['LD_LIBRARY_PATH'].split(':')) unless ENV['LD_LIBRARY_PATH'].nil?
 
+        select_dirs(base_dirs)
+        select_dirs(opt_dirs)
+        select_dirs(lapacke_dirs)
+        select_dirs(atlas_dirs)
+        select_dirs(mkl_dirs)
+
         mkl_libs = find_mkl_libs([*base_dirs, *opt_dirs, *mkl_dirs])
         openblas_libs = find_openblas_libs([*base_dirs, *opt_dirs, *openblas_dirs])
         atlas_libs = find_atlas_libs([*base_dirs, *opt_dirs, *atlas_dirs, *lapacke_dirs])
@@ -68,11 +74,18 @@ module Numo
         end
       end
 
+      def select_dirs(dirs)
+        dirs.select!{|d| Dir.exist?(d)}
+      end
+
       def find_libs(lib_names, lib_dirs)
         lib_ext = detect_library_extension
         lib_arr = lib_names.map do |l|
-          [l.to_sym, lib_dirs.map { |d| "#{d}/lib#{l}.#{lib_ext}" }
-                             .keep_if { |f| File.exist?(f) }.first]
+          x = nil
+          lib_dirs.each do |d|
+            break if x = Dir.glob("#{d}/lib#{l}{,64}.#{lib_ext}{,.*}").last
+          end
+          [l.to_sym, x]
         end
         Hash[*lib_arr.flatten]
       end

data/lib/numo/linalg/version.rb

@@ -1,5 +1,5 @@
 module Numo
   module Linalg
-    VERSION = "0.1.5"
+    VERSION = "0.1.6"
   end
 end

data/numo-linalg.gemspec

@@ -22,6 +22,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
+  spec.add_development_dependency "rake-compiler"
   spec.add_development_dependency "rspec"
   spec.add_runtime_dependency "numo-narray", ">= 0.9.1.4"
 end

data/spec/linalg/autoloader_spec.rb

@@ -7,21 +7,4 @@ RSpec.describe Numo::Linalg::Autoloader do
     expect { described_class.load_library }.to_not raise_error
     expect(described_class.libs).to_not be_nil
   end
-
-  describe 'private method' do
-    let(:autoloader) do
-      class DummyLoader
-        include Numo::Linalg::Autoloader
-      end
-      DummyLoader.new
-    end
-
-    it 'finds BLAS/LAPACK libraries' do
-      lapack_libs = autoloader.send(:find_lapack_libs, ['/usr/lib', '/usr/local/lib', '/usr/local/opt/lapack/lib'])
-      expect(lapack_libs[:blas]).to_not be_nil
-      expect(lapack_libs[:cblas]).to_not be_nil
-      expect(lapack_libs[:lapack]).to_not be_nil
-      expect(lapack_libs[:lapacke]).to_not be_nil
-    end
-  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: numo-linalg
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Masahiro TANAKA
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-30 00:00:00.000000000 Z
+date: 2021-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -39,6 +39,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake-compiler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -214,7 +228,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
 summary: Ruby/Numo Linear Algebra library with BLAS/LAPACK