numo-linalg 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d78b166ec210437736f2153cbee645d9cb1fe43c99ebfdc8831e15b1fa46249f
-  data.tar.gz: ce602ae09a67e518a5e7bc539256b2e35ebc342c528860eb9a527d7446d4c871
+  metadata.gz: 8a9f783654dbe1c2f8ca4dbeef4030053d8e8c92a99f1ccf0fa0ecd551c90f90
+  data.tar.gz: 46f3558e6bd86db15fb0d3ab9558e1f4e565ca844db500684b9eaac0e6ec57c7
 SHA512:
-  metadata.gz: 79a092556b215e5a3667aab25ba97dc752fe3223dcca95d0a4018c71dd934d0eddad7816a94f87eb230e55cac5397ff430bdfb3d4ba8178eb443cf9f9dbd82da
-  data.tar.gz: 13774cf94a8b2724217bb3f00e6ed24337ad5c64db83f873bb5dfb7e6bf9b606311013d7eaeca8fcf99c4a2d98837cc2259d5389f5a9da1a784bb3d1d2c18176
+  metadata.gz: f1c478c9f017babd63b40dcea4eeb6ca9222226f680cc6870b01c1f305f54080ab7c035ead34c39d9f70aa431c6b2d9c9ec1be0642f7bab66eea32ee97c39363
+  data.tar.gz: d55a4aa11afffbb51486007df3c80b221a3e90e990e86b76eadc996d560abf8d3e16df62aa25e3f65f050175dca8d45d5b791c1dc4b2b2c3ac66031da0c70c7b

data/README.md

@@ -1,10 +1,10 @@
 # Numo::Linalg : Linear Algebra library with BLAS/LAPACK binding to Numo::NArray
 
