numo-tiny_linalg 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd5b3d90b9c0bc323420f2eed5363490ec7c2ec4a3b0950573f54f234d534eaf
-  data.tar.gz: cd0a71621d1e3e935faba0a40036b3950c0f6ac32a74cdaad46b0e313b5dfa2f
+  metadata.gz: a1bff84bdd946b37325d2561e03141fec2ac75ac363e2ac640fc5d10d7f41950
+  data.tar.gz: 141adbf0789217c8d77c934e545ab8fae9a4c5178a94d6f4716f4a62c3106118
 SHA512:
-  metadata.gz: f904406ce9c883d59d93afc061bfc65c96073dc9660cb65e6eefa97e2be32cc8c79ac26970a8b181cd3acbdbd412cf97c08153017956c4cc4f2b29bf28bcda46
-  data.tar.gz: 8f3ee9b0e0e9c3789f61148db03d43c245dab66fc4cb428488cbe668dad00b0d7fb73ef825e5dc0c5772ba817d41bb90d5fce843ece1f1adf6fe81857b9917ff
+  metadata.gz: 973e0075155ea849a9a7cc681d3e59242d19e6d649c8210329fdc21dae2aa07ac79495c4a32c56c580d819e37504f7064716f261aaa3d76c1ab2f5b42d414dfd
+  data.tar.gz: f2a9f4d7575e89f6a740955f74e13692fbd04844072ef0b7c519ce2ac4ce21bf3bdd32f72434c0dc0c1c6b358a0cbe279f101afdff139702b3574e9ab1d014c0

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 ## [Unreleased]
 
+## [[0.3.1](https://github.com/yoshoku/numo-tiny_linalg/compare/v0.3.0...v0.3.1)] - 2023-08-15
+- Support automatic build of OpenBLAS on Windows.
+  - The author does not have a Windows PC. It will probably work.
+- Add OPENBLAS_VERSION constant to TinyLinalg.
+
 ## [[0.3.0](https://github.com/yoshoku/numo-tiny_linalg/compare/v0.2.0...v0.3.0)] - 2023-08-13
 - Add cholesky and cho_solve module functions to TinyLinalg.
 

data/ext/numo/tiny_linalg/extconf.rb

@@ -18,7 +18,9 @@ end
 
 abort 'numo/narray.h is not found' unless have_header('numo/narray.h')
 
-if RUBY_PLATFORM.match?(/mswin|cygwin|mingw/)
+on_windows = RUBY_PLATFORM.match?(/mswin|cygwin|mingw/)
+
+if on_windows
   $LOAD_PATH.each do |lp|
     if File.exist?(File.join(lp, 'numo/libnarray.a'))
       $LDFLAGS = "-L#{lp}/numo #{$LDFLAGS}"
@@ -31,13 +33,6 @@ end
 abort 'libstdc++ is not found.' unless have_library('stdc++')
 $CXXFLAGS << ' -std=c++11'
 
-# NOTE: Accelerate framework does not support LAPACKE.
-# use_accelerate = false
-# if RUBY_PLATFORM.include?('darwin') && have_framework('Accelerate')
-#   $CFLAGS << ' -DTINYLINALG_USE_ACCELERATE'
-#   use_accelerate = true
-# end
-
 build_openblas = false
 unless find_library('openblas', 'LAPACKE_dsyevr')
   build_openblas = true unless have_library('openblas')
@@ -51,6 +46,7 @@ if build_openblas
   warn 'BLAS and LAPACKE APIs are not found. Downloading and Building OpenBLAS...'
 
   VENDOR_DIR = File.expand_path("#{__dir__}/../../../vendor")
+  TINYLINALG_DIR = File.expand_path("#{__dir__}/../../../lib/numo/tiny_linalg")
   OPENBLAS_VER = '0.3.23'
   OPENBLAS_KEY = '115634b39007de71eb7e75cf7591dfb2'
   OPENBLAS_URI = "https://github.com/xianyi/OpenBLAS/archive/v#{OPENBLAS_VER}.tar.gz"
@@ -82,18 +78,19 @@ if build_openblas
       File.open("#{VENDOR_DIR}/tmp/openblas.log", 'a') { |f| f.puts(insstdout) }
       abort("Failed to install OpenBLAS. Check the openblas.log file for more details: #{VENDOR_DIR}/tmp/openblas.log") unless insstatus.success?
 
+      FileUtils.cp("#{VENDOR_DIR}/lib/libopenblas.a", TINYLINALG_DIR) if on_windows
+
       FileUtils.touch("#{VENDOR_DIR}/installed_#{OPENBLAS_VER}")
     end
   end
 
-  abort('libopenblas is not found.') unless find_library('openblas', nil, "#{VENDOR_DIR}/lib")
+  libopenblas_dir = on_windows ? TINYLINALG_DIR : "#{VENDOR_DIR}/lib"
+  abort('libopenblas is not found.') unless find_library('openblas', nil, libopenblas_dir)
   abort('openblas_config.h is not found.') unless find_header('openblas_config.h', nil, "#{VENDOR_DIR}/include")
   abort('cblas.h is not found.') unless find_header('cblas.h', nil, "#{VENDOR_DIR}/include")
   abort('lapacke.h is not found.') unless find_header('lapacke.h', nil, "#{VENDOR_DIR}/include")
 end
 
-$CFLAGS << ' -DNUMO_TINY_LINALG_USE_OPENBLAS'
-
 if RUBY_PLATFORM.include?('darwin') && Gem::Version.new('3.1.0') <= Gem::Version.new(RUBY_VERSION) &&
    try_link('int main(void){return 0;}', '-Wl,-undefined,dynamic_lookup')
   $LDFLAGS << ' -Wl,-undefined,dynamic_lookup'

data/ext/numo/tiny_linalg/tiny_linalg.cpp

@@ -248,6 +248,9 @@ extern "C" void Init_tiny_linalg(void) {
    */
   rb_mTinyLinalgLapack = rb_define_module_under(rb_mTinyLinalg, "Lapack");
 
+  /* The version of OpenBLAS used in background library. */
+  rb_define_const(rb_mTinyLinalg, "OPENBLAS_VERSION", rb_str_new_cstr(OPENBLAS_VERSION));
+
   /**
    * Returns BLAS char ([sdcz]) defined by data-type of arguments.
    *

data/ext/numo/tiny_linalg/tiny_linalg.hpp

@@ -33,6 +33,7 @@
 
 #include <cblas.h>
 #include <lapacke.h>
+#include <openblas_config.h>
 
 #include <string>
 

data/lib/numo/tiny_linalg/version.rb

@@ -5,6 +5,6 @@ module Numo
   # Numo::TinyLinalg is a subset library from Numo::Linalg consisting only of methods used in Machine Learning algorithms.
   module TinyLinalg
     # The version of Numo::TinyLinalg you install.
-    VERSION = '0.3.0'
+    VERSION = '0.3.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: numo-tiny_linalg
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - yoshoku
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-08-13 00:00:00.000000000 Z
+date: 2023-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: numo-narray