numo-blis 0.2.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '09533d7e6a34154affbbfbb3bf8788c25a9eb9c5711dcc68aaf13b457c18986f'
-  data.tar.gz: 2856a6a930c539af6f134b598f08d54ee53da8b40bbe524d6deab44b5dacbd7d
+  metadata.gz: 6cc4fbd4df419308bfbd867616a494c3030718fe7552d43e0812fcb5f339c567
+  data.tar.gz: 747171dc415ea8b12d50ce112c896aaf4e93a4616648ec34b4542819def4e614
 SHA512:
-  metadata.gz: 2035b24379d38daa06e1b3ecd071f5926d00f0673a9190d2fc42d0f58464a62a7aea8fbc347c8ab71534cad02e05a54a002bfda36e5fc46b07b78108bc216adb
-  data.tar.gz: '0699449615647ef228361d6d2e8e73cb7f20bad8cba35a7d62bbd712d38c901fa54c7efb6702daba9f1af17538b7e6b2e831d76f1f95da81b6f9d54edcbce21a'
+  metadata.gz: 7459dd80eaeb0ed69d51da6954b62276e9ca03f8029175157bc8bc3c836541cef27a1528325a5800224920007821117828e33fec62f94127ed767baa54b2be91
+  data.tar.gz: b2bcf7a51132f23fe5dc9c154523658777efa785fbde8f95579ee976f34039864b3c5fa0b2cf011b789bd5a3626c93e8eb44756c347230b86190d8d5c2a82c34

data/CHANGELOG.md

@@ -1,4 +1,16 @@
-## [Unreleased]
+## [0.4.1] - 2022-07-31
+
+- Refactor codes and configs with RuboCop.
+
+## [0.4.0] - 2022-04-15
+
+- Change the version of BLIS to be downloaded to 0.9.0.
+
+## [0.3.0] - 2022-01-30
+
+- Changed to use generic CPU type when installing on Apple M1 mac.
+- Fixed a typo on threading method detection process.
+- Introduced conventional commits.
 
 ## [0.2.0] - 2021-07-31
 

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2021 Atsushi Tatsuma
+Copyright (c) 2021-2022 Atsushi Tatsuma
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

data/README.md

@@ -33,6 +33,10 @@ Or install it yourself as:
 
     $ gem install numo-blis
 
+Note:
+Currently, when installing on Apple M1 mac, Numo::BLIS gives `generic` to the CPU type option of BLIS.
+It is possible that BLIS is not fully optimized and has low performance.
+
 ## Usage
 
 Numo::BLIS loads Numo::NArray and Numo::Linalg using BLIS as a background library.
@@ -59,7 +63,7 @@ Moreover, the versions of background libraries are defined by constants.
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/yoshoku/numo-blis.
 This project is intended to be a safe, welcoming space for collaboration,