-[![Binder](http://mybinder.org/badge.svg)](http://mybinder.org/repo/ruby-numo/linalg)
-[![Build Status](https://travis-ci.org/ruby-numo/linalg.svg?branch=master)](https://travis-ci.org/ruby-numo/linalg)
+[![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)
 
-[GitHub](https://github.com/ruby-numo/linalg) |
-[RubyGems](https://github.com/ruby-numo/linalg)
+[GitHub](https://github.com/ruby-numo/numo-linalg) |
+[RubyGems](https://rubygems.org/gems/numo-linalg)
 
 Under development!
 
@@ -49,7 +49,7 @@ This desgin allows you to change backend libraries without re-compiling.
         * [Intel MKL](https://software.intel.com/intel-mkl)
 
     * Note that the performance depends on the backend library as shown in
-      [benchmark](https://github.com/ruby-numo/linalg/tree/master/bench).
+      [benchmark](https://github.com/ruby-numo/numo-linalg/tree/master/bench).
 
 * Install Numo::Linalg
 
@@ -60,7 +60,7 @@ $ gem install numo-linalg
 or
 
 ```shell
-$ git clone https://github.com/ruby-numo/linalg.git
+$ git clone https://github.com/ruby-numo/numo-linalg.git
 $ cd linalg
 $ rake build
 $ gem install pkg/numo-linalg-*.gem
@@ -74,7 +74,7 @@ $ gem install pkg/numo-linalg-*.gem
 require "numo/linalg"
 ```
 
-* Read also instruction for [Selecting Backend Library](https://github.com/ruby-numo/linalg/tree/master/doc/select-backend.md).
+* Read also instruction for [Selecting Backend Library](https://github.com/ruby-numo/numo-linalg/tree/master/doc/select-backend.md).
 
 ## Authors
 

data/ext/numo/linalg/blas/gen/cogen.rb

@@ -1,14 +1,12 @@
 #! /usr/bin/env ruby
 
 pwd = File.dirname(__FILE__)
-#libpath = File.absolute_path(File.dirname(__FILE__))+"/../../../../lib"
-#$LOAD_PATH.unshift libpath
 
 require_relative "./decl"
 
 while true
   if ARGV[0] == "-l"
-    require "erbpp/line_number"
+    $line_number = true
     ARGV.shift
   elsif ARGV[0] == "-o"
     ARGV.shift
@@ -31,12 +29,12 @@ erb_dir = ["../tmpl"]
 erb_dir.map!{|d| File.join(pwd,d)}
 
 code = DefLib.new do
+  set line_number: $line_number
   set erb_dir: erb_dir
   set erb_suffix: ".c"
   set ns_var: "mN"
 
   set file_name: $output || ""
-  #set include_files: ["numo/types/#{type_name}.h"]
   set lib_name: "numo_linalg_blas_"+blas_char
 
   def_module do

data/ext/numo/linalg/blas/gen/decl.rb

@@ -1,4 +1,4 @@
-require_relative './erbpp2'
+require_relative 'erbpp2'
 
 module Decl
 

data/ext/numo/linalg/blas/gen/erbln.rb

@@ -0,0 +1,132 @@
+require 'erb'
+
+class ErbPP
+
+  class CountLnString < String
+
+    def initialize(filename)
+      @filename = filename
+      @lnchar = "\n"
+      @buf = ""
+      @str = ""
+      @countln = 1
+      @current = 1
+      super("\n"+report_line)
+    end
+
+    def report_line
+      "#line #{@current} \"#{@filename}\"\n"
+    end
+
+    def concat0(s)
+      ln(caller[0])
+      @buf.concat(s)
+      @str.concat(s)
+    end
+
+    def concat1(s)
+      ln(caller[0])
+      @buf.concat(s)
+    end
+
+    def ln(status=nil)
+      case status
+      when /:(\d+):/
+        n = $1.to_i
+      else
+        n = status.to_i
+      end
+      return if n == @current
+      if @current != @countln || @postpone
+        if /\A\s*\z/ =~ @str || /\A#line / =~ @buf
+          @postpone = true
+        elsif @in_comment
+          @postpone = false
+        else
+          if self[-1] != "\n"
+            concat("\n")
+          end
+          concat(report_line)
+          @postpone = false
+        end
+      end
+      concat(@buf)
+
+      b = @buf.gsub(/".*?(?<!\\)"/,'""')
+      /^.*(\/\*)(.*?)$/ =~ b
+      x = $2
+      /^.*(\*\/)(.*?)$/ =~ b
+      y = $2
+      if x
+        if y
+          if x.size < y.size
+            #:in_comment
+            @in_comment = true
+          else
+            #:out_comment
+            @in_comment = false
+          end
+        else
+          #:in_comment
+          @in_comment = true
+        end
+      else
+        if y
+          #:out_comment
+          @in_comment = false
+        else
+          #:keep
+        end
+      end
+
+      @countln = @current + @buf.count(@lnchar)
+      @current = n
+      @buf = ""
+      @str = ""
+    end
+
+    def d(s)
+      p [s, [x,y], r]
+      r
+    end
+
+    def final
+      ln(caller[0])
+      concat(@buf)
+    end
+
+  end
+
+  class ERBLN
+
+    def initialize(str, filename, trim_mode=nil, eoutvar='_erbout')
+      @filename = filename
+      compiler = ERB::Compiler.new(trim_mode)
+      set_eoutvar(compiler, eoutvar)
+      @src, @enc = *compiler.compile(str)
+    end
+
+    def set_eoutvar(compiler, eoutvar = '_erbout')
+      compiler.put_cmd = "#{eoutvar}.concat0"
+      compiler.insert_cmd = "#{eoutvar}.concat1"
+      compiler.pre_cmd = ["#{eoutvar} = CountLnString.new(#{@filename.inspect})"]
+      compiler.post_cmd = ["#{eoutvar}.final"]
+    end
+
+    def run(b)
+      print self.result(b)
+    end
+
+    def result(b)
+      #open("tmpout","a") do |f|
+      #  f.puts "\n#file:#{@filename}"
+      #  f.puts @src
+      #end
+      eval(@src, b, (@filename || '(erb)'), 0)
+    end
+
+    #require "fileutils"
+    #FileUtils.rm_f("tmpout")
+  end
+
+end

data/ext/numo/linalg/blas/gen/erbpp2.rb

@@ -1,4 +1,5 @@
 require "erb"
+require_relative "erbln"
 
 class ErbPP
 
@@ -66,8 +67,12 @@ class ErbPP
       Dir.glob(x).each do |dir|
         path = File.join(dir,file)
         if File.exist?(path)
-          erb = ERB.new(File.read(path), safe_level, trim_mode)
-          erb.filename = path
+          if get(:line_number)
+            erb = ERBLN.new(File.read(path), path, trim_mode)
+          else
+            erb = ERB.new(File.read(path), safe_level, trim_mode)
+            erb.filename = path
+          end
           return erb
         end
       end

data/ext/numo/linalg/lapack/gen/cogen.rb

@@ -1,14 +1,12 @@
 #! /usr/bin/env ruby
 
 pwd = File.dirname(__FILE__)
-#libpath = File.absolute_path(File.dirname(__FILE__))+"/../../../../lib"
-#$LOAD_PATH.unshift libpath
 
 require_relative "../../blas/gen/decl"
 
 while true
   if ARGV[0] == "-l"
-    require "erbpp/line_number"
+    $line_number = true
     ARGV.shift
   elsif ARGV[0] == "-o"
     ARGV.shift
@@ -31,6 +29,7 @@ erb_dir = ["../tmpl"]
 erb_dir.map!{|d| File.join(pwd,d)}
 
 code = DefLib.new do
+  set line_number: $line_number
   set erb_dir: erb_dir
   set erb_suffix: ".c"
   set ns_var: "mN"

data/lib/numo/linalg/autoloader.rb

@@ -0,0 +1,142 @@
+require 'fiddle'
+require 'rbconfig'
+require 'numo/linalg/linalg'
+
+module Numo
+  module Linalg
+    module Autoloader
+
+      @@libs = nil
+
+      module_function
+
+      def libs
+        @@libs
+      end
+
+      # Load backend libraries for Numo::Linalg automatically.
+      #
+      # @return [String] name of loaded backend library (mkl/openblas/lapack)
+      def load_library
+        mkl_dirs = ['/opt/intel/lib', '/opt/intel/lib64', '/opt/intel/mkl/lib', '/opt/intel/mkl/lib64']
+        openblas_dirs = ['/opt/openblas/lib', '/opt/openblas/lib64', '/usr/local/opt/openblas/lib']
+        atlas_dirs = ['/opt/atlas/lib', '/opt/atlas/lib64',
+                      '/usr/lib/atlas', '/usr/lib64/atlas', '/usr/local/opt/atlas/lib']
+        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']
+        base_dirs.unshift(*ENV['LD_LIBRARY_PATH'].split(':')) unless ENV['LD_LIBRARY_PATH'].nil?
+
+        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])
+        lapack_libs = find_lapack_libs([*base_dirs, *opt_dirs, *lapacke_dirs])
+
+        @@libs = nil
+        if !mkl_libs.value?(nil)
+          open_mkl_libs(mkl_libs)
+          @@libs = mkl_libs.values
+          'mkl'
+        elsif !openblas_libs.value?(nil)
+          open_openblas_libs(openblas_libs)
+          @@libs = openblas_libs.values.uniq
+          'openblas'
+        elsif !atlas_libs.value?(nil)
+          open_atlas_libs(atlas_libs)
+          @@libs = atlas_libs.values.uniq
+          'atlas'
+        elsif !lapack_libs.value?(nil)
+          open_lapack_libs(lapack_libs)
+          @@libs = lapack_libs.values.uniq
+          'lapack'
+        else
+          raise 'cannot find MKL/OpenBLAS/ATLAS/BLAS-LAPACK library'
+        end
+      end
+
+      def detect_library_extension
+        case RbConfig::CONFIG['host_os']
+        when /mswin|msys|mingw|cygwin/
+          'dll'
+        when /darwin|mac os/
+          'dylib'
+        else
+          'so'
+        end
+      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]
+        end
+        Hash[*lib_arr.flatten]
+      end
+
+      def find_mkl_libs(lib_dirs)
+        lib_names = %w[iomp5 mkl_core mkl_intel_thread mkl_intel_lp64]
+        find_libs(lib_names, lib_dirs)
+      end
+
+      def find_openblas_libs(lib_dirs)
+        lib_names = %w[openblas lapacke]
+        openblas_libs = find_libs(lib_names, lib_dirs)
+        openblas_libs[:lapacke] = openblas_libs[:openblas] if openblas_libs[:lapacke].nil?
+        openblas_libs
+      end
+
+      def find_atlas_libs(lib_dirs)
+        lib_names = %w[tatlas atlas satlas cblas lapacke]
+        atlas_libs = find_libs(lib_names, lib_dirs)
+        atlas_libs[:atlas] = atlas_libs[:tatlas] unless atlas_libs[:tatlas].nil?
+        atlas_libs[:atlas] = atlas_libs[:satlas] if atlas_libs[:atlas].nil?
+        atlas_libs[:cblas] = atlas_libs[:atlas] if atlas_libs[:cblas].nil?
+        atlas_libs.delete(:tatlas)
+        atlas_libs.delete(:satlas)
+        atlas_libs
+      end
+
+      def find_lapack_libs(lib_dirs)
+        lib_names = %w[blas cblas lapack lapacke]
+        lapack_libs = find_libs(lib_names, lib_dirs)
+        lapack_libs[:cblas] = lapack_libs[:blas] if lapack_libs[:cblas].nil?
+        lapack_libs
+      end
+
+      def open_mkl_libs(mkl_libs)
+        Fiddle.dlopen(mkl_libs[:iomp5])
+        Fiddle.dlopen(mkl_libs[:mkl_core])
+        Fiddle.dlopen(mkl_libs[:mkl_intel_thread])
+        Fiddle.dlopen(mkl_libs[:mkl_intel_lp64])
+        Numo::Linalg::Blas.dlopen(mkl_libs[:mkl_intel_lp64])
+        Numo::Linalg::Lapack.dlopen(mkl_libs[:mkl_intel_lp64])
+      end
+
+      def open_openblas_libs(openblas_libs)
+        Numo::Linalg::Blas.dlopen(openblas_libs[:openblas])
+        Numo::Linalg::Lapack.dlopen(openblas_libs[:lapacke])
+      end
+
+      def open_atlas_libs(atlas_libs)
+        Fiddle.dlopen(atlas_libs[:atlas])
+        Numo::Linalg::Blas.dlopen(atlas_libs[:cblas])
+        Numo::Linalg::Lapack.dlopen(atlas_libs[:lapacke])
+      end
+
+      def open_lapack_libs(lapack_libs)
+        Fiddle.dlopen(lapack_libs[:blas])
+        Fiddle.dlopen(lapack_libs[:lapack])
+        Numo::Linalg::Blas.dlopen(lapack_libs[:cblas])
+        Numo::Linalg::Lapack.dlopen(lapack_libs[:lapacke])
+      end
+
+      private_class_method :detect_library_extension,
+                           :find_libs, :find_mkl_libs, :find_openblas_libs, :find_atlas_libs, :find_lapack_libs,
+                           :open_mkl_libs, :open_openblas_libs, :open_atlas_libs, :open_lapack_libs
+    end
+  end
+end
+
+Numo::Linalg::Autoloader.load_library

data/lib/numo/linalg/function.rb

@@ -992,17 +992,17 @@ module Numo; module Linalg
     end
   end
 
-  private
-
   # @!visibility private
   def _make_complex_eigvecs(w, vin) # :nodoc:
     v = w.class.cast(vin)
     # broadcast to vin.shape
-    m = (w.imag > 0 | Bit.zeros(*vin.shape)).where
+    m = ((w.imag > 0) | Bit.zeros(*vin.shape)).where
     v[m].imag = vin[m+1]
     v[m+1] = v[m].conj
     v
   end
 
+  private_class_method :_make_complex_eigvecs
+
 end
 end

data/lib/numo/linalg/version.rb

@@ -1,5 +1,5 @@
 module Numo
   module Linalg
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 end

data/numo-linalg.gemspec

@@ -22,5 +22,5 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake", "~> 0"
-  spec.add_runtime_dependency "numo-narray", "~> 0.9.0"
+  spec.add_runtime_dependency "numo-narray", ">= 0.9.0.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: numo-linalg
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Masahiro TANAKA
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-28 00:00:00.000000000 Z
+date: 2018-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -43,16 +43,16 @@ dependencies:
   name: numo-narray
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.9.0.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.9.0.7
 description: Ruby/Numo Linear Algebra library with interface to BLAS/LAPACK.
 email:
 - masa16.tanaka@gmail.com
@@ -73,6 +73,7 @@ files:
 - ext/numo/linalg/blas/gen/cogen.rb
 - ext/numo/linalg/blas/gen/decl.rb
 - ext/numo/linalg/blas/gen/desc.rb
+- ext/numo/linalg/blas/gen/erbln.rb
 - ext/numo/linalg/blas/gen/erbpp2.rb
 - ext/numo/linalg/blas/gen/replace_cblas_h.rb
 - ext/numo/linalg/blas/gen/spec.rb
@@ -135,6 +136,7 @@ files:
 - ext/numo/linalg/lapack/tmpl/trf.c
 - ext/numo/linalg/numo_linalg.h
 - lib/numo/linalg.rb
+- lib/numo/linalg/autoloader.rb
 - lib/numo/linalg/function.rb
 - lib/numo/linalg/linalg.rb
 - lib/numo/linalg/loader.rb