numo-linalg 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a9f783654dbe1c2f8ca4dbeef4030053d8e8c92a99f1ccf0fa0ecd551c90f90
-  data.tar.gz: 46f3558e6bd86db15fb0d3ab9558e1f4e565ca844db500684b9eaac0e6ec57c7
+  metadata.gz: 611dd9ee204102a1688b5d199b95b5376d32239b04dfcf69a605da54599a9310
+  data.tar.gz: d999af4188a239e9a78b7f071d850f2b11bf822c1c0237c592c6ebe4979b278d
 SHA512:
-  metadata.gz: f1c478c9f017babd63b40dcea4eeb6ca9222226f680cc6870b01c1f305f54080ab7c035ead34c39d9f70aa431c6b2d9c9ec1be0642f7bab66eea32ee97c39363
-  data.tar.gz: d55a4aa11afffbb51486007df3c80b221a3e90e990e86b76eadc996d560abf8d3e16df62aa25e3f65f050175dca8d45d5b791c1dc4b2b2c3ac66031da0c70c7b
+  metadata.gz: 7da7684a72653a7718de5ff51a99ed14ca0dc3770cae735139487cf56ef2610f292cf3e970abd681320d8a1847664dcb7d6e9ac2c936867abb2cae1154bdb053
+  data.tar.gz: 70bb3e22d41fee16e953b53467b709cdd96bd80adceb526123df941335782054823bb84a9d703ca45e73e88c0ad34b7cbf90699a53cc7e7dcb1277251e7fa0e6

data/ext/numo/linalg/blas/blas.c

@@ -259,11 +259,17 @@ numo_cblas_check_func(void **func, const char *name)
         s = alloca(strlen(blas_prefix)+strlen(name)+1);
         strcpy(s,blas_prefix);
         strcat(s,name);
+#if defined(HAVE_DLFCN_H)
         dlerror();
+#endif
         *func = dlsym(blas_handle, s);
-        error = dlerror();
-        if (error != NULL) {
-            rb_raise(rb_eRuntimeError, "%s", error);
+#if defined(HAVE_DLFCN_H)
+        if ((error = dlerror()) != 0) {
+            func = 0;
+        }
+#endif
+        if ( !func ) {
+            rb_raise(rb_eRuntimeError, "unknown symbol \"%s\"", s);
         }
     }
 }
@@ -291,14 +297,22 @@ blas_s_dlopen(int argc, VALUE *argv, VALUE mod)
     if (i==2) {
         f = NUM2INT(flag);
     } else {
-        f = RTLD_LAZY | RTLD_LOCAL;
+        f = RTLD_LAZY;
     }
+#if defined(HAVE_DLFCN_H)
     dlerror();
+#endif
     handle = dlopen(StringValueCStr(lib), f);
-    error = dlerror();
-    if (error != NULL) {
+#if defined(HAVE_DLFCN_H)
+    if ( !handle && (error = dlerror()) ) {
         rb_raise(rb_eRuntimeError, "%s", error);
     }
+#else
+    if ( !handle ) {
+        error = dlerror();
+        rb_raise(rb_eRuntimeError, "%s", error);
+    }
+#endif
     blas_handle = handle;
     return Qnil;
 }

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

@@ -1,35 +1,6 @@
 require 'mkmf'
 require 'numo/narray'
