numo-linalg 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8315eaaebc86b1e549f1dd1132ba0e25e895c10f6a68b7b461c734bb3fd7612e
-  data.tar.gz: ead727d78cff037a15476917751d0373e08abe1cce5cb14931ea8a82628ab8a1
+  metadata.gz: a3c8bcc6ac3a9e0e97953992655b299b74a737aa5e2e208fae45144cfdaa09d8
+  data.tar.gz: 0460e3eb44c6f67e22d1171e9929ebf949c69ddb6f9a9355894944006ffd7366
 SHA512:
-  metadata.gz: a228a21cc9e6cc3b44f7c11b66b1dcea76dbdc22e51b09e35ca62118a721dea4d4a6dcc729a0603f0aec64411d2c9c72d63ff922a2bb57ea0d93b5363bdab50b
-  data.tar.gz: d9651310d52d9f1c1e41caad01bb8f706fe1a631557eaed076cd355702a1ef1ea55e88fe9b2e29ba95476f55569410c5cc737230b67e0843b623844e61f3ece8
+  metadata.gz: 918dc720d8d187174bf1bc04b88567b2cc6268c961b53187060ce25ff20e1b38050a58e3ed29d0993a1c4a1637193e0891272ee8628a19b7883b7136905b581c
+  data.tar.gz: a2eeefea7aca430c1ba6dc4d777fc87a5c12e22cd27ad5d9a53de0ce7a19b4e2e4f67add3cc1d45cb8989ea2073fb87cc85c6cfeb5c4df1a346de258a47f947c

data/lib/numo/linalg/autoloader.rb

@@ -64,9 +64,14 @@ module Numo
       end
 
       def detect_library_extension
-        case RbConfig::CONFIG['host_os']
-        when /mswin|msys|mingw|cygwin/
-          'dll'
+        # Ruby >= 2.5 provides SOEXT in rbconfig
+        so_ext = RbConfig::CONFIG["SOEXT"]
+        return so_ext if so_ext
+
+        return 'dll' if windows?
+
+        # For Ruby < 2.5, we use RUBY_PLATFORM
+        case RUBY_PLATFORM
         when /darwin|mac os/
           'dylib'
         else
@@ -74,6 +79,15 @@ module Numo
         end
       end
 
+      def windows?
+        case RUBY_PLATFORM
+        when /mswin|msys|mingw|cygwin/
+          true
+        else
+          false
+        end
+      end
+
       def select_dirs(dirs)
         dirs.select!{|d| Dir.exist?(d)}
       end
@@ -82,8 +96,36 @@ module Numo
         lib_ext = detect_library_extension
         lib_arr = lib_names.map do |l|
           x = nil
-          lib_dirs.each do |d|
-            break if x = Dir.glob("#{d}/lib#{l}{,64}.#{lib_ext}{,.*}").last
+          if windows?
+            # On Windows, try to search the default DLL search path at first
+            [
+              "lib#{l}.#{lib_ext}",
+              "lib#{l}64.#{lib_ext}"
+            ].each do |filename|
+              begin
+                Fiddle.dlopen(filename).close
+              rescue Fiddle::DLError
+                x = nil
+              else
+                x = filename
+                break
+              end
+            end
+          end
+          if x.nil?
+            # Search in the candidate directories
+            lib_dirs.find do |d|
+              x = Dir.glob("#{d}/lib#{l}{,64}.#{lib_ext}{,.*}").find do |lib|
+                begin
+                  Fiddle.dlopen(lib).close
+                rescue Fiddle::DLError
+                  false
+                else
+                  true
+                end
+              end
+              break if x
+            end
           end
           [l.to_sym, x]
         end

data/lib/numo/linalg/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: numo-linalg
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Masahiro TANAKA
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-27 00:00:00.000000000 Z
+date: 2021-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -228,7 +228,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Ruby/Numo Linear Algebra library with BLAS/LAPACK