numo-linalg 0.1.1 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a9f783654dbe1c2f8ca4dbeef4030053d8e8c92a99f1ccf0fa0ecd551c90f90
-  data.tar.gz: 46f3558e6bd86db15fb0d3ab9558e1f4e565ca844db500684b9eaac0e6ec57c7
+  metadata.gz: 8315eaaebc86b1e549f1dd1132ba0e25e895c10f6a68b7b461c734bb3fd7612e
+  data.tar.gz: ead727d78cff037a15476917751d0373e08abe1cce5cb14931ea8a82628ab8a1
 SHA512:
-  metadata.gz: f1c478c9f017babd63b40dcea4eeb6ca9222226f680cc6870b01c1f305f54080ab7c035ead34c39d9f70aa431c6b2d9c9ec1be0642f7bab66eea32ee97c39363
-  data.tar.gz: d55a4aa11afffbb51486007df3c80b221a3e90e990e86b76eadc996d560abf8d3e16df62aa25e3f65f050175dca8d45d5b791c1dc4b2b2c3ac66031da0c70c7b
+  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,15 +11,15 @@ 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/linalg/yard/Numo/Linalg.html)
+### [Numo::Linalg API](http://ruby-numo.github.io/numo-linalg/yard/Numo/Linalg.html)
 
 * Matrix and vector products
     * dot, matmul
 * Decomposition
-    * lu\_fact, lu\_inv, lu\_solve, cho\_fact, cho\_inv, cho\_solve
-      qr, svd, svdvals
+    * lu, lu\_fact, lu\_inv, lu\_solve, ldl, cholesky, cho\_fact, cho\_inv, cho\_solve,
+      qr, svd, svdvals, orth, null_space
 * Matrix eigenvalues
     * eig, eigh, eigvals, eigvalsh
 * Norms and other numbers
@@ -29,8 +29,8 @@ This desgin allows you to change backend libraries without re-compiling.
 
 ### Low-level modules
 