-require 'erb'
-
-ldirs = [
- dir_config("mkl")[1],
- dir_config("openblas")[1],
- dir_config("atlas")[1],
- dir_config("blas")[1],
- dir_config("lapack")[1],
-]
-bked = with_config("backend")
-
-FileUtils.mkdir_p "lib"
-open("lib/site_conf.rb","w"){|f| f.write "
-module Numo
-  module Linalg
-    BACKEND = #{bked.inspect}
-    MKL_LIBPATH = #{ldirs[0].inspect}
-    OPENBLAS_LIBPATH = #{ldirs[1].inspect}
-    ATLAS_LIBPATH = #{ldirs[2].inspect}
-    BLAS_LIBPATH = #{ldirs[3].inspect}
-    LAPACK_LIBPATH = #{ldirs[4].inspect}
-  end
-end"}
-
-$LOAD_PATH.each do |x|
-  if File.exist? File.join(x,'numo/numo/narray.h')
-    $INCFLAGS = "-I#{x}/numo " + $INCFLAGS
-    break
-  end
-end
+require_relative '../mkmf_linalg'
 
 srcs = %w(
 blas
@@ -40,13 +11,24 @@ blas_z
 )
 $objs = srcs.collect{|i| i+".o"}
 
-if !have_header('numo/narray.h')
+dir_config("narray")
+
+find_narray_h
+if !have_header("numo/narray.h")
   puts "
   Header numo/narray.h was not found. Give pathname as follows:
   % ruby extconf.rb --with-narray-include=narray_h_dir"
   exit(1)
 end
 
+if RUBY_PLATFORM =~ /cygwin|mingw/
+  find_libnarray_a
+  unless have_library("narray","nary_new")
+    puts "libnarray.a not found"
+    exit(1)
+  end
+end
+
 if have_header("dlfcn.h")
   exit(1) unless have_library("dl")
   exit(1) unless have_func("dlopen")
@@ -54,14 +36,6 @@ elsif have_header("windows.h")
   exit(1) unless have_func("LoadLibrary")
 end
 
-dep_path = File.join(__dir__, "depend")
-File.open(dep_path, "w") do |dep|
-  dep_erb_path = File.join(__dir__, "depend.erb")
-  File.open(dep_erb_path, "r") do |dep_erb|
-    erb = ERB.new(dep_erb.read)
-    erb.filename = dep_erb_path
-    dep.print(erb.result)
-  end
-end
-
+create_site_conf
+create_depend
 create_makefile('numo/linalg/blas')

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

@@ -1,13 +1,6 @@
 require 'mkmf'
 require 'numo/narray'
-require 'erb'
-
-$LOAD_PATH.each do |x|
-  if File.exist? File.join(x,'numo/numo/narray.h')
-    $INCFLAGS = "-I#{x}/numo " + $INCFLAGS
-    break
-  end
-end
+require_relative '../mkmf_linalg'
 
 srcs = %w(
 lapack
@@ -18,13 +11,24 @@ lapack_z
 )
 $objs = srcs.collect{|i| i+".o"}
 
-if !have_header('numo/narray.h')
+dir_config("narray")
+
+find_narray_h
+if !have_header("numo/narray.h")
   puts "
   Header numo/narray.h was not found. Give pathname as follows:
   % ruby extconf.rb --with-narray-include=narray_h_dir"
   exit(1)
 end
 
+if RUBY_PLATFORM =~ /cygwin|mingw/
+  find_libnarray_a
+  unless have_library("narray","nary_new")
+    puts "libnarray.a not found"
+    exit(1)
+  end
+end
+
 if have_header("dlfcn.h")
   exit(1) unless have_library("dl")
   exit(1) unless have_func("dlopen")
@@ -32,14 +36,5 @@ elsif have_header("windows.h")
   exit(1) unless have_func("LoadLibrary")
 end
 
-dep_path = File.join(__dir__, "depend")
-File.open(dep_path, "w") do |dep|
-  dep_erb_path = File.join(__dir__, "depend.erb")
-  File.open(dep_erb_path, "r") do |dep_erb|
-    erb = ERB.new(dep_erb.read)
-    erb.filename = dep_erb_path
-    dep.print(erb.result)
-  end
-end
-
+create_depend
 create_makefile('numo/linalg/lapack')

data/ext/numo/linalg/lapack/lapack.c

@@ -295,11 +295,17 @@ numo_lapacke_check_func(void **func, const char *name)
         s = alloca(strlen(lapack_prefix)+strlen(name)+1);
         strcpy(s,lapack_prefix);
         strcat(s,name);
+#if defined(HAVE_DLFCN_H)
         dlerror();
+#endif
         *func = dlsym(lapack_handle, s);
-        error = dlerror();
-        if (error != NULL) {
-            rb_raise(rb_eRuntimeError, "%s", error);
+#if defined(HAVE_DLFCN_H)
+        if ((error = dlerror()) != 0) {
+            func = 0;
+        }
+#endif
+        if ( !func ) {
+            rb_raise(rb_eRuntimeError, "unknown symbol \"%s\"", s);
         }
     }
 }
