numo-blis 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 971c5622cc488550e5121b2e5154ddc00a7bbf278af99ea9abb91e277a0bacb7
-  data.tar.gz: d839070587642f51b3093601db00bcfb8ac29a953318c1b85558be64222c4b6e
+  metadata.gz: '09533d7e6a34154affbbfbb3bf8788c25a9eb9c5711dcc68aaf13b457c18986f'
+  data.tar.gz: 2856a6a930c539af6f134b598f08d54ee53da8b40bbe524d6deab44b5dacbd7d
 SHA512:
-  metadata.gz: aba94ef6eeed63d75af97281bff116635beb6d5121c87d0e6d8ccff5c7b48c2b6519e4a412b16be31471c1423024046f9283147f5ecbcbc1bc67e994b39613cf
-  data.tar.gz: e4870f8162f8a57e9fb3272935b9c9e617658974945adb5df8efbdbeae0cf43bb73a68b7e882587f5c02a616f2b104b2a9effdd7b3892bf85bfe617eb772e5b7
+  metadata.gz: 2035b24379d38daa06e1b3ecd071f5926d00f0673a9190d2fc42d0f58464a62a7aea8fbc347c8ab71534cad02e05a54a002bfda36e5fc46b07b78108bc216adb
+  data.tar.gz: '0699449615647ef228361d6d2e8e73cb7f20bad8cba35a7d62bbd712d38c901fa54c7efb6702daba9f1af17538b7e6b2e831d76f1f95da81b6f9d54edcbce21a'

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 ## [Unreleased]
 
+## [0.2.0] - 2021-07-31
+
+- Added enable-threading option to specify the threding method of BLIS.
+
+  ```
+  $ gem install numo-blis -- --enable-threading=openmp
+  ```
+
+- Changed to detect threading method automatically when the enable-threading option is not given.
+
 ## [0.1.0] - 2021-07-17
 
 - Initial release

data/ext/numo/blis/extconf.rb

@@ -1,4 +1,3 @@
-# frozen-string-literal: true
 
 require 'etc'
 require 'fileutils'
@@ -8,6 +7,8 @@ require 'open3'
 require 'rbconfig'
 require 'rubygems/package'
 
+ENABLE_THREADING_ARG = arg_config('--enable-threading')
+
 VENDOR_DIR = File.expand_path("#{__dir__}/../../../vendor")
 SOEXT = RbConfig::CONFIG['SOEXT'] || case RUBY_PLATFORM
                                      when /mswin|msys|mingw|cygwin/
@@ -26,13 +27,28 @@ BLIS_TGZ = "#{VENDOR_DIR}/tmp/blis-#{BLIS_VERSION}.tgz"
 LAPACK_TGZ = "#{VENDOR_DIR}/tmp/lapack-#{LAPACK_VERSION}.tgz"
 BLIS_KEY = 'ce5998fccfac88153f1e52d6497020529a3b5217'
 LAPACK_KEY = '4a9384523bf236c83568884e8c62d9517e41ac42'
+RB_CC = "'#{RbConfig::expand('$(CC)')}'"
+RB_CXX = "'#{RbConfig::expand('$(CPP)')}'"
+
+BLIS_THREADING = if ['openmp', 'pthreads', 'no'].include?(ENABLE_THREADING_ARG)
+                   ENABLE_THREADING_ARG
+                 elsif try_compile('#include <omp.h>')
+                   'openmp'
+                 elsif try_complie('#include <pthread.h>')
+                   'pthreads'
+                 else
+                   'no'
+                 end
 BLIS_CONFIGURE_OPTIONS = ['--enable-cblas',
-                          '--enable-threading=pthreads',
+                          "--enable-threading=#{BLIS_THREADING}",
                           "--prefix=#{VENDOR_DIR}",
+                          "CC=#{RB_CC}",
+                          "CXX=#{RB_CXX}",
                           'auto'].join(' ')
 LAPACK_CMAKE_OPTIONS = ["-DBLAS_LIBRARIES='#{VENDOR_DIR}/lib/libblis.#{SOEXT}'",
                         '-DLAPACKE=ON',
                         '-DBUILD_SHARED_LIBS=ON',
+                        '-DCMAKE_BUILD_TYPE=Release',
                         "-DCMAKE_INSTALL_PREFIX='#{VENDOR_DIR}'"].join(' ')
 
 unless File.exist?("#{VENDOR_DIR}/installed_blis-#{BLIS_VERSION}")

data/lib/numo/blis/version.rb

@@ -5,6 +5,6 @@ module Numo
   # Numo::BLIS loads Numo::NArray and Linalg with BLIS used as backend library.
   module BLIS
     # The version of Numo::BLIS you install.
-    VERSION = '0.1.0'
+    VERSION = '0.2.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: numo-blis
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - yoshoku
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-07-17 00:00:00.000000000 Z
+date: 2021-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: numo-linalg
@@ -72,7 +72,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: Numo::BLIS downloads and builds BLIS during installation and uses that as