-* [Numo::Linalg::Blas](http://ruby-numo.github.io/linalg/yard/Numo/Linalg/Blas.html) - Low-level BLAS functions
-* [Numo::Linalg::Lapack](http://ruby-numo.github.io/linalg/yard/Numo/Linalg/Lapack.html) - Low-level LAPACK functions
+* [Numo::Linalg::Blas](http://ruby-numo.github.io/numo-linalg/yard/Numo/Linalg/Blas.html) - Low-level BLAS functions
+* [Numo::Linalg::Lapack](http://ruby-numo.github.io/numo-linalg/yard/Numo/Linalg/Lapack.html) - Low-level LAPACK functions
 
 ## Installation
 
@@ -78,8 +78,12 @@ require "numo/linalg"
 
 ## Authors
 
-* Masahiro TANAKA
-* Makoto KISHIMOTO
+* Masahiro Tanaka
+* Makoto Kishimoto
+* Atsushi Tatsuma
+
+## Acknowledgments
+
 * This work is partly supported by 2016 Ruby Association Grant.
 
 ## ToDo

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/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/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

@@ -1,35 +1,5 @@
 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 +10,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 =~ /mswin|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 +35,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(__dir__)
 create_makefile('numo/linalg/blas')

data/ext/numo/linalg/blas/numo_blas.h

@@ -31,6 +31,12 @@ extern void numo_cblas_check_func(void **func, const char *name);
 #define SWAP_IFROW(order,a,b,tmp)                               \
     { if ((order)==CblasRowMajor) {(tmp)=(a);(a)=(b);(b)=(tmp);} }
 
+#define SWAP_IFNOTRANS(trans,a,b,tmp)                           \
+    { if ((trans)==CblasNoTrans) {(tmp)=(a);(a)=(b);(b)=(tmp);} }
+
+#define SWAP_IFTRANS(trans,a,b,tmp)                           \
+    { if ((trans)!=CblasNoTrans) {(tmp)=(a);(a)=(b);(b)=(tmp);} }
+
 #define SWAP_IFCOLTR(order,trans,a,b,tmp)                       \
     { if (((order)==CblasRowMajor && (trans)!=CblasNoTrans) ||  \
           ((order)!=CblasRowMajor && (trans)==CblasNoTrans))    \

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

@@ -79,7 +79,7 @@ static void
    opt("beta"),
    !is_ge && opt("side"),
    !is_ge && opt("uplo"),
-   is_ge || is_tr && opt("trans"),
+   (is_ge || is_tr) && opt("trans"),
    opt("order")
  ].select{|x| x}.join("\n  ")
 %>
@@ -143,9 +143,10 @@ static VALUE
     CHECK_DIM_GE(na2,1);
     nx = COL_SIZE(na2);
 #if GE
-    SWAP_IFCOLTR(g.order,g.trans, ma,na, tmp);
+    SWAP_IFCOL(g.order, ma, na, tmp);
     g.m = ma;
     g.n = na;
+    SWAP_IFTRANS(g.trans, ma, na, tmp);
 #else
     CHECK_SQUARE("a",na1);
 #endif

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

@@ -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(__dir__)
 create_makefile('numo/linalg/lapack')

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

@@ -6,6 +6,9 @@ def_id "jobz"
 def_id "jobvl"
 def_id "jobvr"
 def_id "trans"
+def_id "range"
+def_id "il"
+def_id "iu"
 def_id "rcond"
 def_id "itype"
 def_id "norm"
@@ -58,11 +61,13 @@ when /c|z/
   decl "?heevd", "syev"
   decl "?hegv", "sygv"
   decl "?hegvd", "sygv"
+  decl "?hegvx", "sygvx"
 else
   decl "?syev"
   decl "?syevd", "syev"
   decl "?sygv"
   decl "?sygvd", "sygv"
+  decl "?sygvx"
 end
 
 # factorize

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

@@ -124,6 +124,35 @@ numo_lapacke_option_job(VALUE job, char true_char, char false_char)
     return 0;
 }
 
+char
+numo_lapacke_option_range(VALUE job, char true_char, char false_char)
+{
+    char *ptr, c;
+
+    switch(TYPE(job)) {
+    case T_NIL:
+    case T_UNDEF:
+    case T_TRUE:
+        return true_char;
+    case T_FALSE:
+        return false_char;
+    case T_SYMBOL:
+        job = rb_sym2str(job);
+    case T_STRING:
+        ptr = RSTRING_PTR(job);
+        if (RSTRING_LEN(job) > 0) {
+            c = ptr[0];
+            if (c >= 'a' && c <= 'z') {
+                c -= 'a'-'A';
+            }
+            return c;
+        }
+        break;
+    }
+    rb_raise(rb_eArgError,"invalid value for JOB option");
+    return 0;
+}
+
 char
 numo_lapacke_option_trans(VALUE trans)
 {
@@ -295,11 +324,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 +362,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/lapack/numo_lapack.h

@@ -15,6 +15,9 @@ extern int numo_lapacke_option_order(VALUE order);
 #define option_job numo_lapacke_option_job
 extern char numo_lapacke_option_job(VALUE job, char true_char, char false_char);
 
+#define option_range numo_lapacke_option_range
+extern char numo_lapacke_option_range(VALUE range, char true_char, char false_char);
+
 #define option_trans numo_lapacke_option_trans
 extern char numo_lapacke_option_trans(VALUE trans);
 

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

@@ -30,7 +30,7 @@ static void
     SWAP_IFCOL(g->order,m,n);
     lda = NDL_STEP(lp,0) / sizeof(dtype);
 
-    printf("order=%d m=%d n=%d k=%d lda=%d \n",g->order,m,n,k,lda);
+    //printf("order=%d m=%d n=%d k=%d lda=%d \n",g->order,m,n,k,lda);
 
     *info = (*func_p)(g->order, m, n, k, a, lda, tau);
     CHECK_ERROR(*info);