-and contributors are expected to adhere to the [code of conduct](https://github.com/yoshoku/numo-blis/blob/main/CODE_OF_CONDUCT.md).
+and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
 
 ## License
 

data/ext/numo/blis/blisext.c

@@ -23,7 +23,7 @@ void Init_blisext()
   mBLIS = rb_define_module_under(mNumo, "BLIS");
 
   /* The version of BLIS used as a background library. */
-  rb_define_const(mBLIS, "BLIS_VERSION", rb_str_new_cstr("0.8.1"));
+  rb_define_const(mBLIS, "BLIS_VERSION", rb_str_new_cstr("0.9.0"));
 
   /* The version of LAPACK used as a background library. */
   rb_define_const(mBLIS, "LAPACK_VERSION", rb_str_new_cstr("3.10.0"));

data/ext/numo/blis/extconf.rb

@@ -10,7 +10,7 @@ require 'rubygems/package'
 ENABLE_THREADING_ARG = arg_config('--enable-threading')
 
 VENDOR_DIR = File.expand_path("#{__dir__}/../../../vendor")
-SOEXT = RbConfig::CONFIG['SOEXT'] || case RUBY_PLATFORM
+SOEXT = RbConfig::CONFIG['SOEXT'] || case RbConfig::CONFIG['host_os']
                                      when /mswin|msys|mingw|cygwin/
                                        'dll'
                                      when /darwin|mac os/
@@ -19,13 +19,13 @@ SOEXT = RbConfig::CONFIG['SOEXT'] || case RUBY_PLATFORM
                                        'so'
                                      end
 
-BLIS_VERSION = '0.8.1'
+BLIS_VERSION = '0.9.0'
 LAPACK_VERSION = '3.10.0'
 BLIS_URI = "https://github.com/flame/blis/archive/refs/tags/#{BLIS_VERSION}.tar.gz"
 LAPACK_URI = "https://github.com/Reference-LAPACK/lapack/archive/refs/tags/v#{LAPACK_VERSION}.tar.gz"
 BLIS_TGZ = "#{VENDOR_DIR}/tmp/blis-#{BLIS_VERSION}.tgz"
 LAPACK_TGZ = "#{VENDOR_DIR}/tmp/lapack-#{LAPACK_VERSION}.tgz"
-BLIS_KEY = 'ce5998fccfac88153f1e52d6497020529a3b5217'
+BLIS_KEY = 'c5ff9b0437edc1f93ad30fcdd633c0a276165b7e'
 LAPACK_KEY = '4a9384523bf236c83568884e8c62d9517e41ac42'
 RB_CC = "'#{RbConfig::expand('$(CC)')}'"
 RB_CXX = "'#{RbConfig::expand('$(CPP)')}'"
@@ -34,17 +34,18 @@ 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>')
+                 elsif try_compile('#include <pthread.h>')
                    'pthreads'
                  else
                    'no'
                  end
+BLIS_CPU = RbConfig::CONFIG['host_os'] =~ /darwin|mac os/i && RbConfig::CONFIG['host_cpu'] =~ /arm|aarch/i ? 'generic' : 'auto'
 BLIS_CONFIGURE_OPTIONS = ['--enable-cblas',
                           "--enable-threading=#{BLIS_THREADING}",
                           "--prefix=#{VENDOR_DIR}",
                           "CC=#{RB_CC}",
                           "CXX=#{RB_CXX}",
-                          'auto'].join(' ')
+                          "#{BLIS_CPU}"].join(' ')
 LAPACK_CMAKE_OPTIONS = ["-DBLAS_LIBRARIES='#{VENDOR_DIR}/lib/libblis.#{SOEXT}'",
                         '-DLAPACKE=ON',
                         '-DBUILD_SHARED_LIBS=ON',

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.2.0'
+    VERSION = '0.4.1'
   end
 end

data/lib/numo/blis.rb

@@ -16,15 +16,15 @@ module Numo
       # @!visibility private
       def load_blis(*dirs, exc: true)
         dirs.each do |d|
-          begin
-            f_blis = dlopen(Blas, 'libblis', d)
-            f_lapacke = dlopen(Lapack, 'liblapacke', d)
-            @@libs = [f_blis, f_lapacke].compact
-            return true
-          rescue
-          end
+          f_blis = dlopen(Blas, 'libblis', d)
+          f_lapacke = dlopen(Lapack, 'liblapacke', d)
+          @@libs = [f_blis, f_lapacke].compact # rubocop:disable Style/ClassVars
+          return true
+        rescue StandardError
+          # Suppress errors as well as loading methods in Numo::Linalg::Loader.
         end
         raise 'Failed to find BLIS/LAPACK library' if exc
+
         false
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: numo-blis
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.4.1
 platform: ruby
 authors:
 - yoshoku
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-07-31 00:00:00.000000000 Z
+date: 2022-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: numo-linalg
@@ -34,20 +34,13 @@ extensions:
 - ext/numo/blis/extconf.rb
 extra_rdoc_files: []
 files:
-- ".github/workflows/build.yml"
-- ".gitignore"
-- ".rspec"
 - CHANGELOG.md
-- CODE_OF_CONDUCT.md
-- Gemfile
 - LICENSE.txt
 - README.md
-- Rakefile
 - ext/numo/blis/blisext.c
 - ext/numo/blis/extconf.rb
 - lib/numo/blis.rb
 - lib/numo/blis/version.rb
-- numo-blis.gemspec
 - vendor/tmp/.gitkeep
 homepage: https://github.com/yoshoku/numo-blis
 licenses:
@@ -57,6 +50,7 @@ metadata:
   source_code_uri: https://github.com/yoshoku/numo-blis
   changelog_uri: https://github.com/yoshoku/numo-blis/blob/main/CHANGELOG.md
   documentation_uri: https://github.com/yoshoku/numo-blis/blob/main/README.md
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -72,7 +66,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.2.33
 signing_key:
 specification_version: 4
 summary: Numo::BLIS downloads and builds BLIS during installation and uses that as

data/.github/workflows/build.yml

@@ -1,22 +0,0 @@
-name: build
-
-on: [push, pull_request]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby: [ '2.6', '2.7', '3.0' ]
-    steps:
-    - uses: actions/checkout@v2
-    - name: Install gcc and gfortran
-      run: sudo apt-get install -y gcc gfortran
-    - name: Set up Ruby ${{ matrix.ruby }}
-      uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: ${{ matrix.ruby }}
-        bundler-cache: true
-    - name: Build and test with Rake
-      run: bundle exec rake

data/.gitignore

@@ -1,24 +0,0 @@
-/.bundle/
-/.yardoc
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/
-
-/vendor/lib/
-/vendor/include/
-/vendor/share/
-/vendor/installed_*
-/vendor/tmp/blis*
-/vendor/tmp/lapack*
-
-# rspec failure tracking
-.rspec_status
-
-*.bundle
-.ruby-version
-
-*.swp
-.DS_Store

data/.rspec

@@ -1,3 +0,0 @@
---format documentation
---color
---require spec_helper

data/CODE_OF_CONDUCT.md

@@ -1,84 +0,0 @@
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-We as members, contributors, and leaders pledge to make participation in our community a harassment-free experience for everyone, regardless of age, body size, visible or invisible disability, ethnicity, sex characteristics, gender identity and expression, level of experience, education, socio-economic status, nationality, personal appearance, race, religion, or sexual identity and orientation.
-
-We pledge to act and interact in ways that contribute to an open, welcoming, diverse, inclusive, and healthy community.
-
-## Our Standards
-
-Examples of behavior that contributes to a positive environment for our community include:
-
-* Demonstrating empathy and kindness toward other people
-* Being respectful of differing opinions, viewpoints, and experiences
-* Giving and gracefully accepting constructive feedback
-* Accepting responsibility and apologizing to those affected by our mistakes, and learning from the experience
-* Focusing on what is best not just for us as individuals, but for the overall community
-
-Examples of unacceptable behavior include:
-
-* The use of sexualized language or imagery, and sexual attention or
-  advances of any kind
-* Trolling, insulting or derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or email
-  address, without their explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
-  professional setting
-
-## Enforcement Responsibilities
-
-Community leaders are responsible for clarifying and enforcing our standards of acceptable behavior and will take appropriate and fair corrective action in response to any behavior that they deem inappropriate, threatening, offensive, or harmful.
-
-Community leaders have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, and will communicate reasons for moderation decisions when appropriate.
-
-## Scope
-
-This Code of Conduct applies within all community spaces, and also applies when an individual is officially representing the community in public spaces. Examples of representing our community include using an official e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported to the community leaders responsible for enforcement at yoshoku@outlook.com. All complaints will be reviewed and investigated promptly and fairly.
-
-All community leaders are obligated to respect the privacy and security of the reporter of any incident.
-
-## Enforcement Guidelines
-
-Community leaders will follow these Community Impact Guidelines in determining the consequences for any action they deem in violation of this Code of Conduct:
-
-### 1. Correction
-
-**Community Impact**: Use of inappropriate language or other behavior deemed unprofessional or unwelcome in the community.
-
-**Consequence**: A private, written warning from community leaders, providing clarity around the nature of the violation and an explanation of why the behavior was inappropriate. A public apology may be requested.
-
-### 2. Warning
-
-**Community Impact**: A violation through a single incident or series of actions.
-
-**Consequence**: A warning with consequences for continued behavior. No interaction with the people involved, including unsolicited interaction with those enforcing the Code of Conduct, for a specified period of time. This includes avoiding interactions in community spaces as well as external channels like social media. Violating these terms may lead to a temporary or permanent ban.
-
-### 3. Temporary Ban
-
-**Community Impact**: A serious violation of community standards, including sustained inappropriate behavior.
-
-**Consequence**: A temporary ban from any sort of interaction or public communication with the community for a specified period of time. No public or private interaction with the people involved, including unsolicited interaction with those enforcing the Code of Conduct, is allowed during this period. Violating these terms may lead to a permanent ban.
-
-### 4. Permanent Ban
-
-**Community Impact**: Demonstrating a pattern of violation of community standards, including sustained inappropriate behavior,  harassment of an individual, or aggression toward or disparagement of classes of individuals.
-
-**Consequence**: A permanent ban from any sort of public interaction within the community.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 2.0,
-available at https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
-
-Community Impact Guidelines were inspired by [Mozilla's code of conduct enforcement ladder](https://github.com/mozilla/diversity).
-
-[homepage]: https://www.contributor-covenant.org
-
-For answers to common questions about this code of conduct, see the FAQ at
-https://www.contributor-covenant.org/faq. Translations are available at https://www.contributor-covenant.org/translations.

data/Gemfile

@@ -1,10 +0,0 @@
-# frozen_string_literal: true
-
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in numo-blis.gemspec
-gemspec
-
-gem 'rake', '~> 13.0'
-gem 'rake-compiler', '~> 1.1'
-gem 'rspec', '~> 3.0'

data/Rakefile

@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-require 'bundler/gem_tasks'
-require 'rspec/core/rake_task'
-
-RSpec::Core::RakeTask.new(:spec)
-
-require 'rake/extensiontask'
-
-task build: :compile
-
-Rake::ExtensionTask.new('blisext') do |ext|
-  ext.ext_dir = 'ext/numo/blis'
-  ext.lib_dir = 'lib/numo/blis'
-end
-
-task default: %i[clobber compile spec]

data/numo-blis.gemspec

@@ -1,43 +0,0 @@
-# frozen_string_literal: true
-
-require_relative 'lib/numo/blis/version'
-
-Gem::Specification.new do |spec|
-  spec.name          = 'numo-blis'
-  spec.version       = Numo::BLIS::VERSION
-  spec.authors       = ['yoshoku']
-  spec.email         = ['yoshoku@outlook.com']
-
-  spec.summary       = <<~MSG
-    Numo::BLIS downloads and builds BLIS during installation and
-    uses that as a background library for Numo::Linalg.
-  MSG
-  spec.description = <<~MSG
-    Numo::BLIS downloads and builds BLIS during installation and
-    uses that as a background library for Numo::Linalg.
-  MSG
-  spec.homepage      = 'https://github.com/yoshoku/numo-blis'
-  spec.license       = 'BSD-3-Clause'
-
-  spec.metadata['homepage_uri'] = spec.homepage
-  spec.metadata['source_code_uri'] = spec.homepage
-  spec.metadata['changelog_uri'] = 'https://github.com/yoshoku/numo-blis/blob/main/CHANGELOG.md'
-  spec.metadata['documentation_uri'] = 'https://github.com/yoshoku/numo-blis/blob/main/README.md'
-
-  # Specify which files should be added to the gem when it is released.
-  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files = Dir.chdir(File.expand_path(__dir__)) do
-    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{\A(?:test|spec|features)/}) }
-  end
-  spec.bindir        = 'exe'
-  spec.executables   = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
-  spec.require_paths = ['lib']
-  spec.extensions    = ['ext/numo/blis/extconf.rb']
-
-  # Uncomment to register a new dependency of your gem
-  # spec.add_dependency "example-gem", "~> 1.0"
-  spec.add_dependency 'numo-linalg', '>= 0.1.4'
-
-  # For more information and examples about making a new gem, checkout our
-  # guide at: https://bundler.io/guides/creating_gem.html
-end