@@ -327,14 +333,22 @@ lapack_s_dlopen(int argc, VALUE *argv, VALUE mod)
     if (i==2) {
         f = NUM2INT(flag);
     } else {
-        f = RTLD_LAZY | RTLD_LOCAL;
+        f = RTLD_LAZY;
     }
+#if defined(HAVE_DLFCN_H)
     dlerror();
+#endif
     handle = dlopen(StringValueCStr(lib), f);
-    error = dlerror();
-    if (error != NULL) {
+#if defined(HAVE_DLFCN_H)
+    if ( !handle && (error = dlerror()) ) {
         rb_raise(rb_eRuntimeError, "%s", error);
     }
+#else
+    if ( !handle ) {
+        error = dlerror();
+        rb_raise(rb_eRuntimeError, "%s", error);
+    }
+#endif
     lapack_handle = handle;
     return Qnil;
 }

data/ext/numo/linalg/mkmf_linalg.rb

@@ -0,0 +1,101 @@
+require 'mkmf'
+
+def create_site_conf
+  ldirs = [
+    dir_config("mkl")[1],
+    dir_config("openblas")[1],
+    dir_config("atlas")[1],
+    dir_config("blas")[1],
+    dir_config("lapack")[1],
+  ]
+  bked = with_config("backend")
+
+  require 'fiddle'
+
+  message "creating lib/site_conf.rb\n"
+
+  FileUtils.mkdir_p "lib"
+
+  ext = detect_library_extension
+  need_version = false
+  if ext == 'so'
+    begin
+      Fiddle.dlopen "libm.so"
+    rescue
+      (5..7).each do |i|
+        begin
+          Fiddle.dlopen "libm.so.#{i}"
+          need_version = true
+          break
+        rescue
+        end
+      end
+      if !need_version
+        raise "failed to check whether dynamically linked shared object needs version suffix"
+      end
+    end
+  end
+
+  open("lib/site_conf.rb","w"){|f| f.write "
+module Numo
+  module Linalg
+
+    BACKEND = #{bked.inspect}
+    MKL_LIBPATH = #{ldirs[0].inspect}
+    OPENBLAS_LIBPATH = #{ldirs[1].inspect}
+    ATLAS_LIBPATH = #{ldirs[2].inspect}
+    BLAS_LIBPATH = #{ldirs[3].inspect}
+    LAPACK_LIBPATH = #{ldirs[4].inspect}
+
+    module Loader
+      EXT = '#{ext}'
+      NEED_VERSION_SUFFIX = #{need_version}
+    end
+
+  end
+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_narray_h
+  $LOAD_PATH.each do |x|
+    if File.exist? File.join(x,'numo/numo/narray.h')
+      $INCFLAGS = "-I#{x}/numo " + $INCFLAGS
+      break
+    end
+  end
+end
+
+def find_libnarray_a
+  $LOAD_PATH.each do |x|
+    if File.exist? File.join(x,'numo/libnarray.a')
+      $LDFLAGS = "-L#{x}/numo " + $LDFLAGS
+      break
+    end
+  end
+end
+
+def create_depend
+  require 'erb'
+  message "creating depend\n"
+  dep_path = File.join(Dir.pwd, "depend")
+  File.open(dep_path, "w") do |dep|
+    dep_erb_path = File.join(Dir.pwd, "depend.erb")
+    File.open(dep_erb_path, "r") do |dep_erb|
+      erb = ERB.new(dep_erb.read)
+      erb.filename = dep_erb_path
+      dep.print(erb.result)
+    end
+  end
+end

data/lib/numo/linalg/loader.rb

@@ -12,32 +12,48 @@ module Numo
         @@libs
       end
 
-      def load_mkl(path=nil,exc:true)
-        a = case path
-            when String; [path]
-            when Array ;  path
-            when NilClass; [MKL_LIBPATH,""].compact
-            else raise ArgumentError,"invalid path"
+      def dlopen(recvr,base,dir=nil,ver=nil)
+        if dir && !dir.empty?
+          base = File.join(dir,base)
+        end
+        path = base+".#{EXT}"
+        if NEED_VERSION_SUFFIX
+          if ver
+            path += ".#{ver}"
+          end
+          recvr.send(:dlopen,path)
+        else
+          begin
+            recvr.send(:dlopen,path)
+          rescue => e
+            if ver
+              path += ".#{ver}"
+              recvr.send(:dlopen,path)
+            else
+              raise e
             end
-        a.each do |d|
+          end
+        end
+        path
+      end
+      private :dlopen
+
+      def load_mkl(*dirs,exc:true)
+        if dirs.empty?
+          dirs = [MKL_LIBPATH,""].compact
+        end
+        dirs.each do |d|
           if d.empty?
-            f_iomp5 = "libiomp5.so"
-            f_mkl_core = "libmkl_core.so"
-            f_intel_thread = "libmkl_intel_thread.so"
-            f_intel_lp64 = "libmkl_intel_lp64.so"
+            d = e = nil
           else
             e = d.sub(/\/mkl\//, "/")
-            f_iomp5 = File.join(e,"libiomp5.so")
-            f_mkl_core = File.join(d,"libmkl_core.so")
-            f_intel_thread = File.join(d,"libmkl_intel_thread.so")
-            f_intel_lp64 = File.join(d,"libmkl_intel_lp64.so")
           end
           begin
-            Fiddle.dlopen(f_iomp5)
-            Fiddle.dlopen(f_mkl_core)
-            Fiddle.dlopen(f_intel_thread)
-            Blas.dlopen(f_intel_lp64)
-            Lapack.dlopen(f_intel_lp64)
+            f_iomp5 = dlopen(Fiddle,"libiomp5",e)
+            f_mkl_core = dlopen(Fiddle,"libmkl_core",d)
+            f_intel_thread = dlopen(Fiddle,"libmkl_intel_thread",d)
+            f_intel_lp64 = dlopen(Blas,"libmkl_intel_lp64",d)
+            f_intel_lp64 = dlopen(Lapack,"libmkl_intel_lp64",d)
             @@libs = [ f_iomp5, f_mkl_core, f_intel_thread, f_intel_lp64 ]
             if $DEBUG
               $stderr.puts "Numo::Linalg: use #{f_intel_lp64}"
@@ -52,20 +68,24 @@ module Numo
         false
       end
 
-      def load_openblas(path=nil,exc:true)
-        a = case path
-            when String; [path]
-            when Array ;  path
-            when NilClass; [OPENBLAS_LIBPATH,""].compact
-            else raise ArgumentError,"invalid path"
-            end
-        a.each do |d|
-          %w[libopenblaso.so libopenblasp.so libopenblas.so].each do |f|
-            f = File.join(d,f) if !d.empty?
+      def load_openblas(*dirs,exc:true)
+        if dirs.empty?
+          dirs = [OPENBLAS_LIBPATH,""].compact
+        end
+        dirs.each do |d|
+          %w[ libopenblaso
+              libopenblasp
+              libopenblas  ].each do |f|
             begin
-              Blas.dlopen(f)
-              Lapack.dlopen(f)
-              @@libs = [ f ]
+              f_openblas = dlopen(Blas,f,d,0)
+              f_openblas = dlopen(Fiddle,f,d,0)
+              f_lapacke = nil
+              begin
+                f_lapacke = dlopen(Lapack,"liblapacke",d,3)
+              rescue
+                f_openblas = dlopen(Lapack,f,d,0)
+              end
+              @@libs = [ f_openblas, f_lapacke ].compact
               if $DEBUG
                 $stderr.puts "Numo::Linalg: use #{f}"
               end
@@ -80,24 +100,19 @@ module Numo
         false
       end
 
-      def load_atlas(path=nil,exc:true)
-        a = case path
-            when String; [path]
-            when Array ;  path
-            when NilClass; [ATLAS_LIBPATH,""].compact
-            else raise ArgumentError,"invalid path"
-            end
-        a.each do |d|
-          %w[libtatlas.so libatlas.so libsatlas.so].each do |f|
-            f = File.join(d,f) if !d.empty?
+      def load_atlas(*dirs,exc:true)
+        if dirs.empty?
+          dirs = [ATLAS_LIBPATH,""].compact
+        end
+        dirs.each do |d|
+          %w[ libtatlas
+              libatlas
+              libsatlas ].each do |f|
             begin
-              Fiddle.dlopen(f)
-              Blas.dlopen(f)
-              l = LAPACK_LIBPATH
-              e = "liblapacke.so"
-              e = File.join(l,e) if l && !l.empty?
-              Lapack.dlopen(e)
-              @@libs = [ f, e ]
+              f_atlas = dlopen(Fiddle,f,d,3)
+              f_atlas = dlopen(Blas,f,d,3)
+              f_lapacke = dlopen(Lapack,"liblapacke",LAPACK_LIBPATH,3)
+              @@libs = [ f_atlas, f_lapacke ]
               if $DEBUG
                 $stderr.puts "Numo::Linalg: use #{f}"
               end
@@ -112,34 +127,20 @@ module Numo
         false
       end
 
-      def load_lapack(path=nil,exc:true)
-        a = case path
-            when String; [[path,path]]
-            when Array ;  [path]
-            when NilClass
-              b = BLAS_LIBPATH || LAPACK_LIBPATH
-              l = LAPACK_LIBPATH || BLAS_LIBPATH
-              (b ? [[b,l]] : []) + ["",""]
-            else raise ArgumentError,"invalid path"
-            end
-        a.each do |arg|
+      def load_lapack(*dirs,exc:true)
+        if dirs.empty?
+          b = BLAS_LIBPATH || LAPACK_LIBPATH
+          l = LAPACK_LIBPATH || BLAS_LIBPATH
+          dirs = (b ? [[b,l]] : []) + ["",""]
+        end
+        dirs.each do |arg|
           b,l = *arg
-          if b.empty?
-            f_blas = "libblas.so"
-            f_cblas = "libcblas.so"
-            f_lapack = "liblapack.so"
-            f_lapacke = "liblapacke.so"
-          else
-            f_blas = File.join(b,"libblas.so")
-            f_cblas = File.join(b,"libcblas.so")
-            f_lapack = File.join(l,"liblapack.so")
-            f_lapacke = File.join(l,"liblapacke.so")
-          end
+          l = b if l.nil?
           begin
-            Fiddle.dlopen(f_blas)
-            Fiddle.dlopen(f_lapack)
-            Blas.dlopen(f_cblas)
-            Lapack.dlopen(f_lapacke)
+            f_blas = dlopen(Fiddle,"libblas",b,3)
+            f_lapack = dlopen(Fiddle,"liblapack",l,3)
+            f_cblas = dlopen(Blas,"libcblas",b,3)
+            f_lapacke = dlopen(Lapack,"liblapacke",l,3)
             @@libs = [ f_blas, f_lapack, f_cblas, f_lapacke ]
             if $DEBUG
               $stderr.puts "Numo::Linalg: use #{f_blas} and #{f_lapack}"

data/lib/numo/linalg/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: numo-linalg
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Masahiro TANAKA
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-30 00:00:00.000000000 Z
+date: 2018-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -134,6 +134,7 @@ files:
 - ext/numo/linalg/lapack/tmpl/syev.c
 - ext/numo/linalg/lapack/tmpl/sygv.c
 - ext/numo/linalg/lapack/tmpl/trf.c
+- ext/numo/linalg/mkmf_linalg.rb
 - ext/numo/linalg/numo_linalg.h
 - lib/numo/linalg.rb
 - lib/numo/linalg/autoloader.rb